Removed AIKIDO from class names.

personalrobotics · Apr 22, 2016 · 1defc27 · 1defc27
1 parent 18c51ce
commit 1defc27
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/aikido/CMakeLists.txt b/aikido/CMakeLists.txt
@@ -46,6 +46,8 @@ include_directories(SYSTEM ${TinyXML2_INCLUDE_DIRS})
 find_package(OMPL QUIET)
 if (${OMPL_FOUND})
   message(STATUS "Looking for OMPL - found version ${OMPL_VERSION}")
+
+  include_directories(SYSTEM ${OMPL_INCLUDE_DIRS})
 else()
   message(STATUS "Looking for OMPL - NOT found, to use planning::ompl, please"
                  " install OMPL.")

diff --git a/...lanner/ompl/AIKIDOGeometricStateSpace.hpp → ...kido/planner/ompl/GeometricStateSpace.hpp b/...lanner/ompl/AIKIDOGeometricStateSpace.hpp → ...kido/planner/ompl/GeometricStateSpace.hpp
diff --git a/...ikido/planner/ompl/AIKIDOStateSampler.hpp → ...lude/aikido/planner/ompl/StateSampler.hpp b/...ikido/planner/ompl/AIKIDOStateSampler.hpp → ...lude/aikido/planner/ompl/StateSampler.hpp
diff --git a/...anner/ompl/AIKIDOStateValidityChecker.hpp → ...ido/planner/ompl/StateValidityChecker.hpp b/...anner/ompl/AIKIDOStateValidityChecker.hpp → ...ido/planner/ompl/StateValidityChecker.hpp
diff --git a/aikido/include/aikido/planner/ompl/detail/OMPLPlanner-impl.hpp b/aikido/include/aikido/planner/ompl/detail/OMPLPlanner-impl.hpp
@@ -1,5 +1,5 @@
-#include "../AIKIDOGeometricStateSpace.hpp"
-#include "../AIKIDOStateValidityChecker.hpp"
+#include "../GeometricStateSpace.hpp"
+#include "../StateValidityChecker.hpp"
 #include "../GoalRegion.hpp"
 #include "../../../trajectory/Interpolated.hpp"
 #include <ompl/geometric/PathGeometric.h>

