Changeset 15241 for trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D

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

File:

• trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs (modified) (3 diffs)

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