Fix double comparisons in solutions

fontanf · Oct 8, 2024 · 3c48950 · 3c48950
1 parent 804d8d6
commit 3c48950
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/onedimensional/solution.cpp b/src/onedimensional/solution.cpp
@@ -212,13 +212,13 @@ bool Solution::operator<(const Solution& solution) const
             return true;
         return solution.waste() < waste();
     } case Objective::Knapsack: {
-        return solution.profit() > profit();
+        return strictly_greater(solution.profit(), profit());
     } case Objective::VariableSizedBinPacking: {
         if (!solution.full())
             return false;
         if (!full())
             return true;
-        return solution.cost() < cost();
+        return strictly_lesser(solution.cost(), cost());
     } default: {
         std::stringstream ss;
         ss << "Solution onedimensional::Solution does not support objective \""

diff --git a/src/rectangle/solution.cpp b/src/rectangle/solution.cpp
@@ -243,7 +243,7 @@ bool Solution::operator<(const Solution& solution) const
             return true;
         if (solution.number_of_bins() != number_of_bins())
             return solution.number_of_bins() < number_of_bins();
-        return solution.leftover_value() > leftover_value();
+        return strictly_greater(solution.leftover_value(), leftover_value());
     } case Objective::OpenDimensionX: {
         if (!solution.full())
             return false;
@@ -257,16 +257,16 @@ bool Solution::operator<(const Solution& solution) const
             return true;
         return solution.y_max() < y_max();
     } case Objective::Knapsack: {
-        return solution.profit() > profit();
+        return strictly_greater(solution.profit(), profit());
     } case Objective::VariableSizedBinPacking: {
         if (!solution.full())
             return false;
         if (!full())
             return true;
-        return solution.cost() < cost();
+        return strictly_lesser(solution.cost(), cost());
     } case Objective::SequentialOneDimensionalRectangleSubproblem: {
-        if (solution.profit() != profit())
-            return solution.profit() > profit();
+        if (!equal(solution.profit(), profit()))
+            return strictly_greater(solution.profit(), profit());
         if (solution.middle_axle_overweight() + solution.rear_axle_overweight()
                 != middle_axle_overweight() + rear_axle_overweight())
             return solution.middle_axle_overweight() + solution.rear_axle_overweight()

diff --git a/src/rectangleguillotine/solution.cpp b/src/rectangleguillotine/solution.cpp
@@ -162,13 +162,13 @@ bool Solution::operator<(const Solution& solution) const
             return true;
         return solution.height() < height();
     } case Objective::Knapsack: {
-        return solution.profit() > profit();
+        return strictly_greater(solution.profit(), profit());
     } case Objective::VariableSizedBinPacking: {
         if (!solution.full())
             return false;
         if (!full())
             return true;
-        return solution.cost() < cost();
+        return strictly_lesser(solution.cost(), cost());
     } default: {
         std::stringstream ss;
         ss << "Solution rectangleguillotine::Solution does not support objective \""