Add new dynamic_programming_infinite_copies_array algorithm for rectangleguillotine

fontanf · fontanf · commit da2af179be17 · 2026-06-17T11:24:08.000+02:00
diff --git a/data/rectangleguillotine/tests/knapsack_uo/bins.csv b/data/rectangleguillotine/tests/knapsack_uo/bins.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT
+10,5
diff --git a/data/rectangleguillotine/tests/knapsack_uo/items.csv b/data/rectangleguillotine/tests/knapsack_uo/items.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT,ORIENTED,COPIES
+10,5,1,100
diff --git a/data/rectangleguillotine/tests/knapsack_uo/parameters.csv b/data/rectangleguillotine/tests/knapsack_uo/parameters.csv
@@ -0,0 +1,3 @@
+NAME,VALUE
+objective,knapsack
+number_of_stages,u
diff --git a/data/rectangleguillotine/tests/knapsack_uo/solution.csv b/data/rectangleguillotine/tests/knapsack_uo/solution.csv
@@ -0,0 +1,3 @@
+PLATE_ID,COPIES,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
+0,1,0,0,0,10,5,0,0,
+0,1,1,0,0,10,5,0,1,0
diff --git a/data/rectangleguillotine/tests/knapsack_uo_cut_thickness/bins.csv b/data/rectangleguillotine/tests/knapsack_uo_cut_thickness/bins.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT
+21,5
diff --git a/data/rectangleguillotine/tests/knapsack_uo_cut_thickness/items.csv b/data/rectangleguillotine/tests/knapsack_uo_cut_thickness/items.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT,ORIENTED,COPIES
+10,5,1,100
diff --git a/data/rectangleguillotine/tests/knapsack_uo_cut_thickness/parameters.csv b/data/rectangleguillotine/tests/knapsack_uo_cut_thickness/parameters.csv
@@ -0,0 +1,4 @@
+NAME,VALUE
+objective,knapsack
+number_of_stages,u
+cut_thickness,1
diff --git a/data/rectangleguillotine/tests/knapsack_uo_cut_thickness/solution.csv b/data/rectangleguillotine/tests/knapsack_uo_cut_thickness/solution.csv
@@ -0,0 +1,6 @@
+PLATE_ID,COPIES,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
+0,1,0,0,0,21,5,0,0,
+0,1,1,0,0,21,5,-2,1,0
+0,1,2,0,0,21,5,-2,2,1
+0,1,3,0,0,10,5,0,3,2
+0,1,4,11,0,10,5,0,3,2
diff --git a/data/rectangleguillotine/tests/knapsack_uo_trims/bins.csv b/data/rectangleguillotine/tests/knapsack_uo_trims/bins.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT,LEFT_TRIM,RIGHT_TRIM,BOTTOM_TRIM,TOP_TRIM
+20,15,2,3,2,3
diff --git a/data/rectangleguillotine/tests/knapsack_uo_trims/items.csv b/data/rectangleguillotine/tests/knapsack_uo_trims/items.csv
@@ -0,0 +1,5 @@
+WIDTH,HEIGHT,ORIENTED
+10,6,1
+9,4,1
+5,7,2
+4,3,2
diff --git a/data/rectangleguillotine/tests/knapsack_uo_trims/parameters.csv b/data/rectangleguillotine/tests/knapsack_uo_trims/parameters.csv
@@ -0,0 +1,3 @@
+NAME,VALUE
+objective,knapsack
+number_of_stages,u
diff --git a/data/rectangleguillotine/tests/knapsack_uo_trims/solution.csv b/data/rectangleguillotine/tests/knapsack_uo_trims/solution.csv
@@ -0,0 +1,20 @@
+PLATE_ID,COPIES,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
+0,1,0,0,0,20,15,0,0,
+0,1,1,0,0,2,2,-1,-1,0
+0,1,2,0,2,2,13,-1,-1,0
+0,1,3,2,0,18,2,-1,-1,0
+0,1,4,2,2,18,13,-2,0,0
+0,1,5,2,2,15,13,-2,1,4
+0,1,6,2,2,15,10,-2,2,5
+0,1,7,2,2,5,10,-2,3,6
+0,1,8,2,2,5,3,-2,4,7
+0,1,9,2,2,1,3,-1,5,8
+0,1,10,3,2,4,3,3,5,8
+0,1,11,2,5,5,7,2,4,7
+0,1,12,7,2,10,10,-2,3,6
+0,1,13,7,2,10,4,-2,4,12
+0,1,14,7,2,1,4,-1,5,13
+0,1,15,8,2,9,4,1,5,13
+0,1,16,7,6,10,6,0,4,12
+0,1,17,2,12,15,3,-1,2,5
+0,1,18,17,2,3,13,-3,1,4
diff --git a/data/rectangleguillotine/tests/knapsack_uo_x/bins.csv b/data/rectangleguillotine/tests/knapsack_uo_x/bins.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT
+20,5
diff --git a/data/rectangleguillotine/tests/knapsack_uo_x/items.csv b/data/rectangleguillotine/tests/knapsack_uo_x/items.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT,ORIENTED,COPIES
+10,5,1,100
diff --git a/data/rectangleguillotine/tests/knapsack_uo_x/parameters.csv b/data/rectangleguillotine/tests/knapsack_uo_x/parameters.csv
@@ -0,0 +1,3 @@
+NAME,VALUE
+objective,knapsack
+number_of_stages,u
diff --git a/data/rectangleguillotine/tests/knapsack_uo_x/solution.csv b/data/rectangleguillotine/tests/knapsack_uo_x/solution.csv
@@ -0,0 +1,6 @@
+PLATE_ID,COPIES,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
+0,1,0,0,0,20,5,0,0,
+0,1,1,0,0,20,5,-2,1,0
+0,1,2,0,0,20,5,-2,2,1
+0,1,3,0,0,10,5,0,3,2
+0,1,4,10,0,10,5,0,3,2
diff --git a/data/rectangleguillotine/tests/knapsack_uo_y/bins.csv b/data/rectangleguillotine/tests/knapsack_uo_y/bins.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT
+10,10
diff --git a/data/rectangleguillotine/tests/knapsack_uo_y/items.csv b/data/rectangleguillotine/tests/knapsack_uo_y/items.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT,ORIENTED,COPIES
+10,5,1,100
diff --git a/data/rectangleguillotine/tests/knapsack_uo_y/parameters.csv b/data/rectangleguillotine/tests/knapsack_uo_y/parameters.csv
@@ -0,0 +1,3 @@
+NAME,VALUE
+objective,knapsack
+number_of_stages,u
diff --git a/data/rectangleguillotine/tests/knapsack_uo_y/solution.csv b/data/rectangleguillotine/tests/knapsack_uo_y/solution.csv
@@ -0,0 +1,5 @@
+PLATE_ID,COPIES,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
+0,1,0,0,0,10,10,0,0,
+0,1,1,0,0,10,10,-2,1,0
+0,1,2,0,0,10,5,0,2,1
+0,1,3,0,5,10,5,0,2,1
diff --git a/data/rectangleguillotine/tests/knapsack_ur/bins.csv b/data/rectangleguillotine/tests/knapsack_ur/bins.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT
+5,10
diff --git a/data/rectangleguillotine/tests/knapsack_ur/items.csv b/data/rectangleguillotine/tests/knapsack_ur/items.csv
@@ -0,0 +1,2 @@
+WIDTH,HEIGHT,ORIENTED,COPIES
+10,5,0,100
diff --git a/data/rectangleguillotine/tests/knapsack_ur/parameters.csv b/data/rectangleguillotine/tests/knapsack_ur/parameters.csv
@@ -0,0 +1,3 @@
+NAME,VALUE
+objective,knapsack
+number_of_stages,u
diff --git a/data/rectangleguillotine/tests/knapsack_ur/solution.csv b/data/rectangleguillotine/tests/knapsack_ur/solution.csv
@@ -0,0 +1,3 @@
+PLATE_ID,COPIES,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
+0,1,0,0,0,5,10,0,0,
+0,1,1,0,0,5,10,0,1,0
diff --git a/include/packingsolver/rectangleguillotine/optimize.hpp b/include/packingsolver/rectangleguillotine/optimize.hpp
@@ -38,6 +38,9 @@ struct OptimizeParameters: packingsolver::Parameters<Instance, Solution>
     /** Use column generation 2 algorithm. */
     bool use_column_generation_2 = false;
 
