costmap_cspace: install header files (#155)

at-wat · May 16, 2018 · e2c57c7 · e2c57c7
1 parent c5cce44
commit e2c57c7
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 50 deletions.
diff --git a/costmap_cspace/include/costmap_3d.h → ...space/include/costmap_cspace/costmap_3d.h b/costmap_cspace/include/costmap_3d.h → ...space/include/costmap_cspace/costmap_3d.h
@@ -27,17 +27,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef COSTMAP_3D_H
-#define COSTMAP_3D_H
+#ifndef COSTMAP_CSPACE_COSTMAP_3D_H
+#define COSTMAP_CSPACE_COSTMAP_3D_H
 
 #include <ros/ros.h>
 
-#include <costmap_3d_layer/footprint.h>
-#include <costmap_3d_layer/plain.h>
-#include <costmap_3d_layer/output.h>
-#include <costmap_3d_layer/unknown_handle.h>
+#include <costmap_cspace/costmap_3d_layer/footprint.h>
+#include <costmap_cspace/costmap_3d_layer/plain.h>
+#include <costmap_cspace/costmap_3d_layer/output.h>
+#include <costmap_cspace/costmap_3d_layer/unknown_handle.h>
 
-#include <costmap_3d_layer/class_loader.h>
+#include <costmap_cspace/costmap_3d_layer/class_loader.h>
 
 #include <vector>
 
@@ -105,4 +105,4 @@ class Costmap3d
 };
 }  // namespace costmap_cspace
 
-#endif  // COSTMAP_3D_H
+#endif  // COSTMAP_CSPACE_COSTMAP_3D_H
diff --git a/...ap_cspace/include/costmap_3d_layer/base.h → ...de/costmap_cspace/costmap_3d_layer/base.h b/...ap_cspace/include/costmap_3d_layer/base.h → ...de/costmap_cspace/costmap_3d_layer/base.h
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef COSTMAP_3D_LAYER_BASE_H
-#define COSTMAP_3D_LAYER_BASE_H
+#ifndef COSTMAP_CSPACE_COSTMAP_3D_LAYER_BASE_H
+#define COSTMAP_CSPACE_COSTMAP_3D_LAYER_BASE_H
 
 #include <ros/ros.h>
 
@@ -389,4 +389,4 @@ class Costmap3dLayerBase
 };
 }  // namespace costmap_cspace
 
-#endif  // COSTMAP_3D_LAYER_BASE_H
+#endif  // COSTMAP_CSPACE_COSTMAP_3D_LAYER_BASE_H
diff --git a/...e/include/costmap_3d_layer/class_loader.h → ...ap_cspace/costmap_3d_layer/class_loader.h b/...e/include/costmap_3d_layer/class_loader.h → ...ap_cspace/costmap_3d_layer/class_loader.h
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef COSTMAP_3D_LAYER_CLASS_LOADER_H
-#define COSTMAP_3D_LAYER_CLASS_LOADER_H
+#ifndef COSTMAP_CSPACE_COSTMAP_3D_LAYER_CLASS_LOADER_H
+#define COSTMAP_CSPACE_COSTMAP_3D_LAYER_CLASS_LOADER_H
 
 #include <ros/ros.h>
 
@@ -37,8 +37,8 @@
 #include <costmap_cspace/CSpace3D.h>
 #include <costmap_cspace/CSpace3DUpdate.h>
 
-#include <cspace3_cache.h>
-#include <polygon.h>
+#include <costmap_cspace/cspace3_cache.h>
+#include <costmap_cspace/polygon.h>
 
 #include <string>
 #include <map>
@@ -102,4 +102,4 @@ class Costmap3dLayerClassLoader
 
 }  // namespace costmap_cspace
 
-#endif  // COSTMAP_3D_LAYER_CLASS_LOADER_H
+#endif  // COSTMAP_CSPACE_COSTMAP_3D_LAYER_CLASS_LOADER_H
diff --git a/...pace/include/costmap_3d_layer/footprint.h → ...stmap_cspace/costmap_3d_layer/footprint.h b/...pace/include/costmap_3d_layer/footprint.h → ...stmap_cspace/costmap_3d_layer/footprint.h
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef COSTMAP_3D_LAYER_FOOTPRINT_H
-#define COSTMAP_3D_LAYER_FOOTPRINT_H
+#ifndef COSTMAP_CSPACE_COSTMAP_3D_LAYER_FOOTPRINT_H
+#define COSTMAP_CSPACE_COSTMAP_3D_LAYER_FOOTPRINT_H
 
 #include <ros/ros.h>
 
@@ -39,9 +39,9 @@
 
 #include <xmlrpcpp/XmlRpcValue.h>
 
-#include <costmap_3d_layer/base.h>
-#include <cspace3_cache.h>
-#include <polygon.h>
+#include <costmap_cspace/costmap_3d_layer/base.h>
+#include <costmap_cspace/cspace3_cache.h>
+#include <costmap_cspace/polygon.h>
 
 namespace costmap_cspace
 {
@@ -262,4 +262,4 @@ class Costmap3dLayerFootprint : public Costmap3dLayerBase
 };
 }  // namespace costmap_cspace
 