diff --git a/aikido/src/planner/ompl/CMakeLists.txt b/aikido/src/planner/ompl/CMakeLists.txt
@@ -1,11 +1,9 @@
-include_directories(SYSTEM ${OMPL_INCLUDE_DIRS})
-
 aikido_add_library("${PROJECT_NAME}_planner_ompl"
-  AIKIDOGeometricStateSpace.cpp
-  AIKIDOStateSampler.cpp
-  AIKIDOStateValidityChecker.cpp
-  OMPLPlanner.cpp
+  GeometricStateSpace.cpp
   GoalRegion.cpp
+  OMPLPlanner.cpp
+  StateSampler.cpp
+  StateValidityChecker.cpp
 )
 target_link_libraries("${PROJECT_NAME}_planner_ompl"
   "${PROJECT_NAME}_constraint"

diff --git a/...lanner/ompl/AIKIDOGeometricStateSpace.cpp → .../src/planner/ompl/GeometricStateSpace.cpp b/...lanner/ompl/AIKIDOGeometricStateSpace.cpp → .../src/planner/ompl/GeometricStateSpace.cpp
@@ -1,5 +1,5 @@
-#include <aikido/planner/ompl/AIKIDOGeometricStateSpace.hpp>
-#include <aikido/planner/ompl/AIKIDOStateSampler.hpp>
+#include <aikido/planner/ompl/GeometricStateSpace.hpp>
+#include <aikido/planner/ompl/StateSampler.hpp>
 #include <aikido/constraint/Sampleable.hpp>
 #include <dart/common/StlHelpers.h>
 #include <boost/make_shared.hpp>

diff --git a/aikido/src/planner/ompl/GoalRegion.cpp b/aikido/src/planner/ompl/GoalRegion.cpp
@@ -1,5 +1,5 @@
 #include <aikido/planner/ompl/GoalRegion.hpp>
-#include <aikido/planner/ompl/AIKIDOGeometricStateSpace.hpp>
+#include <aikido/planner/ompl/GeometricStateSpace.hpp>
 
 namespace aikido {
 namespace planner {

diff --git a/aikido/src/planner/ompl/OMPLPlanner.cpp b/aikido/src/planner/ompl/OMPLPlanner.cpp
@@ -1,5 +1,5 @@
 #include <aikido/planner/ompl/OMPLPlanner.hpp>
-#include <aikido/planner/ompl/AIKIDOGeometricStateSpace.hpp>
+#include <aikido/planner/ompl/GeometricStateSpace.hpp>
 #include <aikido/constraint/ConjunctionConstraint.hpp>
 
 namespace aikido {

diff --git a/...o/src/planner/ompl/AIKIDOStateSampler.cpp → aikido/src/planner/ompl/StateSampler.cpp b/...o/src/planner/ompl/AIKIDOStateSampler.cpp → aikido/src/planner/ompl/StateSampler.cpp
@@ -1,5 +1,5 @@
-#include <aikido/planner/ompl/AIKIDOStateSampler.hpp>
-#include <aikido/planner/ompl/AIKIDOGeometricStateSpace.hpp>
+#include <aikido/planner/ompl/StateSampler.hpp>
+#include <aikido/planner/ompl/GeometricStateSpace.hpp>
 
 namespace aikido {
 namespace planner {

diff --git a/...anner/ompl/AIKIDOStateValidityChecker.cpp → ...src/planner/ompl/StateValidityChecker.cpp b/...anner/ompl/AIKIDOStateValidityChecker.cpp → ...src/planner/ompl/StateValidityChecker.cpp
@@ -1,5 +1,5 @@
-#include <aikido/planner/ompl/AIKIDOStateValidityChecker.hpp>
-#include <aikido/planner/ompl/AIKIDOGeometricStateSpace.hpp>
+#include <aikido/planner/ompl/StateValidityChecker.hpp>
+#include <aikido/planner/ompl/GeometricStateSpace.hpp>
 
 namespace aikido {
 namespace planner {

diff --git a/aikido/tests/planner/ompl/OMPLTestHelpers.hpp b/aikido/tests/planner/ompl/OMPLTestHelpers.hpp
@@ -5,7 +5,7 @@
 #include <aikido/constraint/TestableConstraint.hpp>
 #include <aikido/constraint/dart.hpp>
 #include <aikido/distance/defaults.hpp>
-#include <aikido/planner/ompl/AIKIDOGeometricStateSpace.hpp>
+#include <aikido/planner/ompl/GeometricStateSpace.hpp>
 #include <aikido/statespace/GeodesicInterpolator.hpp>
 #include <aikido/statespace/StateSpace.hpp>
 #include <aikido/statespace/Rn.hpp>

diff --git a/aikido/tests/planner/ompl/test_GeometricStateSpace.cpp b/aikido/tests/planner/ompl/test_GeometricStateSpace.cpp
@@ -1,5 +1,5 @@
 #include "OMPLTestHelpers.hpp"
-#include <aikido/planner/ompl/AIKIDOGeometricStateSpace.hpp>
+#include <aikido/planner/ompl/GeometricStateSpace.hpp>
 
 using aikido::planner::ompl::GeometricStateSpace;
 using StateSpace = aikido::statespace::dart::MetaSkeletonStateSpace;

diff --git a/aikido/tests/planner/ompl/test_StateSampler.cpp b/aikido/tests/planner/ompl/test_StateSampler.cpp
@@ -1,5 +1,5 @@
 #include "OMPLTestHelpers.hpp"
-#include <aikido/planner/ompl/AIKIDOStateSampler.hpp>
+#include <aikido/planner/ompl/StateSampler.hpp>
 
 using aikido::planner::ompl::GeometricStateSpace;
 using aikido::planner::ompl::StateSampler;

diff --git a/aikido/tests/planner/ompl/test_ValidityChecker.cpp b/aikido/tests/planner/ompl/test_ValidityChecker.cpp
@@ -1,6 +1,6 @@
 #include "OMPLTestHelpers.hpp"
 #include "../../constraint/MockConstraints.hpp"
-#include <aikido/planner/ompl/AIKIDOStateValidityChecker.hpp>
+#include <aikido/planner/ompl/StateValidityChecker.hpp>
 #include <aikido/planner/ompl/OMPLPlanner.hpp>
 
 using aikido::planner::ompl::GeometricStateSpace;