edge and edges to compas namespace

Author: romanarust

include/compas.h

@@ -24,6 +24,8 @@ namespace compas
     using Mesh = CGAL::Surface_mesh<Point>;
     using RowMatrixXd = Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>;
     using RowMatrixXi = Eigen::Matrix<int, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>;
+    using Edge = std::tuple<std::vector<double>, std::vector<double>>;
+    using Edges = std::list<Edge>;
 
     Polyhedron polyhedron_from_vertices_and_faces(const RowMatrixXd &V, const RowMatrixXi &F);
 

src/skeletonization.cpp

@@ -39,7 +39,7 @@ struct Split_polylines
     }
 };
 
-Edges pmp_mesh_skeleton(
+compas::Edges pmp_mesh_skeleton(
     Eigen::Ref<const compas::RowMatrixXd> &V,
     Eigen::Ref<const compas::RowMatrixXi> &F)
 {
@@ -63,7 +63,7 @@ Edges pmp_mesh_skeleton(
     // Split_polylines splitter(skeleton, polylines);
     // CGAL::split_graph_into_polylines(skeleton, splitter);
 
-    Edges edgelist;
+    compas::Edges edgelist;
 
     for (Skeleton_edge e : CGAL::make_range(edges(skeleton)))
     {
@@ -72,7 +72,7 @@ Edges pmp_mesh_skeleton(
 
         std::vector<double> s_vec = {s.x(), s.y(), s.z()};
         std::vector<double> t_vec = {t.x(), t.y(), t.z()};
-        Edge edge = std::make_tuple(s_vec, t_vec);
+        compas::Edge edge = std::make_tuple(s_vec, t_vec);
 
         edgelist.push_back(edge);
     }

src/skeletonization.h

@@ -3,10 +3,7 @@
 
 #include <compas.h>
 
-typedef std::tuple<std::vector<double>, std::vector<double>> Edge;
-typedef std::list<Edge> Edges;
-
-Edges pmp_mesh_skeleton(
+compas::Edges pmp_mesh_skeleton(
     Eigen::Ref<const compas::RowMatrixXd> &V,
     Eigen::Ref<const compas::RowMatrixXi> &F);
 

src/straight_skeleton_2.cpp

@@ -11,7 +11,7 @@ typedef boost::shared_ptr<Ss> SsPtr;
 typedef CGAL::Straight_skeleton_2<K>::Halfedge_const_handle Halfedge_const_handle;
 typedef CGAL::Straight_skeleton_2<K>::Vertex_const_handle Vertex_const_handle;
 
-Edges pmp_create_interior_straight_skeleton(
+compas::Edges pmp_create_interior_straight_skeleton(
     Eigen::Ref<const compas::RowMatrixXd> &V)
 {
     Polygon_2 poly;
@@ -20,7 +20,7 @@ Edges pmp_create_interior_straight_skeleton(
         poly.push_back(Point(V(i, 0), V(i, 1)));
     }
     SsPtr iss = CGAL::create_interior_straight_skeleton_2(poly.vertices_begin(), poly.vertices_end());
-    Edges edgelist;
+    compas::Edges edgelist;
     for(auto hit = iss->halfedges_begin(); hit != iss->halfedges_end(); ++hit){
         const Halfedge_const_handle h = hit;
         if(!h->is_bisector()){
@@ -31,7 +31,7 @@ Edges pmp_create_interior_straight_skeleton(
         if(&*v1 < &*v2){
             std::vector<double> s_vec = {v1->point().x(), v1->point().y(), 0};
             std::vector<double> t_vec = {v2->point().x(), v2->point().y(), 0};
-            Edge edge = std::make_tuple(s_vec, t_vec);
+            compas::Edge edge = std::make_tuple(s_vec, t_vec);
             edgelist.push_back(edge);
         }
 

src/straight_skeleton_2.h

@@ -3,10 +3,8 @@
 
 #include <compas.h>
 
-typedef std::tuple<std::vector<double>, std::vector<double>> Edge;
-typedef std::list<Edge> Edges;
 
-Edges pmp_create_interior_straight_skeleton(
+compas::Edges pmp_create_interior_straight_skeleton(
     Eigen::Ref<const compas::RowMatrixXd> &V);
 
 #endif /* COMPAS_STRAIGHT_SKELETON_2_H */