-#endif  // COSTMAP_3D_LAYER_FOOTPRINT_H
+#endif  // COSTMAP_CSPACE_COSTMAP_3D_LAYER_FOOTPRINT_H
diff --git a/..._cspace/include/costmap_3d_layer/output.h → .../costmap_cspace/costmap_3d_layer/output.h b/..._cspace/include/costmap_3d_layer/output.h → .../costmap_cspace/costmap_3d_layer/output.h
@@ -27,15 +27,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef COSTMAP_3D_LAYER_OUTPUT_H
-#define COSTMAP_3D_LAYER_OUTPUT_H
+#ifndef COSTMAP_CSPACE_COSTMAP_3D_LAYER_OUTPUT_H
+#define COSTMAP_CSPACE_COSTMAP_3D_LAYER_OUTPUT_H
 
 #include <geometry_msgs/PolygonStamped.h>
 #include <nav_msgs/OccupancyGrid.h>
 #include <costmap_cspace/CSpace3D.h>
 #include <costmap_cspace/CSpace3DUpdate.h>
 
-#include <costmap_3d_layer/base.h>
+#include <costmap_cspace/costmap_3d_layer/base.h>
 
 namespace costmap_cspace
 {
@@ -148,4 +148,4 @@ class Costmap3dLayerOutput : public Costmap3dLayerBase
 };
 }  // namespace costmap_cspace
 
-#endif  // COSTMAP_3D_LAYER_OUTPUT_H
+#endif  // COSTMAP_CSPACE_COSTMAP_3D_LAYER_OUTPUT_H
diff --git a/...p_cspace/include/costmap_3d_layer/plain.h → ...e/costmap_cspace/costmap_3d_layer/plain.h b/...p_cspace/include/costmap_3d_layer/plain.h → ...e/costmap_cspace/costmap_3d_layer/plain.h
@@ -27,15 +27,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef COSTMAP_3D_LAYER_PLAIN_H
-#define COSTMAP_3D_LAYER_PLAIN_H
+#ifndef COSTMAP_CSPACE_COSTMAP_3D_LAYER_PLAIN_H
+#define COSTMAP_CSPACE_COSTMAP_3D_LAYER_PLAIN_H
 
 #include <geometry_msgs/PolygonStamped.h>
 #include <nav_msgs/OccupancyGrid.h>
 #include <costmap_cspace/CSpace3D.h>
 #include <costmap_cspace/CSpace3DUpdate.h>
 
-#include <costmap_3d_layer/base.h>
+#include <costmap_cspace/costmap_3d_layer/base.h>
 
 namespace costmap_cspace
 {
@@ -63,4 +63,4 @@ class Costmap3dLayerPlain : public Costmap3dLayerFootprint
 };
 }  // namespace costmap_cspace
 
-#endif  // COSTMAP_3D_LAYER_PLAIN_H
+#endif  // COSTMAP_CSPACE_COSTMAP_3D_LAYER_PLAIN_H
diff --git a/...include/costmap_3d_layer/unknown_handle.h → ..._cspace/costmap_3d_layer/unknown_handle.h b/...include/costmap_3d_layer/unknown_handle.h → ..._cspace/costmap_3d_layer/unknown_handle.h
@@ -27,15 +27,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef COSTMAP_3D_LAYER_UNKNOWN_HANDLE_H
-#define COSTMAP_3D_LAYER_UNKNOWN_HANDLE_H
+#ifndef COSTMAP_CSPACE_COSTMAP_3D_LAYER_UNKNOWN_HANDLE_H
+#define COSTMAP_CSPACE_COSTMAP_3D_LAYER_UNKNOWN_HANDLE_H
 
 #include <geometry_msgs/PolygonStamped.h>
 #include <nav_msgs/OccupancyGrid.h>
 #include <costmap_cspace/CSpace3D.h>
 #include <costmap_cspace/CSpace3DUpdate.h>
 
-#include <costmap_3d_layer/base.h>
+#include <costmap_cspace/costmap_3d_layer/base.h>
 
 namespace costmap_cspace
 {
@@ -101,4 +101,4 @@ class Costmap3dLayerUnknownHandle : public Costmap3dLayerBase
 };
 }  // namespace costmap_cspace
 
-#endif  // COSTMAP_3D_LAYER_UNKNOWN_HANDLE_H
+#endif  // COSTMAP_CSPACE_COSTMAP_3D_LAYER_UNKNOWN_HANDLE_H
diff --git a/costmap_cspace/include/cspace3_cache.h → ...ce/include/costmap_cspace/cspace3_cache.h b/costmap_cspace/include/cspace3_cache.h → ...ce/include/costmap_cspace/cspace3_cache.h
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CSPACE3_CACHE_H
-#define CSPACE3_CACHE_H
+#ifndef COSTMAP_CSPACE_CSPACE3_CACHE_H
+#define COSTMAP_CSPACE_CSPACE3_CACHE_H
 
 #include <ros/ros.h>
 
