Changeset 14128 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators

Timestamp:

07/20/16 14:02:36 (8 years ago)

Author:

gkronber

Message:

#1966: refactoring of bin packing implementation

Location:

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

Files:

• BinUtilizationEvaluator.cs (modified) (3 diffs)
• EvaluatorBase.cs (modified) (1 diff)
• PackingRatioEvaluator.cs (modified) (3 diffs)

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

@@ -42 +42 @@
     public BinUtilizationEvaluator() : base() { }
 
-    protected override DoubleValue Evaluate() {
+    protected override double Evaluate() {
       DoubleValue quality = new DoubleValue(0);
 
@@ -67 +67 @@
     }
 
-    public static DoubleValue CalculateBinUtilization(PackingPlan<D, B, I> plan) {
+    public static double CalculateBinUtilization(PackingPlan<D, B, I> plan) {
       int nrOfBins = plan.NrOfBins;
       double result = 0;
@@ -97 +97 @@
 
       result = totalUsedSpace / totalUsableSpace;
-      return new DoubleValue(result);
+      return result;
     }
   }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/EvaluatorBase.cs

@@ -75 +75 @@
     }
 
-    protected abstract DoubleValue Evaluate();                                                                        
+    protected abstract double Evaluate();                                                                        
     public override IOperation Apply() {
-      QualityParameter.ActualValue = Evaluate();
+      QualityParameter.ActualValue = new DoubleValue(Evaluate());
       return base.Apply();
     }

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

@@ -41 +41 @@
     public PackingRatioEvaluator() : base() { }
 
-    protected override DoubleValue Evaluate() {
+    protected override double Evaluate() {
       DoubleValue quality = new DoubleValue(0);
 
@@ -74 +74 @@
         k.......a constant, k>1.
      */
-    public static DoubleValue CalculatePackingRatio(PackingPlan<D, B, I> plan) {
+    public static double CalculatePackingRatio(PackingPlan<D, B, I> plan) {
       int nrOfBins = plan.NrOfBins;
       double result = 0;
@@ -90 +90 @@
         //k = 2 --> (Fi/C)*(Fi/C)
         //result += (((usedSpaceInThisBin) / (usableSpace)) * ((usedSpaceInThisBin) / (usableSpace))) / (i*i + 1);
-        var PD = plan.BinPackings[i].PackingDensity;
-        result += (PD * PD) / (i + 1);
+        var pd = plan.BinPackings[i].PackingDensity;
+        result += (pd * pd) / (i + 1);
       }
 
       result = result / nrOfBins;
-      return new DoubleValue(result);
+      return result;
     }
   }