Changeset 15241 for trunk/sources

Timestamp:

07/14/17 00:04:58 (7 years ago)

Author:

abeham

Message:

#2762:

• Moved initialization / cloning of extreme points list to base class
• Removed residual space from base class and put it into derived class for 3d bin packing
• Updated sample

Location:

trunk/sources

Files:

• HeuristicLab.Optimizer/3.3/Documents/GA_BPP.hl (modified) (previous)
• HeuristicLab.Problems.BinPacking/3.3/2D/BinPacking2D.cs (modified) (2 diffs)
• HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs (modified) (3 diffs)
• HeuristicLab.Problems.BinPacking/3.3/BinPacking.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/BinPacking2D.cs

@@ -34 +34 @@
     public BinPacking2D(PackingShape binShape)
       : base(binShape) {
-      ExtremePoints = new SortedSet<PackingPosition>();
       ExtremePoints.Add(binShape.Origin);
       InitializeOccupationLayers();
@@ -41 +40 @@
     [StorableConstructor]
     protected BinPacking2D(bool deserializing) : base(deserializing) { }
-    protected BinPacking2D(BinPacking2D original, Cloner cloner)
-      : base(original, cloner) {
-      this.ExtremePoints = new SortedSet<PackingPosition>(original.ExtremePoints.Select(p => cloner.Clone(p)));
-    }
+    protected BinPacking2D(BinPacking2D original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new BinPacking2D(this, cloner);

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs

@@ -33 +33 @@
   public class BinPacking3D : BinPacking<PackingPosition, PackingShape, PackingItem> {
 
+    [Storable]
+    public Dictionary<PackingPosition, Tuple<int, int, int>> ResidualSpace { get; protected set; }
+
     public BinPacking3D(PackingShape binShape)
       : base(binShape) {
-      ExtremePoints = new SortedSet<PackingPosition>();
       ResidualSpace = new Dictionary<PackingPosition, Tuple<int,int,int>>();
       AddExtremePoint(binShape.Origin);
@@ -44 +46 @@
     protected BinPacking3D(BinPacking3D original, Cloner cloner)
       : base(original, cloner) {
-      this.ExtremePoints = new SortedSet<PackingPosition>(original.ExtremePoints.Select(p => cloner.Clone(p)));
       this.ResidualSpace = new Dictionary<PackingPosition, Tuple<int, int, int>>();
       foreach (var o in original.ResidualSpace)
@@ -51 +52 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new BinPacking3D(this, cloner);
+    }
+
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
+      if (ResidualSpace == null)
+        ResidualSpace = new Dictionary<PackingPosition, Tuple<int, int, int>>();
+      #endregion
+    }
+
+    public override void PackItem(int itemID, PackingItem item, PackingPosition position) {
+      ResidualSpace.Remove(position);
+      base.PackItem(itemID, item, position);
     }
 

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/BinPacking.cs

@@ -50 +50 @@
     [Storable]
     protected Dictionary<int, List<int>> OccupationLayers { get; set; }
-
-    [Storable]
-    public Dictionary<TPos, Tuple<int,int,int>> ResidualSpace { get; protected set; }
-
+    
     #endregion Properties
 
@@ -65 +62 @@
       Items = new ObservableDictionary<int, TItem>();
       BinShape = (TBin)binShape.Clone();
+      ExtremePoints = new SortedSet<TPos>();
       OccupationLayers = new Dictionary<int, List<int>>();
     }
@@ -81 +79 @@
       }
       this.BinShape = (TBin)original.BinShape.Clone(cloner);
+      this.ExtremePoints = new SortedSet<TPos>(original.ExtremePoints.Select(p => cloner.Clone(p)));
       this.OccupationLayers = new Dictionary<int, List<int>>();
       foreach (var kvp in original.OccupationLayers) {
         OccupationLayers.Add(kvp.Key, new List<int>(kvp.Value));
       }
-    }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      // BackwardsCompatibility3.3
-      #region Backwards compatible code, remove with 3.4
-      if (ResidualSpace == null)
-        ResidualSpace = new Dictionary<TPos, Tuple<int, int, int>>();
-      #endregion
     }
 
@@ -110 +100 @@
       Positions[itemID] = position;
       ExtremePoints.Remove(position);
-      if (ResidualSpace != null) ResidualSpace.Remove(position);
       foreach (int id in Items.Select(x => x.Key))
         GenerateNewExtremePointsForNewItem(Items[id], Positions[id]);