@@ -97,4 +97,4 @@ class CSpace3Cache
 };
 }  // namespace costmap_cspace
 
-#endif  // CSPACE3_CACHE_H
+#endif  // COSTMAP_CSPACE_CSPACE3_CACHE_H
diff --git a/...lude/pointcloud_accumulator/accumulator.h → ...pace/pointcloud_accumulator/accumulator.h b/...lude/pointcloud_accumulator/accumulator.h → ...pace/pointcloud_accumulator/accumulator.h
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef POINTCLOUD_ACCUMULATOR_ACCUMULATOR_H
-#define POINTCLOUD_ACCUMULATOR_ACCUMULATOR_H
+#ifndef COSTMAP_CSPACE_POINTCLOUD_ACCUMULATOR_ACCUMULATOR_H
+#define COSTMAP_CSPACE_POINTCLOUD_ACCUMULATOR_ACCUMULATOR_H
 
 #include <ros/ros.h>
 
@@ -44,7 +44,8 @@ class PointcloudAccumurator
     ros::Time stamp_;
 
     Points(const T &points, const ros::Time &stamp)
-      : T(points), stamp_(stamp)
+      : T(points)
+      , stamp_(stamp)
     {
     }
   };
@@ -97,4 +98,4 @@ class PointcloudAccumurator
   std::list<Points> points_;
 };
 
-#endif  // POINTCLOUD_ACCUMULATOR_ACCUMULATOR_H
+#endif  // COSTMAP_CSPACE_POINTCLOUD_ACCUMULATOR_ACCUMULATOR_H
diff --git a/costmap_cspace/include/polygon.h → ...p_cspace/include/costmap_cspace/polygon.h b/costmap_cspace/include/polygon.h → ...p_cspace/include/costmap_cspace/polygon.h
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef POLYGON_H
-#define POLYGON_H
+#ifndef COSTMAP_CSPACE_POLYGON_H
+#define COSTMAP_CSPACE_POLYGON_H
 
 #include <ros/ros.h>
 #include <vector>
@@ -107,7 +107,7 @@ class Polygon
         p[0] = static_cast<double>(footprint_xml[i][0]);
         p[1] = static_cast<double>(footprint_xml[i][1]);
       }
-      catch(XmlRpc::XmlRpcException &e)
+      catch (XmlRpc::XmlRpcException &e)
       {
         throw std::runtime_error(("Invalid footprint xml." + e.getMessage()).c_str());
       }
@@ -190,4 +190,4 @@ class Polygon
 };
 }  // namespace costmap_cspace
 
-#endif  // POLYGON_H
+#endif  // COSTMAP_CSPACE_POLYGON_H
diff --git a/costmap_cspace/src/costmap_3d.cpp b/costmap_cspace/src/costmap_3d.cpp
@@ -40,7 +40,7 @@
 #include <costmap_cspace/CSpace3D.h>
 #include <costmap_cspace/CSpace3DUpdate.h>
 
-#include <costmap_3d.h>
+#include <costmap_cspace/costmap_3d.h>
 
 class Costmap3DOFNode
 {

diff --git a/costmap_cspace/src/costmap_3d_layers.cpp b/costmap_cspace/src/costmap_3d_layers.cpp
@@ -32,7 +32,7 @@
 #include <string>
 #include <vector>
 
-#include <costmap_3d.h>
+#include <costmap_cspace/costmap_3d.h>
 
 COSTMAP_3D_LAYER_CLASS_LOADER_ENABLE();
 

diff --git a/costmap_cspace/src/laserscan_to_map.cpp b/costmap_cspace/src/laserscan_to_map.cpp
@@ -36,7 +36,7 @@
 
 #include <string>
 
-#include <pointcloud_accumulator/accumulator.h>
+#include <costmap_cspace/pointcloud_accumulator/accumulator.h>
 
 class laserscan_to_map
 {

diff --git a/costmap_cspace/src/pointcloud2_to_map.cpp b/costmap_cspace/src/pointcloud2_to_map.cpp
@@ -38,7 +38,7 @@
 #include <string>
 #include <vector>
 
-#include <pointcloud_accumulator/accumulator.h>
+#include <costmap_cspace/pointcloud_accumulator/accumulator.h>
 
 class pointcloud2_to_map
 {

diff --git a/costmap_cspace/test/src/test_costmap_3d.cpp b/costmap_cspace/test/src/test_costmap_3d.cpp
@@ -35,7 +35,7 @@
 
 #include <ros/ros.h>
 #include <nav_msgs/OccupancyGrid.h>
-#include <costmap_3d.h>
+#include <costmap_cspace/costmap_3d.h>
 
 const std::string footprint_str(
     "<value><array><data>"