+    /** Use dynamic programming (infinite copies, array) algorithm. */
+    bool use_dynamic_programming_infinite_copies_array = false;
+
     /** Use sequential single knapsack algorithm. */
     bool use_sequential_single_knapsack = false;
 
diff --git a/include/packingsolver/rectangleguillotine/post_process.hpp b/include/packingsolver/rectangleguillotine/post_process.hpp
@@ -21,5 +21,54 @@ struct GroupIdenticalBinsOutput: packingsolver::Output<Instance, Solution>
  */
 GroupIdenticalBinsOutput group_identical_bins(const Solution& solution);
 
+/**
+ * Represents one item placed at a known position in a bin.
+ */
+struct ItemPlacement
+{
+    ItemTypeId item_type_id;
+    Length l, r, b, t;
+};
+
+/**
+ * Given a set of items with known positions in a bin, attempt to reconstruct
+ * one or two minimal-stage guillotine-cut Solutions.
+ *
+ * Returns an empty vector if the placement is not guillotine-cuttable.
+ *
+ * If instance.parameters().first_stage_orientation is Vertical or Horizontal,
+ * at most one solution is returned, respecting that orientation (even when the
+ * item list is empty).
+ *
+ * If instance.parameters().first_stage_orientation is Any, up to two solutions
+ * are returned — one for each orientation that yields a non-empty first stage.
+ */
+std::vector<Solution> build_guillotine_solutions(
+        const Instance& instance,
+        BinTypeId bin_type_id,
+        const std::vector<ItemPlacement>& item_placements);
+
+/**
+ * Like build_guillotine_solutions, but always returns at most one Solution.
+ * When both orientations are valid, returns the one with the fewest stages.
+ * Returns an empty Solution (number_of_bins() == 0) if no guillotine cut
+ * is possible.
+ */
+Solution build_guillotine_solution(
+        const Instance& instance,
+        BinTypeId bin_type_id,
+        const std::vector<ItemPlacement>& item_placements);
+
+/**
+ * Recompute a solution with a minimum number of stages.
+ *
+ * For each bin, item placements are extracted from the existing nodes and
+ * passed to build_guillotine_solution, which reconstructs the guillotine cut
+ * tree with the fewest stages possible for those item positions.  If
+ * rebuilding succeeds, the new tree replaces the original bin; otherwise the
+ * original bin is kept unchanged.
+ */
+Solution minimize_number_of_stages(const Solution& solution);
+
 }
 }
