Changeset 15241 for trunk/sources/HeuristicLab.Problems.BinPacking/3.3/BinPacking.cs

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/BinPacking.cs (modified) (4 diffs)

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