Update shape dependency

Author: fontanf

extern/CMakeLists.txt

@@ -14,7 +14,7 @@ FetchContent_MakeAvailable(optimizationtools)
 FetchContent_Declare(
     shape
     GIT_REPOSITORY https://github.com/fontanf/shape.git
-    GIT_TAG d386f6b6fed620b16d030fdcd8561bec4f809456
+    GIT_TAG f57888d953aa6065aab6f5174363b5c5990a2c77
     #SOURCE_DIR "${PROJECT_SOURCE_DIR}/../shape/"
     EXCLUDE_FROM_ALL)
 FetchContent_MakeAvailable(shape)

include/packingsolver/irregular/instance.hpp

@@ -41,22 +41,13 @@ struct Parameters
 struct Defect
 {
     /** Shape. */
-    Shape shape_orig;
+    ShapeWithHoles shape_orig;
 
     /** Scaled shape. */
-    Shape shape_scaled;
-
-    /** Holes. */
-    std::vector<Shape> holes_orig;
-
-    /** Scaled oles. */
-    std::vector<Shape> holes_scaled;
+    ShapeWithHoles shape_scaled;
 
     /** Inflated (scaled) shape. */
-    Shape shape_inflated;
-
-    /** Inflated (scaled) holes. */
-    std::vector<Shape> holes_deflated;
+    ShapeWithHoles shape_inflated;
 
     /** Type of the defect. */
     DefectTypeId type = -1;
@@ -125,26 +116,13 @@ struct BinType
 struct ItemShape
 {
     /** Main shape. */
-    Shape shape_orig;
-
-    /**
-     * Holes.
-     *
-     * Holes are shapes contained inside the main shape.
-     */
-    std::vector<Shape> holes_orig;
+    ShapeWithHoles shape_orig;
 
     /** Scaled shape. */
-    Shape shape_scaled;
-
-    /** Scaled Holes. */
-    std::vector<Shape> holes_scaled;
+    ShapeWithHoles shape_scaled;
 
     /** Inflated (scaled) shape. */
-    Shape shape_inflated;
-
-    /** Inflated (scaled) holes. */
-    std::vector<Shape> holes_deflated;
+    ShapeWithHoles shape_inflated;
 
     /** Quality rule. */
     QualityRule quality_rule = 0;

include/packingsolver/irregular/instance_builder.hpp

@@ -57,8 +57,7 @@ class InstanceBuilder
     void add_defect(
             BinTypeId bin_type_id,
             DefectTypeId type,
-            const Shape& shape,
-            const std::vector<Shape>& holes = {});
+            const ShapeWithHoles& shape);
 
     /**
      * Add a bin type from another bin type.

src/irregular/branching_scheme.cpp

@@ -8,9 +8,9 @@ using namespace packingsolver::irregular;
 
 bool ItemShape::check() const
 {
-    if (!shape_orig.check())
+    if (!shape_orig.shape.check())
         return false;
-    for (const Shape& hole: holes_orig)
+    for (const Shape& hole: shape_orig.holes)
         if (!hole.check())
             return false;
     return true;
@@ -22,13 +22,6 @@ std::string ItemShape::to_string(
     std::string s = "\n";
     std::string indent = std::string(indentation, ' ');
     s += indent + "- shape: " + shape_orig.to_string(indentation + 2) + "\n";
-    if (holes_orig.size() == 1) {
-        s += indent + "- holes: " + holes_orig.front().to_string(indentation + 2) + "\n";
-    } else if (holes_orig.size() >= 2) {
-        s += indent + "- holes\n";
-        for (const Shape& hole: holes_orig)
-            s += indent + "  - " + hole.to_string(indentation + 4) + "\n";
-    }
     s += "- quality rule: " + std::to_string(quality_rule);
     return s;
 }
@@ -51,38 +44,38 @@ ShapeType ItemType::shape_type() const
 {
     // Circle.
     if (shapes.size() == 1
-            && shapes.front().shape_scaled.is_circle()
-            && shapes.front().holes_scaled.empty())
+            && shapes.front().shape_scaled.shape.is_circle()
+            && shapes.front().shape_scaled.holes.empty())
         return ShapeType::Circle;
     // Square.
     if (shapes.size() == 1
-            && shapes.front().shape_scaled.is_square()
-            && shapes.front().holes_scaled.empty())
+            && shapes.front().shape_scaled.shape.is_square()
+            && shapes.front().shape_scaled.holes.empty())
         return ShapeType::Square;
     // Rectangle.
     if (shapes.size() == 1
-            && shapes.front().shape_scaled.is_rectangle()
-            && shapes.front().holes_scaled.empty())
+            && shapes.front().shape_scaled.shape.is_rectangle()
+            && shapes.front().shape_scaled.holes.empty())
         return ShapeType::Rectangle;
     // Polygon.
     if (shapes.size() == 1
-            && shapes.front().shape_scaled.is_polygon()
-            && shapes.front().holes_scaled.empty())
+            && shapes.front().shape_scaled.shape.is_polygon()
+            && shapes.front().shape_scaled.holes.empty())
         return ShapeType::Polygon;
     // MultiPolygon.
     bool is_multi_polygon = true;
     for (const ItemShape& item_shape: shapes)
-        if (!item_shape.shape_scaled.is_polygon()
-                || !item_shape.holes_scaled.empty())
+        if (!item_shape.shape_scaled.shape.is_polygon()
+                || !item_shape.shape_scaled.holes.empty())
             is_multi_polygon = false;
     if (is_multi_polygon)
         return ShapeType::MultiPolygon;
     // PolygonWithHoles.
     if (shapes.size() == 1) {
         bool is_polygon_with_holes = true;
-        if (!shapes.front().shape_scaled.is_polygon())
+        if (!shapes.front().shape_scaled.shape.is_polygon())
             is_polygon_with_holes = false;
-        for (const Shape& hole: shapes.front().holes_scaled)
+        for (const Shape& hole: shapes.front().shape_scaled.holes)
             if (!hole.is_polygon())
                 is_polygon_with_holes = false;
         if (is_polygon_with_holes)
@@ -91,9 +84,9 @@ ShapeType ItemType::shape_type() const
     // MultiPolygonWithHoles.
     bool is_multi_polygon_with_holes = true;
     for (const ItemShape& item_shape: shapes) {
-        if (!item_shape.shape_scaled.is_polygon())
+        if (!item_shape.shape_scaled.shape.is_polygon())
             is_multi_polygon_with_holes = false;
-        for (const Shape& hole: item_shape.holes_scaled)
+        for (const Shape& hole: item_shape.shape_scaled.holes)
             if (!hole.is_polygon())
                 is_multi_polygon_with_holes = false;
     }
@@ -114,9 +107,9 @@ std::pair<Point, Point> ItemType::compute_min_max(
     LengthDbl y_max = -std::numeric_limits<LengthDbl>::infinity();
     for (const ItemShape& item_shape: shapes) {
         auto points =
-            (type == 0)? item_shape.shape_orig.compute_min_max(angle, mirror):
-            (type == 1)? item_shape.shape_scaled.compute_min_max(angle, mirror):
-            item_shape.shape_inflated.compute_min_max(angle, mirror);
+            (type == 0)? item_shape.shape_orig.shape.compute_min_max(angle, mirror):
+            (type == 1)? item_shape.shape_scaled.shape.compute_min_max(angle, mirror):
+            item_shape.shape_inflated.shape.compute_min_max(angle, mirror);
         x_min = std::min(x_min, points.first.x);
         x_max = std::max(x_max, points.second.x);
         y_min = std::min(y_min, points.first.y);
@@ -182,13 +175,11 @@ void ItemType::write_svg(
     LengthDbl width = (mm.second.x - mm.first.x);
     LengthDbl height = (mm.second.y - mm.first.y);
 
-    double factor = compute_svg_factor(width);
-
     std::string s = "<svg viewBox=\""
-        + std::to_string(mm.first.x * factor)
-        + " " + std::to_string(-mm.first.y * factor - height * factor)
-        + " " + std::to_string(width * factor)
-        + " " + std::to_string(height * factor)
+        + std::to_string(mm.first.x)
+        + " " + std::to_string(-mm.first.y - height)
+        + " " + std::to_string(width)
+        + " " + std::to_string(height)
         + "\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n";
     file << s;
 
@@ -198,8 +189,8 @@ void ItemType::write_svg(
             ++item_shape_pos) {
         const auto& item_shape = shapes[item_shape_pos];
         file << "<g>" << std::endl;
-        file << to_svg(item_shape.shape_scaled, item_shape.holes_scaled, factor, "blue");
-        file << to_svg(item_shape.shape_inflated, item_shape.holes_deflated, factor, "red");
+        file << item_shape.shape_scaled.to_svg("blue");
+        file << item_shape.shape_inflated.to_svg("red");
         //file << "<text x=\"" << std::to_string(x * factor)
         //    << "\" y=\"" << std::to_string(-y * factor)
         //    << "\" dominant-baseline=\"middle\" text-anchor=\"middle\">"
@@ -238,23 +229,17 @@ void BinType::write_svg(
     LengthDbl width = (x_max - x_min);
     LengthDbl height = (y_max - y_min);
 
-    double factor = compute_svg_factor(width);
-    while (width * factor > 1000)
-        factor /= 10;
-    while (width * factor < 100)
-        factor *= 10;
-
     std::string s = "<svg viewBox=\""
-        + std::to_string(x_min * factor)
-        + " " + std::to_string(-y_min * factor - height * factor)
-        + " " + std::to_string(width * factor)
-        + " " + std::to_string(height * factor)
+        + std::to_string(x_min)
+        + " " + std::to_string(-y_min - height)
+        + " " + std::to_string(width)
+        + " " + std::to_string(height)
         + "\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n";
     file << s;
 
     // Loop through trapezoids of the trapezoid set.
     file << "<g>" << std::endl;
-    file << to_svg(shape_scaled, {}, factor);
+    file << shape_scaled.to_svg();
     //file << "<text x=\"" << std::to_string(x * factor)
     //    << "\" y=\"" << std::to_string(-y * factor)
     //    << "\" dominant-baseline=\"middle\" text-anchor=\"middle\">"
@@ -264,7 +249,7 @@ void BinType::write_svg(
 
     for (const Defect& defect: defects) {
         file << "<g>" << std::endl;
-        file << to_svg(defect.shape_scaled, defect.holes_scaled, factor);
+        file << defect.shape_scaled.to_svg();
         file << "</g>" << std::endl;
     }
 
@@ -424,7 +409,7 @@ std::ostream& Instance::format(
                     << std::setw(12) << item_type_id
                     << std::setw(12) << shape_pos
                     << std::setw(12) << item_shape.quality_rule
-                    << std::setw(12) << item_shape.holes_orig.size()
+                    << std::setw(12) << item_shape.shape_orig.holes.size()
                     << std::endl;
             }
         }
@@ -485,9 +470,9 @@ std::ostream& Instance::format(
             for (DefectId k = 0; k < (DefectId)bin_type.defects.size(); ++k) {
                 const Defect& defect = bin_type.defects[k];
                 for (Counter element_pos = 0;
-                        element_pos < (Counter)defect.shape_orig.elements.size();
+                        element_pos < (Counter)defect.shape_orig.shape.elements.size();
                         ++element_pos) {
-                    const ShapeElement& element = defect.shape_orig.elements[element_pos];
+                    const ShapeElement& element = defect.shape_orig.shape.elements[element_pos];
                     os
                         << std::setw(2) << "B"
                         << std::setw(5) << bin_type_id
@@ -505,9 +490,9 @@ std::ostream& Instance::format(
                         << std::endl;
                 }
                 for (Counter hole_pos = 0;
-                        hole_pos < (Counter)defect.holes_orig.size();
+                        hole_pos < (Counter)defect.shape_orig.holes.size();
                         ++hole_pos) {
-                    const Shape& hole = defect.holes_orig[hole_pos];
+                    const Shape& hole = defect.shape_orig.holes[hole_pos];
                     for (Counter element_pos = 0;
                             element_pos < (Counter)hole.elements.size();
                             ++element_pos) {
@@ -541,9 +526,9 @@ std::ostream& Instance::format(
                     ++shape_pos) {
                 const ItemShape& item_shape = item_type.shapes[shape_pos];
                 for (Counter element_pos = 0;
-                        element_pos < (Counter)item_shape.shape_orig.elements.size();
+                        element_pos < (Counter)item_shape.shape_orig.shape.elements.size();
                         ++element_pos) {
-                    const ShapeElement& element = item_shape.shape_orig.elements[element_pos];
+                    const ShapeElement& element = item_shape.shape_orig.shape.elements[element_pos];
                     os
                         << std::setw(2) << "I"
                         << std::setw(5) << item_type_id
@@ -561,9 +546,9 @@ std::ostream& Instance::format(
                         << std::endl;
                 }
                 for (Counter hole_pos = 0;
-                        hole_pos < (Counter)item_shape.holes_orig.size();
+                        hole_pos < (Counter)item_shape.shape_orig.holes.size();
                         ++hole_pos) {
-                    const Shape& hole = item_shape.holes_orig[hole_pos];
+                    const Shape& hole = item_shape.shape_orig.holes[hole_pos];
                     for (Counter element_pos = 0;
                             element_pos < (Counter)hole.elements.size();
                             ++element_pos) {
@@ -623,11 +608,11 @@ void Instance::write(
                 ++defect_id) {
             const Defect& defect = bin_type.defects[defect_id];
             json["bin_types"][bin_type_id]["defects"][defect_id]["type"] = "general";
-            json["bin_types"][bin_type_id]["defects"][defect_id]["elements"] = defect.shape_orig.to_json();
+            json["bin_types"][bin_type_id]["defects"][defect_id]["elements"] = defect.shape_orig.shape.to_json();
             for (Counter hole_pos = 0;
-                    hole_pos < (Counter)defect.holes_orig.size();
+                    hole_pos < (Counter)defect.shape_orig.holes.size();
                     ++hole_pos) {
-                const Shape& hole = defect.holes_orig[hole_pos];
+                const Shape& hole = defect.shape_orig.holes[hole_pos];
                 json["bin_types"][bin_type_id]["defects"][defect_id]["holes"][hole_pos]["type"] = "general";
                 json["bin_types"][bin_type_id]["defects"][defect_id]["holes"][hole_pos]["elements"] = hole.to_json();
             }
@@ -653,11 +638,11 @@ void Instance::write(
                 ++item_shape_pos) {
             const ItemShape& item_shape = item_type.shapes[item_shape_pos];
             json["item_types"][item_type_id]["shapes"][item_shape_pos]["type"] = "general";
-            json["item_types"][item_type_id]["shapes"][item_shape_pos]["elements"] = item_shape.shape_orig.to_json();
+            json["item_types"][item_type_id]["shapes"][item_shape_pos]["elements"] = item_shape.shape_orig.shape.to_json();
             for (Counter hole_pos = 0;
-                    hole_pos < (Counter)item_shape.holes_orig.size();
+                    hole_pos < (Counter)item_shape.shape_orig.holes.size();
                     ++hole_pos) {
-                const Shape& hole = item_shape.holes_orig[hole_pos];
+                const Shape& hole = item_shape.shape_orig.holes[hole_pos];
                 json["item_types"][item_type_id]["shapes"][item_shape_pos]["holes"][hole_pos]["type"] = "general";
                 json["item_types"][item_type_id]["shapes"][item_shape_pos]["holes"][hole_pos]["elements"] = hole.to_json();
             }