Changeset 14154 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Evaluators

Timestamp:

07/21/16 15:08:21 (8 years ago)

Author:

gkronber

Message:

#1966: refactoring

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Evaluators

Files:

• BinUtilizationEvaluator.cs (modified) (1 diff)
• PackingRatioEvaluator.cs (modified) (1 diff)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Evaluators/BinUtilizationEvaluator.cs

@@ -53 +53 @@
 
       for (int i = 0; i < nrOfBins; i++) {
-        totalUsableSpace += solution.BinPackings[i].BinMeasures.Volume;
-        totalUsedSpace += solution.BinPackings[i].ItemMeasures.Sum(kvp => kvp.Value.Volume);
+        totalUsableSpace += solution.BinPackings[i].BinShape.Volume;
+        totalUsedSpace += solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
       }
 

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Evaluators/PackingRatioEvaluator.cs

@@ -60 +60 @@
       const double k = 2;
       for (int i = 0; i < nrOfBins; i++) {
-        double f = solution.BinPackings[i].ItemMeasures.Sum(kvp => kvp.Value.Volume);
-        double c = solution.BinPackings[i].BinMeasures.Volume;
+        double f = solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
+        double c = solution.BinPackings[i].BinShape.Volume;
         result += Math.Pow(f / c, k);
       }