Changeset 14167 for trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators

Timestamp:

07/21/16 21:07:27 (8 years ago)

Author:

gkronber

Message:

#2641:

• fixed persistence bug
• added unit test to create BPP sample
• added BPP sample to start page
• renaming of properties

Location:

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators

Files:

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

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/BinUtilizationEvaluator.cs

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

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/PackingRatioEvaluator.cs

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