Skip to content

Commit fb596d8

Browse files
committed
Update rg predefined parameters rotation behavior
1 parent b4ed7c3 commit fb596d8

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

include/packingsolver/rectangleguillotine/instance_builder.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ class InstanceBuilder
180180
*/
181181
void set_item_types_unweighted();
182182

183-
/** For each item type, set 'oriented' to 'true'. */
184-
void set_item_types_oriented();
183+
/** For each item type, set its 'oriented' attribute. */
184+
void set_item_types_oriented(bool oriented = true);
185185

186186
/*
187187
* Build

src/rectangleguillotine/instance_builder.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ void InstanceBuilder::set_predefined(std::string str)
6767
}
6868
switch (str[3]) {
6969
case 'R': {
70+
set_item_types_oriented(false);
7071
break;
7172
} case 'O': {
72-
set_item_types_oriented();
73+
set_item_types_oriented(true);
7374
break;
7475
} default: {
7576
// TODO
@@ -440,12 +441,12 @@ void InstanceBuilder::set_item_types_unweighted()
440441
}
441442
}
442443

443-
void InstanceBuilder::set_item_types_oriented()
444+
void InstanceBuilder::set_item_types_oriented(bool oriented)
444445
{
445446
for (ItemTypeId item_type_id = 0;
446447
item_type_id < instance_.number_of_item_types();
447448
++item_type_id) {
448-
instance_.item_types_[item_type_id].oriented = true;
449+
instance_.item_types_[item_type_id].oriented = oriented;
449450
}
450451
}
451452

0 commit comments

Comments
 (0)