Fix rectangleguillotine::BranchingScheme::to_solution

fontanf · Jan 11, 2025 · 7e4ee61 · 7e4ee61
1 parent 252e707
commit 7e4ee61
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/rectangleguillotine/branching_scheme.cpp b/src/rectangleguillotine/branching_scheme.cpp
@@ -1485,8 +1485,9 @@ Solution BranchingScheme::to_solution(
                     (instance().parameters().number_of_stages == 3 && current_node->first_stage_orientation == CutOrientation::Vertical)
                     || (instance().parameters().number_of_stages == 2 && current_node->first_stage_orientation == CutOrientation::Horizontal))?
                     CutOrientation::Vertical: CutOrientation::Horizontal;
+            BinTypeId bin_type_id = instance().bin_type_id(number_of_bins);
             solution_builder.add_bin(
-                    number_of_bins,
+                    bin_type_id,
                     1,
                     cut_orientation);
             number_of_bins++;

diff --git a/src/rectangleguillotine/solution_builder.cpp b/src/rectangleguillotine/solution_builder.cpp
@@ -10,6 +10,15 @@ void SolutionBuilder::add_bin(
         BinPos copies,
         CutOrientation first_cut_orientation)
 {
+    if (bin_type_id >= solution_.instance().number_of_bin_types()) {
+        throw std::invalid_argument(
+                "rectangleguillotine::SolutionBuilder::add_bin"
+                "; bin_type_id: " + std::to_string(bin_type_id)
+                + "; instance().number_of_bin_types(): "
+                + std::to_string(solution_.instance().number_of_bin_types())
+                + ".");
+    }
+
     //std::cout << "add_bin bin_type_id " << bin_type_id << " copies " << copies << " first_cut_orientation " << first_cut_orientation << std::endl;
     const BinType& bin_type = solution_.instance().bin_type(bin_type_id);
     SolutionBin bin;