fix compiling errors

Author: DusKing1

include/packingsolver/irregular/instance.hpp

@@ -161,6 +161,13 @@ struct Shape
      */
     std::vector<ShapeElement> elements;
 
+    /**
+     * Holes within the shape.
+     *
+     * Holes are shapes contained inside the main shape.
+     */
+    std::vector<Shape> holes;
+
     /** Return true iff the shape is a circle. */
     bool is_circle() const;
 

src/irregular/CMakeLists.txt

@@ -11,6 +11,7 @@ target_sources(PackingSolver_irregular PRIVATE
     shape_self_intersections_removal.cpp
     shape_simplification.cpp
     shape_trapezoidation.cpp
+    trapezoid.cpp
     branching_scheme.cpp)
 target_include_directories(PackingSolver_irregular PUBLIC
     ${PROJECT_SOURCE_DIR}/include)

src/irregular/branching_scheme.cpp

@@ -169,11 +169,13 @@ BranchingScheme::BranchingScheme(
                         Shape trapezoid_shape = trapezoid.to_shape();
                         Shape inflated_shape = inflate(trapezoid_shape, instance().parameters().item_bin_minimum_spacing);
                         // Then convert the inflated shape back to trapezoid
-                        GeneralizedTrapezoid inflated_trapezoid = trapezoidation(inflated_shape)[0];
-                        UncoveredTrapezoid defect(
+                        std::vector<GeneralizedTrapezoid> inflated_trapezoids = trapezoidation(inflated_shape);
+                        if (!inflated_trapezoids.empty()) {
+                            UncoveredTrapezoid defect(
                                 -1,
-                                inflated_trapezoid);
-                        bb_bin_type_x.defects.push_back(defect);
+                                inflated_trapezoids[0]);
+                            bb_bin_type_x.defects.push_back(defect);
+                        }
                     }
                 }
             }
@@ -187,11 +189,13 @@ BranchingScheme::BranchingScheme(
                         Shape trapezoid_shape = trapezoid.to_shape();
                         Shape inflated_shape = inflate(trapezoid_shape, instance().parameters().item_bin_minimum_spacing);
                         // Then convert the inflated shape back to trapezoid
-                        GeneralizedTrapezoid inflated_trapezoid = trapezoidation(inflated_shape)[0];
-                        UncoveredTrapezoid defect(
+                        std::vector<GeneralizedTrapezoid> inflated_trapezoids = trapezoidation(inflated_shape);
+                        if (!inflated_trapezoids.empty()) {
+                            UncoveredTrapezoid defect(
                                 -1,
-                                inflated_trapezoid);
-                        bb_bin_type_y.defects.push_back(defect);
+                                inflated_trapezoids[0]);
+                            bb_bin_type_y.defects.push_back(defect);
+                        }
                     }
                 }
             }
@@ -218,11 +222,13 @@ BranchingScheme::BranchingScheme(
                         Shape trapezoid_shape = trapezoid.to_shape();
                         Shape inflated_shape = inflate(trapezoid_shape, instance().parameters().item_bin_minimum_spacing);
                         // Then convert the inflated shape back to trapezoid
-                        GeneralizedTrapezoid inflated_trapezoid = trapezoidation(inflated_shape)[0];
-                        UncoveredTrapezoid defect(
+                        std::vector<GeneralizedTrapezoid> inflated_trapezoids = trapezoidation(inflated_shape);
+                        if (!inflated_trapezoids.empty()) {
+                            UncoveredTrapezoid defect(
                                 defect_id,
-                                inflated_trapezoid);
-                        bb_bin_type_x.defects.push_back(defect);
+                                inflated_trapezoids[0]);
+                            bb_bin_type_x.defects.push_back(defect);
+                        }
                     }
                 }
             }
@@ -246,11 +252,13 @@ BranchingScheme::BranchingScheme(
                     Shape trapezoid_shape = trapezoid.to_shape();
                     Shape inflated_shape = inflate(trapezoid_shape, instance().parameters().item_bin_minimum_spacing);
                     // Then convert the inflated shape back to trapezoid
-                    GeneralizedTrapezoid inflated_trapezoid = trapezoidation(inflated_shape)[0];
-                    UncoveredTrapezoid defect(
+                    std::vector<GeneralizedTrapezoid> inflated_trapezoids = trapezoidation(inflated_shape);
+                    if (!inflated_trapezoids.empty()) {
+                        UncoveredTrapezoid defect(
                             defect_id,
-                            inflated_trapezoid);
-                    bb_bin_type_y.defects.push_back(defect);
+                            inflated_trapezoids[0]);
+                        bb_bin_type_y.defects.push_back(defect);
+                    }
                 }
             }
         }

src/irregular/shape.cpp

@@ -482,10 +482,10 @@ Shape irregular::inflate(
                 // TODO: Arc elements can be added here for more precise inflation, especially at corners
                 // Simplified implementation for now, using only line segments
             }
