Changeset 9599 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/BinPacking2D.cs

Timestamp:

06/09/13 12:58:39 (11 years ago)

Author:

jhelm

Message:

#1966: Bugfixing; Refactoring; Performancetuning;

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/BinPacking2D.cs (modified) (6 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/BinPacking2D.cs

@@ -41 +41 @@
   public class BinPacking2D : BinPacking<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> {
 
-    public BinPacking2D(RectangularPackingBin binMeasures) : base(binMeasures) {
-      //OccupiedPoints = new OccupiedPoints2D(binMeasures);
+    public BinPacking2D(RectangularPackingBin binMeasures)
+      : base(binMeasures) {
+      //ExtremePoints = new HashSet<TwoDimensionalPacking>();
+      ExtremePoints = new SortedSet<TwoDimensionalPacking>(new EPComparer2D());
+      ExtremePoints.Add(binMeasures.Origin);
     }
     [StorableConstructor]
@@ -48 +51 @@
     protected BinPacking2D(BinPacking2D original, Cloner cloner)
       : base(original, cloner) {
+      this.ExtremePoints = new SortedSet<TwoDimensionalPacking>(original.ExtremePoints, new EPComparer2D());
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -62 +66 @@
       if (sourcePointX.X < BinMeasures.Width && sourcePointX.Y < BinMeasures.Height) {
         //Traversing down the y-axis        
-        while (sourcePointX.Y > 0 && (-1).Equals(IsPointOccupied(new TwoDimensionalPacking(0, sourcePointX.X, sourcePointX.Y - 1)))) {
+        while (sourcePointX.Y > 0 && !IsPointOccupied(new TwoDimensionalPacking(0, sourcePointX.X, sourcePointX.Y - 1))) {
           sourcePointX.Y--;
         }
@@ -75 +79 @@
       if (sourcePointY.X < BinMeasures.Width && sourcePointY.Y < BinMeasures.Height) {
         //Traversing down the x-axis  
-        while (sourcePointY.X > 0 && (-1).Equals(IsPointOccupied(new TwoDimensionalPacking (0,sourcePointY.X - 1, sourcePointY.Y)))) {
+        while (sourcePointY.X > 0 && !IsPointOccupied(new TwoDimensionalPacking (0,sourcePointY.X - 1, sourcePointY.Y))) {
           sourcePointY.X--;
         }
@@ -81 +85 @@
       }
 
-      ExtremePoints = new HashSet<TwoDimensionalPacking>(ExtremePoints.
-        OrderBy(ep => ep.X).
-        ThenBy(ep => ep.Y).
-        ThenBy(ep => ShortestPossibleSideFromPoint(ep)));
+      //ExtremePoints.RemoveWhere(ep => IsPointOccupied(ep));
+
+      //ExtremePoints = new HashSet<TwoDimensionalPacking>(ExtremePoints.
+      //  OrderBy(ep => ep.X).
+      //  ThenBy(ep => ep.Y).
+      //  ThenBy(ep => ShortestPossibleSideFromPoint(ep)));
     }
 
@@ -190 +196 @@
       throw new NotImplementedException();
     }
+
+
+    protected override void InitializeOccupationLayers() {
+      for (int i = 0; i*10 <= BinMeasures.Width; i += 1 ) {
+        OccupationLayers[i] = new List<int>();
+      }
+    }
+    protected override void AddNewItemToOccupationLayers(int itemID, RectangularPackingItem measures, TwoDimensionalPacking position) {
+      int x1 = position.X / 10;
+      int x2 = (position.X + (position.Rotated ? measures.Height : measures.Width)) / 10;
+
+      for (int i = x1; i <= x2; i++)
+        OccupationLayers[i].Add(itemID);
+    }
+    protected override List<int> GetLayerItemIDs(TwoDimensionalPacking position) {
+      return OccupationLayers[position.X / 10];
+    }
+    protected override List<int> GetLayerItemIDs(RectangularPackingItem measures, TwoDimensionalPacking position) { 
+      List<int> result = new List<int> ();
+      int x1 = position.X / 10;
+      int x2 = (position.X + (position.Rotated ? measures.Height : measures.Width)) / 10;
+
+      for (int i = x1; i <= x2; i++)
+        result.AddRange(OccupationLayers[i]);
+
+      return result;
+    }
+  }
+  public class EPComparer2D : IComparer<TwoDimensionalPacking> {
+    public int Compare(TwoDimensionalPacking a, TwoDimensionalPacking b) {
+      int result = a.X.CompareTo(b.X);
+      if (result == 0)
+        result = a.Y.CompareTo(b.Y);
+
+      return result;
+    }
   }
 }