Changeset 9440 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/PackingRatioRegularIdenticalBinEvaluator.cs

Timestamp:

05/04/13 17:51:14 (11 years ago)

Author:

jhelm

Message:

#1966: Implemented new encoding (MultiComponentVector/MCV); Implemented move-operators for MCV and GV encodings; Implemented new decoding-methods for PS, GV and MCV encodings (ExtremePoint-based packing);

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/PackingRatioRegularIdenticalBinEvaluator.cs (modified) (4 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/PackingRatioRegularIdenticalBinEvaluator.cs

@@ -30 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.Common;
-using HeuristicLab.Problems.BinPacking.PackingPlans;
+using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
 
 namespace HeuristicLab.Problems.BinPacking.Evaluators {
@@ -53 +53 @@
       B binMeasure = PackingBinMeasuresParameter.ActualValue;
       ItemList<I> itemMeasures = PackingItemMeasuresParameter.ActualValue;
-      int nrOfBins = plan.NrOfBins;
 
 
@@ -67 +66 @@
 
       //if (itemPositionsAreValid)
-      return CalculatePackingRatio(plan as PackingPlan<D, B, I>, binMeasure, itemMeasures, nrOfBins);
+      return CalculatePackingRatio(plan as PackingPlan<D, B, I>, binMeasure, itemMeasures);
 
       //return quality;
@@ -81 +80 @@
         k.......a constant, k>1.
      */
-    private DoubleValue CalculatePackingRatio(PackingPlan<D, B, I> plan, B binMeasure, ItemList<I> itemMeasures, int nrOfBins) {
+    public static DoubleValue CalculatePackingRatio(PackingPlan<D, B, I> plan, B binMeasure, ItemList<I> itemMeasures) {
+      int nrOfBins = plan.NrOfBins;
       double result = 0;