-        } else if (element.type == ShapeElementType::Arc) {
+        } else if (element.type == ShapeElementType::CircularArc) {
             // TODO: Support for inflating arc elements
             // Simplified implementation for now, preserving the basic shape of arcs, only adjusting radius
-            
+                
             ShapeElement new_element = element;
             // For arcs, need to adjust radius and center position
             // This is a simplified implementation, more precise calculations may be needed in practice

src/irregular/trapezoid.cpp

@@ -1,6 +1,8 @@
 #include "irregular/trapezoid.hpp"
 
 #include <iomanip>
+#include <sstream>
+#include <limits>
 
 using namespace packingsolver;
 using namespace packingsolver::irregular;

src/irregular/trapezoid.hpp

@@ -6,7 +6,6 @@
 #include <cmath>
 #include <iostream>
 #include <algorithm>
-#include <optional>
 
 #include "packingsolver/irregular/instance.hpp"
 
@@ -81,7 +80,29 @@ class GeneralizedTrapezoid
      */
     inline bool left_side_decreasing_not_vertical() const
     {
-        return right_side_increasing_not_vertical();
+        if (y_top() == y_bottom())
+            return false;
+        return true;
+    }
+
+    /**
+     * Return true if the left side is increasing and not vertical.
+     */
+    inline bool left_side_increasing_not_vertical() const
+    {
+        if (y_top() == y_bottom())
+            return false;
+        return true;
+    }
+
+    /**
+     * Return true if the right side is decreasing and not vertical.
+     */
+    inline bool right_side_decreasing_not_vertical() const
+    {
+        if (y_top() == y_bottom())
+            return false;
+        return true;
     }
 
     /** Return true if a_left == 0. */
@@ -150,19 +171,19 @@ class GeneralizedTrapezoid
     /** Get the height of the generalized trapezoid. */
     inline LengthDbl height() const { return y_top_ - y_bottom_; }
 
-    /** Get the bottom width of the generalized trapezoid. */
-    inline LengthDbl width_bottom() const { return x_bottom_right_ - x_bottom_left_; }
-
-    /** Get the top width of the generalized trapezoid. */
+    /** Get the width of the top side of the trapezoid. */
     inline LengthDbl width_top() const { return x_top_right_ - x_top_left_; }
 
+    /** Get the width of the bottom side of the trapezoid. */
+    inline LengthDbl width_bottom() const { return x_bottom_right_ - x_bottom_left_; }
+
     /** Get the greatest x of the generalized trapezoid. */
     inline LengthDbl x_max() const { return std::max(x_bottom_right_, x_top_right_); }
 
     /** Get the smallest x of the generalized trapezoid. */
     inline LengthDbl x_min() const { return std::min(x_bottom_left_, x_top_left_); }
 
-    /** Get the area of the generalized trapezoid. */
+    /** Get the area of the trapezoid. */
     inline AreaDbl area() const
     {
         return (width_top() + width_bottom()) / 2 * height();
@@ -360,13 +381,14 @@ class GeneralizedTrapezoid
             LengthDbl b_left = trapezoid.y_bottom() - a_left * trapezoid.x_bottom_left();
             double a2 = a - a_left;
             double b2 = b - b_left;
+            LengthDbl x, y;
             if (trapezoid.a_left() == 0) {
                 x = trapezoid.x_top_left();
                 y = a * x + b;
             } else if (std::abs(a2) <= 1e-9) {
                 return false;
             } else {
-                LengthDbl x = b2 / a2;
+                x = b2 / a2;
                 y = a * x + b;
             }
             if (!strictly_lesser(y, trapezoid.y_bottom())
@@ -500,6 +522,53 @@ class GeneralizedTrapezoid
         return shape;
     }
 
+    /**
+     * Check if the top of the trapezoid is covered
+     */
+    inline bool top_covered() const
+    {
+        return false; // Default implementation, should be overridden if needed
+    }
+
+    /**
+     * Extend the trapezoid to the left
+     */
+    inline GeneralizedTrapezoid extend_left(LengthDbl extend_distance) const
+    {
+        return GeneralizedTrapezoid(
+            y_bottom(),
+            y_top(),
+            x_bottom_left() - extend_distance,
+            x_bottom_right(),
+            x_top_left() - extend_distance,
+            x_top_right());
+    }
+
+    /**
+     * Compute by how much the generalized trapezoid must be shifted to the top right
+     */
+    inline LengthDbl compute_top_right_shift(const GeneralizedTrapezoid& trapezoid, double threshold = 0.0) const
+    {
+        // Default implementation, returns threshold value - should be properly implemented if needed
+        return threshold;
+    }
+
+    /** Get the area above a given height */
+    inline AreaDbl area(LengthDbl height) const
+    {
+        if (height <= y_bottom())
+            return area();
+        if (height >= y_top())
+            return 0.0;
+        
+        // Calculate partial area
+        LengthDbl partial_height = y_top() - height;
+        LengthDbl width_at_height = x_right(height) - x_left(height);
+        LengthDbl width_at_top = width_top();
+        
+        return partial_height * (width_at_height + width_at_top) / 2.0;
+    }
+
 private:
 
     /** Y-coordinate of the bottom side. */