ActionNodeBase will be called only once by a ControlNode

facontidavide · facontidavide · commit c66d25a06815 · 2018-10-08T20:43:29.000+02:00
diff --git a/gtest/gtest_sequence.cpp b/gtest/gtest_sequence.cpp
@@ -66,12 +66,15 @@ struct ComplexSequenceTest : testing::Test
 struct SequenceTripleActionTest : testing::Test
 {
     BT::SequenceNode root;
+    BT::ConditionTestNode condition;
     BT::AsyncActionTest action_1;
     BT::SyncActionTest  action_2;
     BT::AsyncActionTest action_3;
 
-    SequenceTripleActionTest() : root("root_sequence"), action_1("action_1"), action_2("action_2"), action_3("action_3")
+    SequenceTripleActionTest() : root("root_sequence"), condition("condition"),
+        action_1("action_1"), action_2("action_2"), action_3("action_3")
     {
+        root.addChild(&condition);
         root.addChild(&action_1);
         root.addChild(&action_2);
         root.addChild(&action_3);
@@ -247,21 +250,7 @@ TEST_F(SequenceTripleActionTest, TripleAction)
 
     action_1.setTime(3);
     action_3.setTime(3);
-    // the sequence is supposed to finish in (200 ms * 3) = 600 ms
-
-    int count_1 = 0, count_2 = 0, count_3 = 0;
-
-    auto sub1 = action_1.subscribeToStatusChange([&](TimePoint, const TreeNode&, NodeStatus, NodeStatus status) {
-        if (status == NodeStatus::SUCCESS) count_1++;
-    });
-
-    auto sub2 = action_2.subscribeToStatusChange([&](TimePoint, const TreeNode&, NodeStatus, NodeStatus status) {
-        if (status == NodeStatus::SUCCESS) count_2++;
-    });
-
-    auto sub3 = action_3.subscribeToStatusChange([&](TimePoint, const TreeNode&, NodeStatus, NodeStatus status) {
-        if (status == NodeStatus::SUCCESS) count_3++;
-    });
+    // the sequence is supposed to finish in (300 ms * 2) = 600 ms
 
     // first tick
     NodeStatus state = root.executeTick();
@@ -279,9 +268,14 @@ TEST_F(SequenceTripleActionTest, TripleAction)
     }
 
     ASSERT_EQ(NodeStatus::SUCCESS, state);
-    ASSERT_TRUE(count_1 == 1);
-    ASSERT_TRUE(count_2 == 1);
-    ASSERT_TRUE(count_3 == 1);
+
+    // Condition is called many times
+    ASSERT_NE(condition.tickCount(), 30);
+    // all the actions are called only once
+    ASSERT_EQ(action_1.tickCount(), 1);
+    ASSERT_EQ(action_2.tickCount(), 1);
+    ASSERT_EQ(action_3.tickCount(), 1);
+
     ASSERT_EQ(NodeStatus::IDLE, action_1.status());
     ASSERT_EQ(NodeStatus::IDLE, action_2.status());
     ASSERT_EQ(NodeStatus::IDLE, action_3.status());
diff --git a/gtest/include/condition_test_node.h b/gtest/include/condition_test_node.h
@@ -16,8 +16,11 @@ class ConditionTestNode : public ConditionNode
     // The method that is going to be executed by the thread
     virtual BT::NodeStatus tick() override;
 
+    int tickCount() const { return tick_count_; }
+
   private:
     bool boolean_value_;
+    int tick_count_;
 };
 }
 
diff --git a/gtest/src/condition_test_node.cpp b/gtest/src/condition_test_node.cpp
@@ -16,11 +16,14 @@
 BT::ConditionTestNode::ConditionTestNode(const std::string& name) : ConditionNode::ConditionNode(name)
 {
     boolean_value_ = true;
+    tick_count_ = 0;
 }
 
 
 BT::NodeStatus BT::ConditionTestNode::tick()
 {
+    tick_count_++;
+
     // Condition checking and state update
     if (boolean_value_)
     {
diff --git a/include/behavior_tree_core/action_node.h b/include/behavior_tree_core/action_node.h
@@ -26,6 +26,8 @@ class ActionNodeBase : public LeafNode
     ActionNodeBase(const std::string& name, const NodeParameters& parameters = NodeParameters());
     ~ActionNodeBase() override = default;
 
+    virtual NodeStatus executeTick() override;
+
     virtual NodeType type() const override final
     {
         return NodeType::ACTION;
diff --git a/src/action_node.cpp b/src/action_node.cpp
@@ -20,6 +20,17 @@ ActionNodeBase::ActionNodeBase(const std::string& name, const NodeParameters& pa
 {
 }
 
+NodeStatus ActionNodeBase::executeTick()
+{
+    NodeStatus prev_status = status();
+
+    if (prev_status == NodeStatus::IDLE || prev_status == NodeStatus::RUNNING)
+    {
+        setStatus( tick() );
+    }
+    return status();
+}
+
 //-------------------------------------------------------
 
 SimpleActionNode::SimpleActionNode(const std::string& name, SimpleActionNode::TickFunctor tick_functor)

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,14 @@`
`16`	`16`	`BT::ConditionTestNode::ConditionTestNode(const std::string& name) : ConditionNode::ConditionNode(name)`
`17`	`17`	`{`
`18`	`18`	`boolean_value_ = true;`
	`19`	`+ tick_count_ = 0;`
`19`	`20`	`}`
`20`	`21`
`21`	`22`
`22`	`23`	`BT::NodeStatus BT::ConditionTestNode::tick()`
`23`	`24`	`{`
	`25`	`+ tick_count_++;`
	`26`	`+`
`24`	`27`	`// Condition checking and state update`
`25`	`28`	`if (boolean_value_)`
`26`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ class ActionNodeBase : public LeafNode`
`26`	`26`	`ActionNodeBase(const std::string& name, const NodeParameters& parameters = NodeParameters());`
`27`	`27`	`~ActionNodeBase() override = default;`
`28`	`28`
	`29`	`+ virtual NodeStatus executeTick() override;`
	`30`	`+`
`29`	`31`	`virtual NodeType type() const override final`
`30`	`32`	`{`
`31`	`33`	`return NodeType::ACTION;`