mcts: added check for the blocks centroid to get_possible_block_removals

Author: nicolaslg

mctsblock/inc/gmds/mctsblock/Blocking.h

@@ -323,7 +323,7 @@ class LIB_GMDS_MCTSBLOCK_API Blocking
 	/**@brief gives access to the associated geom model
 	 * @return the internal geom model
 	 */
-	cad::GeomManager *geom_model();
+	cad::GeomManager *geom_model() const;
 	/**@brief Gives the number of @p TDim-cells in the blocking structure.
 	 * 		 @p TDIM must be comprised in [0,3].
 	 *

mctsblock/inc/gmds/mctsblock/BlockingState.h

@@ -61,8 +61,9 @@ class LIB_GMDS_MCTSBLOCK_API BlockingState : public IState
 	 */
 	std::vector<std::shared_ptr<IAction>> get_possible_cuts() const;
 
-	/**@brief This method return all the possible block erasing. A block can be erase if it doesn't not belong a corner
-	 * that is the only one to capture a point
+	/**@brief This method returns all the possible block erasing. A block can be erased if
+	 *  - it doesn't not belong a corner that is the only one to capture a point.
+	 *  - its centroid is not inside the volume
 	 * @return a vector of block ids. */
 	std::vector<std::shared_ptr<IAction>> get_possible_block_removals() const;
 

mctsblock/src/Blocking.cpp

@@ -68,7 +68,7 @@ Blocking::gmap()
 
 /*----------------------------------------------------------------------------*/
 cad::GeomManager *
-Blocking::geom_model()
+Blocking::geom_model() const
 {
 	return m_geom_model;
 }

mctsblock/src/BlockingState.cpp

@@ -3,6 +3,9 @@
 #include <gmds/mctsblock/BlockingState.h>
 #include <gmds/mctsblock/BlockingAction.h>
 #include <gmds/utils/Exception.h>
+#include <gmds/cad/GeomManager.h>
+/*----------------------------------------------------------------------------*/
+#include <vector>
 /*----------------------------------------------------------------------------*/
 using namespace gmds;
 using namespace gmds::mctsblock;
@@ -131,6 +134,19 @@ BlockingState::get_possible_block_removals() const
 			}
 		}
 	}
+
+	// identify blocks with their centroid inside the geometry
+	cad::GeomManager *geom = m_blocking->geom_model();
+
+	auto blocks = m_blocking->get_all_blocks();
+	for (auto b : blocks) {
+		gmds::math::Point pt = m_blocking->get_center_of_block(b);
+		bool is_inside = geom->is_in(pt);
+		if(is_inside) {
+			blocks_to_keep.insert(m_blocking->get_block_id(b));
+		}
+	}
+
 	// all the other blocks can be removed
 	auto all_blocks = m_blocking->get_all_id_blocks();
 	std::vector<std::shared_ptr<IAction> > actions;

mctsblock/src/main_blocker.cpp

@@ -131,6 +131,7 @@ int main(int argc, char* argv[])
 	 // Geometry initialization
 	 cad::FACManager geom_model;
 	 init_geom(geom_model, file_geom);
+	 geom_model.buildGTSTree();
 
 	 // We initialize the blocking structure from the geom model
 	 mctsblock::Blocking bl(&geom_model, false);