Skip to content

Commit

Permalink
Improve defects handling in rectangleguillotine branching scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
@fontanf
fontanf committed Jan 15, 2025
1 parent 3c3e6ff commit 6f58039
Show file tree
Hide file tree
Showing 47 changed files with 725 additions and 398 deletions.
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_1_bins.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
WIDTH,HEIGHT
40,30
3 changes: 3 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_1_defects.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ID,BIN,X,Y,WIDTH,HEIGHT
0,0,0,0,40,10
1,0,0,10,10,20
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_1_items.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
WIDTH,HEIGHT,ORIENTED
30,20,1
6 changes: 6 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_1_parameters.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
NAME,VALUE
objective,knapsack
number_of_stages,2
cut_type,exact
first_stage_orientation,vertical
cut_through_defects,1
9 changes: 9 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_1_solution.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
PLATE_ID,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
0,0,0,0,40,30,0,0,
0,1,0,0,10,30,-1,1,0
0,2,10,0,30,30,-2,1,0
0,3,10,0,30,10,-1,2,2
0,4,10,10,30,20,-2,2,2
0,5,10,10,30,20,0,3,4
0,-1,0,0,40,10,-4,-1,
0,-1,0,10,10,20,-4,-1,
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_2_bins.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
WIDTH,HEIGHT
40,30
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_2_defects.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ID,BIN,X,Y,WIDTH,HEIGHT
0,0,20,5,10,5
4 changes: 4 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_2_items.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
WIDTH,HEIGHT,ORIENTED
20,15,1
25,15,1
10,30,1
7 changes: 7 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_2_parameters.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
NAME,VALUE
objective,knapsack
number_of_stages,2
cut_type,non-exact
first_stage_orientation,vertical
cut_through_defects,1
maximum_distance_between_1_cuts,25
13 changes: 13 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_2_solution.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
PLATE_ID,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
0,0,0,0,40,30,0,0,
0,1,0,0,25,30,-2,1,0
0,2,0,0,25,15,-2,2,1
0,3,0,0,20,15,0,3,2
0,4,20,0,5,15,-1,3,2
0,5,0,15,25,15,-2,2,1
0,6,0,15,25,15,1,3,5
0,7,25,0,15,30,-2,1,0
0,8,25,0,15,30,-2,2,7
0,9,25,0,5,30,-1,3,8
0,10,30,0,10,30,2,3,8
0,-1,20,5,10,5,-4,-1,
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_3_bins.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
WIDTH,HEIGHT
40,30
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_3_defects.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ID,BIN,X,Y,WIDTH,HEIGHT
0,0,20,5,10,5
4 changes: 4 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_3_items.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
WIDTH,HEIGHT,ORIENTED
20,15,1
25,15,1
15,20,1
6 changes: 6 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_3_parameters.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
NAME,VALUE
objective,knapsack
number_of_stages,2
cut_type,non-exact
first_stage_orientation,vertical
cut_through_defects,1
13 changes: 13 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_3_solution.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
PLATE_ID,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
0,0,0,0,40,30,0,0,
0,1,0,0,25,30,-2,1,0
0,2,0,0,25,15,-2,2,1
0,3,0,0,20,15,0,3,2
0,4,20,0,5,15,-1,3,2
0,5,0,15,25,15,-2,2,1
0,6,0,15,25,15,1,3,5
0,7,25,0,15,30,-2,1,0
0,8,25,0,15,10,-1,2,7
0,9,25,10,15,20,-2,2,7
0,10,25,10,15,20,2,3,9
0,-1,20,5,10,5,-4,-1,
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_4_bins.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
WIDTH,HEIGHT
40,30
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_4_defects.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ID,BIN,X,Y,WIDTH,HEIGHT
0,0,10,5,10,5
4 changes: 4 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_4_items.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
WIDTH,HEIGHT,ORIENTED
15,20,1
20,10,1
25,20,1
6 changes: 6 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_4_parameters.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
NAME,VALUE
objective,knapsack
number_of_stages,2
cut_type,non-exact
first_stage_orientation,vertical
cut_through_defects,1
13 changes: 13 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_4_solution.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
PLATE_ID,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
0,0,0,0,40,30,0,0,
0,1,0,0,15,30,-2,1,0
0,2,0,0,15,10,-1,2,1
0,3,0,10,15,20,-2,2,1
0,4,0,10,15,20,0,3,3
0,5,15,0,25,30,-2,1,0
0,6,15,0,25,10,-2,2,5
0,7,15,0,5,10,-1,3,6
0,8,20,0,20,10,1,3,6
0,9,15,10,25,20,-2,2,5
0,10,15,10,25,20,2,3,9
0,-1,10,5,10,5,-4,-1,
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_5_bins.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
WIDTH,HEIGHT
40,30
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_5_defects.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ID,BIN,X,Y,WIDTH,HEIGHT
0,0,10,5,10,5
4 changes: 4 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_5_items.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
WIDTH,HEIGHT,ORIENTED
15,20,1
20,10,1
25,20,1
6 changes: 6 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_5_parameters.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
NAME,VALUE
objective,knapsack
number_of_stages,2
cut_type,non-exact
first_stage_orientation,vertical
cut_through_defects,0
11 changes: 11 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_5_solution.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
PLATE_ID,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
0,0,0,0,40,30,0,0,
0,1,0,0,25,30,-2,1,0
0,2,0,0,25,10,-1,2,1
0,3,0,10,25,20,-2,2,1
0,4,0,10,25,20,2,3,3
0,5,25,0,15,30,-2,1,0
0,6,25,0,15,20,-2,2,5
0,7,25,0,15,20,0,3,6
0,8,25,20,15,10,-1,2,5
0,-1,10,5,10,5,-4,-1,
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_6_bins.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
WIDTH,HEIGHT
40,30
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_6_defects.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ID,BIN,X,Y,WIDTH,HEIGHT
0,0,2,2,18,8
6 changes: 6 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_6_items.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
WIDTH,HEIGHT,ORIENTED
15,10,1
10,10,1
5,10,1
20,10,1
25,20,1
6 changes: 6 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_6_parameters.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
NAME,VALUE
objective,knapsack
number_of_stages,3
cut_type,non-exact
first_stage_orientation,vertical
cut_through_defects,1
21 changes: 21 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_6_solution.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
PLATE_ID,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
0,0,0,0,40,30,0,0,
0,1,0,0,15,30,-2,1,0
0,2,0,0,15,20,-2,2,1
0,3,0,0,15,20,-2,3,2
0,4,0,0,15,10,-1,4,3
0,5,0,10,15,10,0,4,3
0,6,0,20,15,10,-2,2,1
0,7,0,20,10,10,-2,3,6
0,8,0,20,10,10,1,4,7
0,9,10,20,5,10,-2,3,6
0,10,10,20,5,10,2,4,9
0,11,15,0,25,30,-2,1,0
0,12,15,0,25,10,-2,2,11
0,13,15,0,5,10,-1,3,12
0,14,20,0,20,10,-2,3,12
0,15,20,0,20,10,3,4,14
0,16,15,10,25,20,-2,2,11
0,17,15,10,25,20,-2,3,16
0,18,15,10,25,20,4,4,17
0,-1,2,2,18,8,-4,-1,
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_7_bins.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
WIDTH,HEIGHT
40,30
2 changes: 2 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_7_defects.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ID,BIN,X,Y,WIDTH,HEIGHT
0,0,2,8,8,12
6 changes: 6 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_7_items.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
WIDTH,HEIGHT,ORIENTED
30,5,1
20,5,1
10,10,1
20,20,1
10,30,1
6 changes: 6 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_7_parameters.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
NAME,VALUE
objective,knapsack
number_of_stages,3
cut_type,non-exact
first_stage_orientation,vertical
cut_through_defects,1
21 changes: 21 additions & 0 deletions data/rectangleguillotine/tests/knapsack_defects_7_solution.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
PLATE_ID,NODE_ID,X,Y,WIDTH,HEIGHT,TYPE,CUT,PARENT
0,0,0,0,40,30,0,0,
0,1,0,0,30,30,-2,1,0
0,2,0,0,30,5,-2,2,1
0,3,0,0,30,5,-2,3,2
0,4,0,0,30,5,0,4,3
0,5,0,5,30,5,-2,2,1
0,6,0,5,10,5,-1,3,5
0,7,10,5,20,5,-2,3,5
0,8,10,5,20,5,1,4,7
0,9,0,10,30,20,-2,2,1
0,10,0,10,10,20,-2,3,9
0,11,0,10,10,10,-1,4,10
0,12,0,20,10,10,2,4,10
0,13,10,10,20,20,-2,3,9
0,14,10,10,20,20,3,4,13
0,15,30,0,10,30,-2,1,0
0,16,30,0,10,30,-2,2,15
0,17,30,0,10,30,-2,3,16
0,18,30,0,10,30,4,4,17
0,-1,2,8,8,12,-4,-1,
Loading

0 comments on commit 6f58039

Please sign in to comment.