Implement update_variable_sized_bin_packing_bound in irregular

Author: fontanf

include/packingsolver/irregular/algorithm_formatter.hpp

@@ -60,6 +60,10 @@ class AlgorithmFormatter
     void update_bin_packing_bound(
             BinPos number_of_bins);
 
+    /** Update the variable-sized bin packing bound. */
+    void update_variable_sized_bin_packing_bound(
+            Profit cost);
+
     /** Method to call at the end of the algorithm. */
     void end();
 

src/irregular/algorithm_formatter.cpp

@@ -285,6 +285,24 @@ void AlgorithmFormatter::update_bin_packing_bound(
     mutex_.unlock();
 }
 
+void AlgorithmFormatter::update_variable_sized_bin_packing_bound(
+        Profit cost)
+{
+    mutex_.lock();
+    if (cost > output_.variable_sized_bin_packing_bound) {
+        output_.variable_sized_bin_packing_bound = cost;
+        output_.json["IntermediaryOutputs"].push_back(output_.to_json());
+        parameters_.new_solution_callback(output_);
+
+        // Check optimality.
+        if (output_.solution_pool.best().full()
+                && output_.variable_sized_bin_packing_bound == output_.solution_pool.best().number_of_bins()) {
+            end_ = true;
+        }
+    }
+    mutex_.unlock();
+}
+
 void AlgorithmFormatter::end()
 {
     output_.time = parameters_.timer.elapsed_time();

src/irregular/optimize.cpp

@@ -65,10 +65,10 @@ void optimize_onedimensional_bound(
         algorithm_formatter.update_knapsack_bound(
                 onedim_output.knapsack_bound);
         break;
-    //} case Objective::VariableSizedBinPacking: {
-    //    algorithm_formatter.update_variable_sized_bin_packing_bound(
-    //            onedim_output.variable_sized_bin_packing_bound);
-    //    break;
+    } case Objective::VariableSizedBinPacking: {
+        algorithm_formatter.update_variable_sized_bin_packing_bound(
+                onedim_output.variable_sized_bin_packing_bound);
+        break;
     } default: {
         std::stringstream ss;
         ss << FUNC_SIGNATURE << ": "