Make the keep_out mandatory in path finding.

An empty keep_out will behave like a missing one anyway.
pcb2gcode · Jul 3, 2020 · 1879336 · 1879336
1 parent 68cca9d
commit 1879336
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/path_finding.cpp b/path_finding.cpp
@@ -26,16 +26,12 @@ using std::make_shared;
 class PathFindingSurface {
  public:
   PathFindingSurface(const multi_polygon_type_fp& keep_in,
-                     const optional<multi_polygon_type_fp>& keep_out,
-                     const coordinate_type_fp tolerance) {
+                     const multi_polygon_type_fp& keep_out,
+                     coordinate_type_fp tolerance) {
     multi_polygon_type_fp total_keep_in;
     total_keep_in = keep_in;
-    // By here, total_keep_in_grown is ready.
-    if (keep_out) {
-      total_keep_in = total_keep_in - *keep_out;
-    }
+    total_keep_in = total_keep_in - keep_out;
 
-    all_vertices.clear();
     for (const auto& poly : total_keep_in) {
       for (const auto& point : poly.outer()) {
         all_vertices.push_back(point);
@@ -362,7 +358,7 @@ struct AstarGoalVisitor : public boost::default_astar_visitor {
 
 const std::shared_ptr<const PathFindingSurface> create_path_finding_surface(
     const multi_polygon_type_fp& keep_in,
-    const boost::optional<multi_polygon_type_fp>& keep_out,
+    const multi_polygon_type_fp& keep_out,
     const coordinate_type_fp tolerance) {
   boost::function_requires<boost::VertexListGraphConcept<PathSurface>>();
   boost::function_requires<boost::IncidenceGraphConcept<PathSurface>>();

diff --git a/path_finding.hpp b/path_finding.hpp
@@ -22,7 +22,7 @@ typedef std::function<bool(const point_type_fp& target, const coordinate_type_fp
 // small epsilon value.
 const std::shared_ptr<const PathFindingSurface> create_path_finding_surface(
     const multi_polygon_type_fp& keep_in,
-    const boost::optional<multi_polygon_type_fp>& keep_out,
+    const multi_polygon_type_fp& keep_out,
     const coordinate_type_fp tolerance);
 
 

diff --git a/path_finding_tests.cpp b/path_finding_tests.cpp
@@ -23,7 +23,7 @@ BOOST_AUTO_TEST_CASE(simple) {
   bg::expand(bounding_box, point_type_fp(100, 100));
   multi_polygon_type_fp keep_in;
   bg::convert(bounding_box, keep_in);
-  auto surface = create_path_finding_surface(keep_in, boost::none, 0.1);
+  auto surface = create_path_finding_surface(keep_in, multi_polygon_type_fp(), 0.1);
   auto ret = find_path(surface, point_type_fp(0,0), point_type_fp(1,1), nullptr);
   linestring_type_fp expected;
   expected.push_back(point_type_fp(0, 0));
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(box) {
   bg::expand(bounding_box, point_type_fp(100, 100));
   multi_polygon_type_fp keep_in;
   bg::convert(bounding_box, keep_in);
-  auto surface = create_path_finding_surface(keep_in, boost::make_optional(keep_out), 0.1);
+  auto surface = create_path_finding_surface(keep_in, keep_out, 0.1);
   auto ret = find_path(surface, point_type_fp(0,0), point_type_fp(10,10), nullptr);
 
   linestring_type_fp expected;
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(unreachable_box) {
   bg::expand(bounding_box, point_type_fp(100, 100));
   multi_polygon_type_fp keep_in;
   bg::convert(bounding_box, keep_in);
-  auto surface = create_path_finding_surface(keep_in, boost::make_optional(keep_out), 0.1);
+  auto surface = create_path_finding_surface(keep_in, keep_out, 0.1);
   auto ret = find_path(surface, point_type_fp(0,0), point_type_fp(5,5), nullptr);
 
   BOOST_CHECK_EQUAL(ret, boost::none);
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE(reuse_surface) {
   bg::expand(bounding_box, point_type_fp(100, 100));
   multi_polygon_type_fp keep_in;
   bg::convert(bounding_box, keep_in);
-  auto surface = create_path_finding_surface(keep_in, boost::make_optional(keep_out), 0.1);
+  auto surface = create_path_finding_surface(keep_in, keep_out, 0.1);
   auto ret = find_path(surface, point_type_fp(0,0), point_type_fp(5,5), nullptr);
   BOOST_CHECK_EQUAL(ret, boost::none);
 
@@ -119,7 +119,7 @@ BOOST_AUTO_TEST_CASE(u_shape) {
   poly.outer() = u_shape;
   multi_polygon_type_fp keep_in;
   keep_in.push_back(poly);
-  auto surface = create_path_finding_surface(keep_in, boost::none, 0.1);
+  auto surface = create_path_finding_surface(keep_in, multi_polygon_type_fp(), 0.1);
   auto ret = find_path(surface, point_type_fp(1,9), point_type_fp(9,9), nullptr);
 
   linestring_type_fp expected;

diff --git a/surface_vectorial.cpp b/surface_vectorial.cpp
@@ -695,7 +695,7 @@ vector<pair<linestring_type_fp, bool>> Surface_vectorial::get_single_toolpath(
                        diameter, overlap, extra_passes + 1, do_voronoi, mill->offset);
     multi_polygon_type_fp keep_in;
     keep_in.push_back(current_voronoi);
-    optional<multi_polygon_type_fp> keep_out;
+    multi_polygon_type_fp keep_out;
     if (current_trace) {
       keep_out = bg_helpers::buffer(*current_trace, diameter/2 + mill->offset);
     }