directory renamed

Davide Faconti · Davide Faconti · commit 5b9e2145ff31 · 2018-04-19T11:47:51.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 *~
+/CMakeLists.txt.user
diff --git a/gtest/gtest_tree.cpp b/gtest/gtest_tree.cpp
@@ -14,7 +14,7 @@
 #include <gtest/gtest.h>
 #include "action_test_node.h"
 #include "condition_test_node.h"
-#include "behavior_tree/behavior_tree.h"
+#include "behavior_tree_core/behavior_tree.h"
 
 
 
diff --git a/gtest/include/action_test_node.h b/gtest/include/action_test_node.h
@@ -1,7 +1,7 @@
 #ifndef ACTIONTEST_H
 #define ACTIONTEST_H
 
-#include "behavior_tree/action_node.h"
+#include "behavior_tree_core/action_node.h"
 
 namespace BT
 {
diff --git a/gtest/include/condition_test_node.h b/gtest/include/condition_test_node.h
@@ -1,7 +1,7 @@
 #ifndef CONDITIONTEST_H
 #define CONDITIONTEST_H
 
-#include "behavior_tree/condition_node.h"
+#include "behavior_tree_core/condition_node.h"
 
 namespace BT
 {
diff --git a/include/behavior_tree/behavior_tree.h b/include/behavior_tree/behavior_tree.h
diff --git a/include/behavior_tree_core/action_node.h b/include/behavior_tree_core/action_node.h
diff --git a/include/behavior_tree_core/behavior_tree.h b/include/behavior_tree_core/behavior_tree.h
@@ -0,0 +1,20 @@
+#ifndef BEHAVIOR_TREE_H
+#define BEHAVIOR_TREE_H
+
+#include "behavior_tree_core/parallel_node.h"
+#include "behavior_tree_core/fallback_node.h"
+#include "behavior_tree_core/sequence_node.h"
+
+#include "behavior_tree_core/sequence_node_with_memory.h"
+#include "behavior_tree_core/fallback_node_with_memory.h"
+
+#include "behavior_tree_core/action_node.h"
+#include "behavior_tree_core/condition_node.h"
+
+#include "behavior_tree_core/decorator_negation_node.h"
+#include "behavior_tree_core/decorator_retry_node.h"
+
+#include "behavior_tree_core/exceptions.h"
+
+
+#endif // BEHAVIOR_TREE_H
diff --git a/include/behavior_tree_core/condition_node.h b/include/behavior_tree_core/condition_node.h
diff --git a/include/behavior_tree_core/control_node.h b/include/behavior_tree_core/control_node.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "behavior_tree/tree_node.h"
+#include "behavior_tree_core/tree_node.h"
 
 namespace BT
 {
diff --git a/include/behavior_tree_core/decorator_negation_node.h b/include/behavior_tree_core/decorator_negation_node.h
@@ -1,7 +1,7 @@
 #ifndef DECORATORNEGATIONNODE_H
 #define DECORATORNEGATIONNODE_H
 
-#include "behavior_tree/control_node.h"
+#include "behavior_tree_core/control_node.h"
 
 namespace BT
 {
diff --git a/include/behavior_tree_core/decorator_retry_node.h b/include/behavior_tree_core/decorator_retry_node.h
@@ -1,7 +1,7 @@
 #ifndef DECORATORRETRYNODE_H
 #define DECORATORRETRYNODE_H
 
-#include "behavior_tree/control_node.h"
+#include "behavior_tree_core/control_node.h"
 
 namespace BT
 {
diff --git a/include/behavior_tree_core/exceptions.h b/include/behavior_tree_core/exceptions.h
diff --git a/include/behavior_tree_core/fallback_node.h b/include/behavior_tree_core/fallback_node.h
@@ -1,7 +1,7 @@
 #ifndef FALLBACKNODE_H
 #define FALLBACKNODE_H
 
-#include "behavior_tree/control_node.h"
+#include "behavior_tree_core/control_node.h"
 
 namespace BT
 {
diff --git a/include/behavior_tree_core/fallback_node_with_memory.h b/include/behavior_tree_core/fallback_node_with_memory.h
@@ -1,6 +1,6 @@
 #ifndef FALLBACK_NODE_WITH_MEMORY_H
 #define FALLBACK_NODE_WITH_MEMORY_H
-#include "behavior_tree/control_node.h"
+#include "behavior_tree_core/control_node.h"
 
 
 namespace BT
diff --git a/include/behavior_tree_core/leaf_node.h b/include/behavior_tree_core/leaf_node.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "behavior_tree/tree_node.h"
+#include "behavior_tree_core/tree_node.h"
 
 namespace BT
 {
diff --git a/include/behavior_tree_core/parallel_node.h b/include/behavior_tree_core/parallel_node.h
@@ -1,7 +1,7 @@
 #ifndef PARALLEL_NODE_H
 #define PARALLEL_NODE_H
 
-#include "behavior_tree/control_node.h"
+#include "behavior_tree_core/control_node.h"
 
 namespace BT
 {
diff --git a/include/behavior_tree_core/sequence_node.h b/include/behavior_tree_core/sequence_node.h
@@ -1,7 +1,7 @@
 #ifndef SEQUENCENODE_H
 #define SEQUENCENODE_H
 
-#include "behavior_tree/control_node.h"
+#include "behavior_tree_core/control_node.h"
 
 namespace BT
 {
diff --git a/include/behavior_tree_core/sequence_node_with_memory.h b/include/behavior_tree_core/sequence_node_with_memory.h
@@ -2,7 +2,7 @@
 #define SEQUENCE_NODE_WITH_MEMORY_H
 
 
-#include "behavior_tree/control_node.h"
+#include "behavior_tree_core/control_node.h"
 
 
 
diff --git a/include/behavior_tree_core/tick_engine.h b/include/behavior_tree_core/tick_engine.h
diff --git a/include/behavior_tree_core/tree_node.h b/include/behavior_tree_core/tree_node.h
@@ -20,8 +20,8 @@
 #include <mutex>
 #include <condition_variable>
 
-#include "behavior_tree/tick_engine.h"
-#include "behavior_tree/exceptions.h"
+#include "behavior_tree_core/tick_engine.h"
+#include "behavior_tree_core/exceptions.h"
 
 namespace BT
 {
@@ -81,7 +81,7 @@ namespace BT
 
         // The constructor and the distructor
         TreeNode(std::string name);
-        ~TreeNode();
+        virtual ~TreeNode();
 
         // The method that is going to be executed when the node receive a tick
         virtual BT::ReturnStatus Tick() = 0;
diff --git a/src/action_node.cpp b/src/action_node.cpp
@@ -10,7 +10,7 @@
 *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "behavior_tree/action_node.h"
+#include "behavior_tree_core/action_node.h"
 #include <string>
 
 
diff --git a/src/condition_node.cpp b/src/condition_node.cpp
@@ -10,7 +10,7 @@
 *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "behavior_tree/condition_node.h"
+#include "behavior_tree_core/condition_node.h"
 #include <string>
 
 BT::ConditionNode::ConditionNode(std::string name) :
diff --git a/src/control_node.cpp b/src/control_node.cpp
@@ -11,7 +11,7 @@
 */
 
 
-#include "behavior_tree/control_node.h"
+#include "behavior_tree_core/control_node.h"
 #include <string>
 #include <vector>
 
diff --git a/src/exceptions.cpp b/src/exceptions.cpp
@@ -10,7 +10,7 @@
 *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "behavior_tree/exceptions.h"
+#include "behavior_tree_core/exceptions.h"
 #include<string>
 
 BT::BehaviorTreeException::BehaviorTreeException(const std::string Message)
diff --git a/src/fallback_node.cpp b/src/fallback_node.cpp
@@ -10,7 +10,7 @@
 *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "behavior_tree/fallback_node.h"
+#include "behavior_tree_core/fallback_node.h"
 #include <string>
 
 BT::FallbackNode::FallbackNode(std::string name) : ControlNode::ControlNode(name) {}
diff --git a/src/fallback_node_with_memory.cpp b/src/fallback_node_with_memory.cpp
@@ -10,7 +10,7 @@
 *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "behavior_tree/fallback_node_with_memory.h"
+#include "behavior_tree_core/fallback_node_with_memory.h"
 #include <string>
 
 BT::FallbackNodeWithMemory::FallbackNodeWithMemory(std::string name) : ControlNode::ControlNode(name)
diff --git a/src/leaf_node.cpp b/src/leaf_node.cpp
@@ -11,7 +11,7 @@
 *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "behavior_tree/leaf_node.h"
+#include "behavior_tree_core/leaf_node.h"
 #include <string>
 
 BT::LeafNode::LeafNode(std::string name) : TreeNode(name) {}
diff --git a/src/parallel_node.cpp b/src/parallel_node.cpp
@@ -12,7 +12,7 @@
 */
 
 
-#include "behavior_tree/parallel_node.h"
+#include "behavior_tree_core/parallel_node.h"
 #include <string>
 
 BT::ParallelNode::ParallelNode(std::string name, int threshold_M) : ControlNode::ControlNode(name)
diff --git a/src/sequence_node.cpp b/src/sequence_node.cpp
@@ -12,7 +12,7 @@
 */
 
 
-#include "behavior_tree/sequence_node.h"
+#include "behavior_tree_core/sequence_node.h"
 #include <string>
 
 
diff --git a/src/sequence_node_with_memory.cpp b/src/sequence_node_with_memory.cpp
@@ -12,7 +12,7 @@
 */
 
 
-#include "behavior_tree/sequence_node_with_memory.h"
+#include "behavior_tree_core/sequence_node_with_memory.h"
 #include <string>
 
 
diff --git a/src/tick_engine.cpp b/src/tick_engine.cpp
@@ -10,7 +10,7 @@
 *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "behavior_tree/tick_engine.h"
+#include "behavior_tree_core/tick_engine.h"
 
 TickEngine::TickEngine(int initial_value)
 {
diff --git a/src/tree_node.cpp b/src/tree_node.cpp
@@ -10,7 +10,7 @@
 *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "behavior_tree/tree_node.h"
+#include "behavior_tree_core/tree_node.h"
 #include <string>
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#ifndef ACTIONTEST_H`
`2`	`2`	`#define ACTIONTEST_H`
`3`	`3`
`4`		`-#include "behavior_tree/action_node.h"`
	`4`	`+#include "behavior_tree_core/action_node.h"`
`5`	`5`
`6`	`6`	`namespace BT`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#ifndef CONDITIONTEST_H`
`2`	`2`	`#define CONDITIONTEST_H`
`3`	`3`
`4`		`-#include "behavior_tree/condition_node.h"`
	`4`	`+#include "behavior_tree_core/condition_node.h"`
`5`	`5`
`6`	`6`	`namespace BT`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include <vector>`
`5`	`5`
`6`		`-#include "behavior_tree/tree_node.h"`
	`6`	`+#include "behavior_tree_core/tree_node.h"`
`7`	`7`
`8`	`8`	`namespace BT`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#ifndef DECORATORNEGATIONNODE_H`
`2`	`2`	`#define DECORATORNEGATIONNODE_H`
`3`	`3`
`4`		`-#include "behavior_tree/control_node.h"`
	`4`	`+#include "behavior_tree_core/control_node.h"`
`5`	`5`
`6`	`6`	`namespace BT`
`7`	`7`	`{`