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

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

Files:

• BinPacking2D.cs (modified) (7 diffs)
• Evaluators/BinUtilizationEvaluator.cs (modified) (1 diff)
• Evaluators/PackingRatioEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking2D-3.3.csproj (modified) (1 diff)
• Interfaces/IOperator.cs (added)
• MoveEvaluatorBase.cs (modified) (3 diffs)
• PermutationEncoding/PermutationProblem.cs (modified) (2 diffs)
• PermutationEncoding/Swap2MoveEvaluator.cs (modified) (1 diff)
• PermutationEncoding/TranslocationMoveEvaluator.cs (modified) (1 diff)

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

@@ -32 +32 @@
   public class BinPacking2D : BinPacking.BinPacking<PackingPosition, PackingShape, PackingItem> {
 
-    public BinPacking2D(PackingShape binMeasures)
-      : base(binMeasures) {
+    public BinPacking2D(PackingShape binShape)
+      : base(binShape) {
       ExtremePoints = new SortedSet<PackingPosition>(new EPComparer2D());
-      ExtremePoints.Add(binMeasures.Origin);
-    }
+      ExtremePoints.Add(binShape.Origin);
+      InitializeOccupationLayers();
+    }
+
     [StorableConstructor]
     protected BinPacking2D(bool deserializing) : base(deserializing) { }
     protected BinPacking2D(BinPacking2D original, Cloner cloner)
       : base(original, cloner) {
-      this.ExtremePoints = new SortedSet<PackingPosition>(original.ExtremePoints, new EPComparer2D());
+      this.ExtremePoints = new SortedSet<PackingPosition>(original.ExtremePoints.Select(p => cloner.Clone(p)), new EPComparer2D());
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -54 +56 @@
       //Find ExtremePoints beginning from sourcepointX
       var sourcePointX = new PackingPosition(0, position.X + newWidth, position.Y);
-      if (sourcePointX.X < BinMeasures.Width && sourcePointX.Y < BinMeasures.Height) {
+      if (sourcePointX.X < BinShape.Width && sourcePointX.Y < BinShape.Height) {
         //Traversing down the y-axis        
         var newPoint = new PackingPosition(0, sourcePointX.X, sourcePointX.Y - 1);
@@ -66 +68 @@
       //Find ExtremePoints beginning from sourcepointY
       var sourcePointY = new PackingPosition(0, position.X, position.Y + newHeight);
-      if (sourcePointY.X < BinMeasures.Width && sourcePointY.Y < BinMeasures.Height) {
+      if (sourcePointY.X < BinShape.Width && sourcePointY.Y < BinShape.Height) {
         //Traversing down the x-axis  
         var newPoint = new PackingPosition(0, sourcePointY.X - 1, sourcePointY.Y);
@@ -96 +98 @@
     public override PackingPosition FindPositionBySliding(PackingItem item, bool rotated) {
       PackingPosition currentPosition = new PackingPosition(0,
-        BinMeasures.Width - (rotated ? item.Height : item.Width),
-        BinMeasures.Height - (rotated ? item.Width : item.Height), rotated);
+        BinShape.Width - (rotated ? item.Height : item.Width),
+        BinShape.Height - (rotated ? item.Width : item.Height), rotated);
       //Slide the item as far as possible to the left
       while (IsPositionFeasible(item, PackingPosition.MoveLeft(currentPosition))
@@ -159 +161 @@
     public override int ShortestPossibleSideFromPoint(PackingPosition position) {
       int shortestSide = int.MaxValue;
-      int width = BinMeasures.Width;
-      int height = BinMeasures.Height;
+      int width = BinShape.Width;
+      int height = BinShape.Height;
 
       if (position.X >= width || position.Y >= height)
@@ -182 +184 @@
     }
 
-
     protected override void InitializeOccupationLayers() {
-      for (int i = 0; i * 10 <= BinMeasures.Width; i += 1) {
+      for (int i = 0; i * 10 <= BinShape.Width; i += 1) {
         OccupationLayers[i] = new List<int>();
       }
     }
-    protected override void AddNewItemToOccupationLayers(int itemID, PackingItem measures, PackingPosition position) {
+
+    protected override void AddNewItemToOccupationLayers(int itemID, PackingItem item, PackingPosition position) {
       int x1 = position.X / 10;
-      int x2 = (position.X + (position.Rotated ? measures.Height : measures.Width)) / 10;
+      int x2 = (position.X + (position.Rotated ? item.Height : item.Width)) / 10;
 
       for (int i = x1; i <= x2; i++)
@@ -198 +200 @@
       return OccupationLayers[position.X / 10];
     }
-    protected override List<int> GetLayerItemIDs(PackingItem measures, PackingPosition position) {
+    protected override List<int> GetLayerItemIDs(PackingItem item, PackingPosition position) {
       List<int> result = new List<int>();
       int x1 = position.X / 10;
-      int x2 = (position.X + (position.Rotated ? measures.Height : measures.Width)) / 10;
+      int x2 = (position.X + (position.Rotated ? item.Height : item.Width)) / 10;
 
       for (int i = x1; i <= x2; i++)

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);
       }

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

@@ -172 +172 @@
     <Compile Include="IntegerVectorEncoding\ExtremePointIntegerVectorDecoder.cs" />
     <Compile Include="IntegerVectorEncoding\IntegerVectorProblem.cs" />
+    <Compile Include="Interfaces\IOperator.cs" />
     <Compile Include="Interfaces\IDecoder.cs" />
     <Compile Include="Interfaces\IEvaluator.cs" />

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

@@ -31 +31 @@
   [StorableClass]
   public abstract class MoveEvaluatorBase<TSol, TMove> : SingleSuccessorOperator,
-    ISingleObjectiveMoveEvaluator, ISingleObjectiveMoveOperator
+    ISingleObjectiveMoveEvaluator, ISingleObjectiveMoveOperator, IOperator<TSol>
     where TSol : class, IItem
     where TMove : class, IItem {
@@ -43 +43 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
     }
-    public ILookupParameter<ReadOnlyItemList<PackingItem>> PackingItemMeasuresParameter {
+    public ILookupParameter<ReadOnlyItemList<PackingItem>> ItemsParameter {
       get { return (LookupParameter<ReadOnlyItemList<PackingItem>>)Parameters["Items"]; }
     }
-    public ILookupParameter<PackingShape> PackingBinMeasuresParameter {
+    public ILookupParameter<PackingShape> BinShapeParameter {
       get { return (LookupParameter<PackingShape>)Parameters["BinShape"]; }
     }
-    public ILookupParameter<IDecoder<TSol>> PackingSolutionDecoderParameter {
+    public ILookupParameter<IDecoder<TSol>> DecoderParameter {
       get { return (ILookupParameter<IDecoder<TSol>>)Parameters["Decoder"]; }
     }
-    public ILookupParameter<IEvaluator> PackingPlanEvaluatorParameter {
+    public ILookupParameter<IEvaluator> SolutionEvaluatorParameter {
       get { return (ILookupParameter<IEvaluator>)Parameters["SolutionEvaluator"]; }
     }
@@ -78 +78 @@
       var move = MoveParameter.ActualValue;
       var encSolCandidate = EncodedSolutionParameter.ActualValue;
-      var binShape = PackingBinMeasuresParameter.ActualValue;
-      var items = PackingItemMeasuresParameter.ActualValue;
+      var binShape = BinShapeParameter.ActualValue;
+      var items = ItemsParameter.ActualValue;
 
 

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PermutationEncoding/PermutationProblem.cs

@@ -23 +23 @@
 
 using System.Linq;
+using System.Windows.Forms;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -72 +73 @@
       Encoding.ConfigureOperators(Operators.OfType<IOperator>());
 
-      // TODO: configure the move evaluators (add interface for my move evaluators)
+      foreach (var op in Operators.OfType<IOperator<Permutation>>()) {
+        op.BinShapeParameter.ActualName = BinShapeParameter.Name;
+        op.ItemsParameter.ActualName = ItemsParameter.Name;
+        op.SolutionEvaluatorParameter.ActualName = SolutionEvaluatorParameter.Name;
+        op.DecoderParameter.ActualName = DecoderParameter.Name;
+      }
     }
 

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PermutationEncoding/Swap2MoveEvaluator.cs

@@ -50 +50 @@
       // uses full evaluation
       Swap2Manipulator.Apply(permutation, move.Index1, move.Index2);
-      var solution = PackingSolutionDecoderParameter.ActualValue.Decode(permutation, binShape, items);
+      var solution = DecoderParameter.ActualValue.Decode(permutation, binShape, items);
 
-      return PackingPlanEvaluatorParameter.ActualValue.Evaluate(solution);
+      return SolutionEvaluatorParameter.ActualValue.Evaluate(solution);
     }
   }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PermutationEncoding/TranslocationMoveEvaluator.cs

@@ -51 +51 @@
       // uses full evaluation
       TranslocationManipulator.Apply(permutation, move.Index1, move.Index2, move.Index3);
-      var solution = PackingSolutionDecoderParameter.ActualValue.Decode(permutation, binShape, items);
+      var solution = DecoderParameter.ActualValue.Decode(permutation, binShape, items);
 
-      return PackingPlanEvaluatorParameter.ActualValue.Evaluate(solution);
+      return SolutionEvaluatorParameter.ActualValue.Evaluate(solution);
     }
   }