Add problem type irregular (#38)

* Update irregular branching scheme

* Update README

Author: fontanf

README.md

@@ -26,6 +26,11 @@ PackingSolver solves the following problem types:
 
 ![Example](img/onedimensional.png?raw=true "Example onedimensional")
 
+* `irregular`
+  * Items: two-dimensional polygons
+
+![Example](img/irregular.png?raw=true "Example irregular")
+
 ## Problem type `rectangleguillotine`
 
 Features:
@@ -98,6 +103,19 @@ Features:
   * Maximum weight
 * Item type / Bin type eligibility
 
+## Problem type `irregular`
+
+Features:
+* Objectives:
+  * Knapsack
+  * Open dimension X
+  * Open dimension Y
+  * Bin packing
+  * Bin packing with leftovers
+  * Variable-sized bin packing
+* Item types
+  * Discrete rotations
+
 ## Usage
 
 For macOS, CLP needs to be installed manually with [Homebrew](https://brew.sh/):

extern/CMakeLists.txt

@@ -56,8 +56,8 @@ if (PackingSolver_USE_KNITRO)
     FetchContent_Declare(
         knitrocpp
         GIT_REPOSITORY https://github.com/fontanf/knitrocpp.git
-        GIT_TAG 6c63e3f3931329e2c1a2c22ce465fe8667516a36)
-    #SOURCE_DIR "${PROJECT_SOURCE_DIR}/../knitrocpp/"
-    FetchContent_MakeAvailable(knitrocpp
-    EXCLUDE_FROM_ALL)
+        GIT_TAG 6c63e3f3931329e2c1a2c22ce465fe8667516a36
+        #SOURCE_DIR "${PROJECT_SOURCE_DIR}/../knitrocpp/"
+        EXCLUDE_FROM_ALL)
+    FetchContent_MakeAvailable(knitrocpp)
 endif()

img/irregular.png

@@ -9,6 +9,7 @@ namespace irregular
 
 using LengthDbl = double;
 using AreaDbl = double;
+using ElementPos = int64_t;
 
 /**
  * Structure for a point.
@@ -21,6 +22,8 @@ struct Point
     /** y-coordiante. */
     LengthDbl y;
 
+    Point rotate(Angle angle) const;
+
     bool operator==(const Point& point) const { return x == point.x && y == point.y; }
 
     std::string to_string() const;
@@ -49,10 +52,6 @@ LengthDbl cross_product(
         const Point& vector_1,
         const Point& vector_2);
 
-Point rotate(
-        const Point& point,
-        Angle angle);
-
 Angle angle(
         const Point& vector);
 
@@ -99,13 +98,11 @@ struct ShapeElement
     /** Length of the element. */
     LengthDbl length() const;
 
+    ShapeElement rotate(Angle angle) const;
+
     std::string to_string() const;
 };
 
-ShapeElement rotate(
-        const ShapeElement& element,
-        Angle angle);
-
 enum class ShapeType
 {
     Circle,
@@ -158,6 +155,10 @@ struct Shape
     /* Check if the shape is connected and in anticlockwise direction. */
     bool check() const;
 
+    Shape rotate(Angle angle) const;
+
+    Shape identity_line_axial_symmetry() const;
+
     std::string to_string(Counter indentation) const;
 };
 
@@ -364,7 +365,7 @@ class Instance
     inline AreaDbl previous_bin_area(BinPos bin_pos) const { return previous_bins_area_[bin_pos]; }
 
     /** Get the total area of the bins. */
-    inline Area bin_area() const { return bin_area_; }
+    inline AreaDbl bin_area() const { return bin_area_; }
 
     /** Get the number of defects. */
     inline DefectId number_of_defects() const { return number_of_defects_; }
@@ -374,12 +375,12 @@ class Instance
      */
 
     /** Get the x of a bin type depending on its orientation. */
-    inline Length x_max(
+    inline LengthDbl x_max(
             const BinType& bin_type,
             Direction o) const;
 
     /** Get the y of a bin type depending on its orientation. */
-    inline Length y_max(
+    inline LengthDbl y_max(
             const BinType& bin_type,
             Direction o) const;
 
@@ -496,14 +497,14 @@ class Instance
 /////////////////////////////// Inlined methods ////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-Length Instance::x_max(
+LengthDbl Instance::x_max(
         const BinType& bin_type,
         Direction o) const
 {
     return (o == Direction::X)? bin_type.x_max: bin_type.y_max;
 }
 
-Length Instance::y_max(
+LengthDbl Instance::y_max(
         const BinType& bin_type,
         Direction o) const
 {

include/packingsolver/irregular/instance.hpp

@@ -6,8 +6,7 @@ target_sources(PackingSolver_irregular PRIVATE
     solution.cpp
     algorithm_formatter.cpp
     optimize.cpp
-    covering_with_rectangles.cpp
-    clustering.cpp
+    polygon_trapezoidation.cpp
     branching_scheme.cpp)
 target_include_directories(PackingSolver_irregular PUBLIC
     ${PROJECT_SOURCE_DIR}/include)