Changeset 9495 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans

Timestamp:

05/15/13 22:23:36 (11 years ago)

Author:

jhelm

Message:

#1966: Did some major refactoring in Decoder-classes; Added MoveEvaluator classes for different encodings and dimensions; Added new crossover-class for MCV encoding;

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs (modified) (3 diffs)

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

@@ -60 +60 @@
     [Storable]
     public ObservableDictionary<int, D> PackingItemPositions { get; set; }
+    [Storable]
+    public ObservableDictionary<int, B> PackingBinMeasures { get; set; }
 
-    //[Storable]
-    //public ItemList<BoolValue> PackingItemsRotated { get; set; }
-
-    [Storable]
-    public B PackingBinMeasures {
-      get;
-      set;
-    }
     [Storable]
     public ItemList<I> PackingItemMeasures {
@@ -89 +83 @@
     #endregion
 
-    public PackingPlan(B binMeasures, ItemList<I> itemMeasures) : base() {
+    public PackingPlan(B binMeasures, ItemList<I> itemMeasures)
+      : base() {
+      this.PackingItemMeasures = itemMeasures;
+      this.PackingBinMeasures = new ObservableDictionary<int, B>();
+      this.PackingBinMeasures[0] = binMeasures;
+    }
+    public PackingPlan(ObservableDictionary<int, B> binMeasures, ItemList<I> itemMeasures)
+      : base() {
+      this.PackingItemMeasures = itemMeasures;
       this.PackingBinMeasures = binMeasures;
-      this.PackingItemMeasures = itemMeasures;
     }
 
@@ -98 +99 @@
     protected PackingPlan(PackingPlan<D,B,I> original, Cloner cloner)
       : base(original, cloner) {
-        PackingItemPositions = new ObservableDictionary<int, D>(original.PackingItemPositions);
-      PackingBinMeasures = original.PackingBinMeasures;
+      PackingItemPositions = new ObservableDictionary<int, D>(original.PackingItemPositions);
+      PackingBinMeasures = new ObservableDictionary<int, B>(original.PackingBinMeasures);
       PackingItemMeasures = original.PackingItemMeasures;
-      //PackingItemsRotated = cloner.Clone(original.PackingItemsRotated);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PackingPlan<D,B,I>(this, cloner);
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new PackingPlan<D,B,I>(this, cloner);
+    public B GetPackingBinMeasuresForBinNr(int binNr) {
+      if (PackingBinMeasures.ContainsKey(binNr))
+        return PackingBinMeasures[binNr];
+      else
+        return PackingBinMeasures[0];
     }