Add an operation to get a curved blocking edge from its two end points (#368)

Make the cut sheet consistent about edge orientation.

Warning: some tests must be fixed (Paul'Phd work)

Author: franck-ledoux

blocking/inc/gmds/blocking/CurvedBlocking.h

@@ -430,6 +430,22 @@ class LIB_GMDS_BLOCKING_API CurvedBlocking
 	 * @param ALoc the new node location
 	 */
 	void move_node(Node AN, math::Point &ALoc);
+
+		/** Returns the edge that connects nodes of ids @p AN1 and @p AN2
+		 *
+		 * @param AN1 a first node id
+		 * @param AN2 a second node id
+		 * @return the edge connecting @p AN1 and @p AN2
+		 */
+		CurvedBlocking::Edge get_edge(const int AN1, const int AN2);
+		/** Returns the edge that connects nodes @p AN1 and @p AN2
+		 *
+		 * @param AN1 a first node
+		 * @param AN2 a second node
+		 * @return the edge connecting @p AN1 and @p AN2
+		 */
+		CurvedBlocking::Edge get_edge(const CurvedBlocking::Node AN1, const CurvedBlocking::Node AN2);
+
 	/** Get all the edges adjacent to a node
 	 * @param[in] AN a node
 	 * @return the set of edges adjacent to the node.
@@ -554,7 +570,8 @@ class LIB_GMDS_BLOCKING_API CurvedBlocking
 	 */
 	void cut_sheet(const Edge AE, const math::Point &AP);
 	/**@brief Split the sheet defined by edge @p AE at the parameter @p AParam, which is included
-	 * 		 in ]0,1[. The first end point of @p AE is at parameter 0, the second one at parameter 1.
+	 * 		 in ]0,1[. The end point of @p AE with the lowest id is at parameter 0,
+	 * 		 the second one at parameter 1.
 	 *
 	 * @param[in] AE an edge we want to split in two edges
 	 * @param[in] AParam a parameter included in ]0,1[

blocking/src/CurvedBlocking.cpp

@@ -253,7 +253,26 @@ CurvedBlocking::get_blocks_of_face(const Face AF) {
     }
     return blocks;
 }
-
+/*----------------------------------------------------------------------------*/
+CurvedBlocking::Edge CurvedBlocking::get_edge(const CurvedBlocking::Node AN1, const CurvedBlocking::Node AN2)
+{
+	 return get_edge(AN1->info().topo_id,AN2->info().topo_id);
+}
+/*----------------------------------------------------------------------------*/
+CurvedBlocking::Edge CurvedBlocking::get_edge(const int AN1, const int AN2)
+{
+	 auto edges = get_all_edges();
+	 for(auto e: edges){
+		  auto nodes_of_e = get_nodes_of_edge(e);
+		  if(	nodes_of_e[0]->info().topo_id == AN1 &&
+		      nodes_of_e[1]->info().topo_id == AN2)
+			   return e;
+		  else if(	nodes_of_e[0]->info().topo_id == AN2 &&
+		           nodes_of_e[1]->info().topo_id == AN1)
+			   return e;
+	 }
+	 throw GMDSException("No edge with given end points");
+}
 /*----------------------------------------------------------------------------*/
 std::vector<CurvedBlocking::Edge>
 CurvedBlocking::get_all_edges() {
@@ -825,9 +844,15 @@ CurvedBlocking::get_all_sheet_darts(const Edge AE, std::vector<Dart3> &ADarts) {
     auto edge_mark = m_gmap.get_new_mark();
 
     std::vector<Dart3> front;
-    front.push_back(AE->dart());
+	 // For all the sheet operations, we orient the edges using its end point ids (from the lowest to the highest).
+	 // We order that here!!
+	 auto first_dart = AE->dart();
+	 if(m_gmap.attribute<0>(first_dart)->info().topo_id>m_gmap.attribute<0>(m_gmap.alpha<0>(first_dart))->info().topo_id)
+		  first_dart = m_gmap.alpha<0>(first_dart);
+
+    front.push_back(first_dart);
     // the current dart belongs to the final set of darts
-    ADarts.push_back(AE->dart());
+    ADarts.push_back(first_dart);
     // we mark all the dart of the inital edge to avoid to traverse it twice
     m_gmap.mark_cell<1>(AE->dart(), edge_mark);
 

blocking/tst/CurvedBlockingTestSuite.h

@@ -129,7 +129,6 @@ TEST(CurvedBlockingTestSuite, global_cell_accessors)
 	ASSERT_EQ(11, bl.get_all_faces().size());
 	ASSERT_EQ(2,  bl.get_all_blocks().size());
 }
-
 /*----------------------------------------------------------------------------*/
 TEST(CurvedBlockingTestSuite, remove_block)
 {
@@ -188,7 +187,6 @@ TEST(CurvedBlockingTestSuite, single_block)
 		ASSERT_NEAR(block_center.distance(face_center), 0.5, 1e-8);
 	}
 }
-
 /*----------------------------------------------------------------------------*/
 TEST(CurvedBlockingTestSuite, single_block_parallel_edges)
 {
@@ -276,6 +274,44 @@ TEST(CurvedBlockingTestSuite, split_one_block_twice)
 	ASSERT_EQ(20,bl.get_nb_cells<2>());
 	ASSERT_EQ(4,bl.get_nb_cells<3>());
 }
+
+/*----------------------------------------------------------------------------*/
+TEST(CurvedBlockingTestSuite, cut_sheet_param_propag)
+{
+
+	gmds::cad::FACManager geom_model;
+	setUp(geom_model);
+	gmds::blocking::CurvedBlocking bl(&geom_model, true);
+	gmds::blocking::CurvedBlockingClassifier cl(&bl);
+	cl.classify();
+
+	std::vector<gmds::blocking::CurvedBlocking::Face> all_faces = bl.get_all_faces();
+	std::vector<gmds::blocking::CurvedBlocking::Face> surf;
+
+	surf.clear();
+	//We pick a full boundary surface on coord X=5.0 and Y=5.0
+	for(auto f:all_faces){
+		gmds::math::Point ci = bl.get_center_of_face(f);
+		if(fabs(ci.X()-5)<0.1){
+			surf.push_back(f);
+		}
+		else if(fabs(ci.Y()-5)<0.1){
+			surf.push_back(f);
+		}
+		else if(fabs(ci.Z()-5)<0.1){
+			surf.push_back(f);
+		}
+	}
+	ASSERT_TRUE(bl.pillow(surf));
+
+	bl.smooth(10);
+
+	//now we get the edge having end points of ids 1 and 2
+	auto e = bl.get_edge(0,3);
+	bl.cut_sheet(e,0.25);
+
+	ASSERT_EQ(7,bl.get_nb_cells<3>());
+}
 /*----------------------------------------------------------------------------*/
 TEST(CurvedBlockingTestSuite, init_from_geom_bounding_box)
 {
@@ -325,8 +361,6 @@ TEST(CurvedBlockingTestSuite, single_block_to_mesh)
 	ASSERT_EQ(m.getNbFaces(), 6);
 	ASSERT_EQ(m.getNbRegions(), 1);
 }
-
-
 /*----------------------------------------------------------------------------*/
 TEST(CurvedBlockingTestSuite, projection_point_to_edges)
 {
@@ -382,7 +416,6 @@ TEST(CurvedBlockingTestSuite, test_topological_queries)
 		    ASSERT_EQ(1, bs.size());
 	}
 }
-
 /*----------------------------------------------------------------------------*/
 TEST(CurvedBlockingTestSuite, test_init_from_ig_mesh)
 {
@@ -422,7 +455,6 @@ TEST(CurvedBlockingTestSuite, test_init_from_ig_mesh)
 	ASSERT_EQ(16,bl.get_all_faces().size());
 	ASSERT_EQ(3,bl.get_all_blocks().size());
 }
-
 /*----------------------------------------------------------------------------*/
 TEST(CurvedBlockingTestSuite, test_chord_query)
 {
@@ -1129,6 +1161,7 @@ TEST(CurvedBlockingTestSuite, test_pillow_12)
     ASSERT_EQ(nb_faces_on_surface, 34);
     ASSERT_EQ(nb_faces_in_volume, 25);
 }
+/*----------------------------------------------------------------------------*/
 TEST(CurvedBlockingTestSuite, save_vtk_blocking){
 	gmds::cad::FACManager geom_model;
 	setUp(geom_model);
@@ -1137,7 +1170,7 @@ TEST(CurvedBlockingTestSuite, save_vtk_blocking){
 
 	bl.save_vtk_blocking("testSaveWork.vtk");
 }
-
+/*----------------------------------------------------------------------------*/
 TEST(CurvedBlockingTestSuite, get_Id_block){
 	gmds::cad::FACManager geom_model;
 	setUp(geom_model);
@@ -1157,7 +1190,7 @@ TEST(CurvedBlockingTestSuite, get_Id_block){
 	std::cout<<"LE BLOCK TEST "<<bl.get_block_id(block)<<std::endl;
 
 }
-
+/*----------------------------------------------------------------------------*/
 TEST(CurvedBlockingTestSuite, check_capt_Element){
     gmds::cad::FACManager geom_model;
     setUp(geom_model);
@@ -1180,3 +1213,4 @@ TEST(CurvedBlockingTestSuite, check_capt_Element){
         std::cout<<"Check capt possible for the curve "<< c->id()<<"  : "<<bl.check_capt_element(c->id(),c->dim())<<std::endl;
     }
 }
+/*----------------------------------------------------------------------------*/