Changeset 14050 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3

Timestamp:

07/12/16 20:35:19 (8 years ago)

Author:

gkronber

Message:

#1966: renamed evaluators

Location:

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

Files:

• HeuristicLab.Problems.BinPacking2D-3.3.csproj (modified) (1 diff)
• PackingRatioEvaluator.cs (moved) (moved from branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PackingRatioRectangularIdenticalBinEvaluator.cs) (1 diff)
• Problem.cs (modified) (1 diff)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/HeuristicLab.Problems.BinPacking2D-3.3.csproj

@@ -174 +174 @@
     <Compile Include="PackingItem.cs" />
     <Compile Include="PackingPosition.cs" />
-    <Compile Include="PackingRatioRectangularIdenticalBinEvaluator.cs" />
+    <Compile Include="PackingRatioEvaluator.cs" />
     <Compile Include="PackingShape.cs" />
     <Compile Include="Plugin.cs" />

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

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.BinPacking2D {
-  [Item("Packing-Ratio Rectangular Identical-Bin Evaluator", "Represents an evaluation-algorithm for rectangular-shaped bin-packing problems with identical bins which calculates the ratio between packed and unpacked space. Found in Falkenauer:1996")]
+  [Item("Packing-Ratio Evaluator (2d)", "Calculates the ratio between packed and unpacked space. Found in Falkenauer:1996")]
   [StorableClass]
-  public class PackingRatioRectangularIdenticalBinEvaluator : PackingRatioRegularIdenticalBinEvaluator<PackingPosition, PackingShape, PackingItem> {
+  public class PackingRatioEvaluator : PackingRatioEvaluator<PackingPosition, PackingShape, PackingItem> {
 
     [StorableConstructor]
-    protected PackingRatioRectangularIdenticalBinEvaluator (bool deserializing) : base(deserializing) { }
-    protected PackingRatioRectangularIdenticalBinEvaluator (PackingRatioRectangularIdenticalBinEvaluator original, Cloner cloner)
+    protected PackingRatioEvaluator (bool deserializing) : base(deserializing) { }
+    protected PackingRatioEvaluator (PackingRatioEvaluator original, Cloner cloner)
       : base(original, cloner) {
     }
-    public PackingRatioRectangularIdenticalBinEvaluator() : base() { }
+    public PackingRatioEvaluator() : base() { }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new PackingRatioRectangularIdenticalBinEvaluator(this, cloner);
+      return new PackingRatioEvaluator(this, cloner);
     }
   }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Problem.cs

@@ -164 +164 @@
     }
 
-    protected override IPackingPlanEvaluator CreateDefaultEvaluator() {
-      return new PackingRatioRectangularIdenticalBinEvaluator();
+    protected override IEvaluator CreateDefaultEvaluator() {
+      return new PackingRatioEvaluator();
     }