diff --git a/src/rectangleguillotine/CMakeLists.txt b/src/rectangleguillotine/CMakeLists.txt
@@ -10,7 +10,8 @@ target_sources(PackingSolver_rectangleguillotine PRIVATE
     optimize.cpp
     post_process.cpp
     branching_scheme.cpp
-    column_generation_2.cpp)
+    column_generation_2.cpp
+    dynamic_programming_infinite_copies_array.cpp)
 target_include_directories(PackingSolver_rectangleguillotine PUBLIC
     ${PROJECT_SOURCE_DIR}/include)
 target_include_directories(PackingSolver_rectangleguillotine PRIVATE
diff --git a/src/rectangleguillotine/dynamic_programming_infinite_copies_array.cpp b/src/rectangleguillotine/dynamic_programming_infinite_copies_array.cpp
diff --git a/src/rectangleguillotine/dynamic_programming_infinite_copies_array.hpp b/src/rectangleguillotine/dynamic_programming_infinite_copies_array.hpp
diff --git a/src/rectangleguillotine/main.cpp b/src/rectangleguillotine/main.cpp
diff --git a/src/rectangleguillotine/optimize.cpp b/src/rectangleguillotine/optimize.cpp
diff --git a/src/rectangleguillotine/post_process.cpp b/src/rectangleguillotine/post_process.cpp
diff --git a/test/rectangleguillotine/CMakeLists.txt b/test/rectangleguillotine/CMakeLists.txt
diff --git a/test/rectangleguillotine/dynamic_programming_infinite_copies_array_test.cpp b/test/rectangleguillotine/dynamic_programming_infinite_copies_array_test.cpp
diff --git a/test/rectangleguillotine/post_process_test.cpp b/test/rectangleguillotine/post_process_test.cpp

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+WIDTH,HEIGHT,ORIENTED,COPIES`
	`2`	`+10,5,1,100`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+NAME,VALUE`
	`2`	`+objective,knapsack`
	`3`	`+number_of_stages,u`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+PLATE_ID,COPIES,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT`
	`2`	`+0,1,0,0,0,10,5,0,0,`
	`3`	`+0,1,1,0,0,10,5,0,1,0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+WIDTH,HEIGHT,LEFT_TRIM,RIGHT_TRIM,BOTTOM_TRIM,TOP_TRIM`
	`2`	`+20,15,2,3,2,3`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +WIDTH,HEIGHT,ORIENTED
 +10,6,1
 +9,4,1
 +5,7,2
 +4,3,2