Changeset 9599 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.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/PackingPlan.cs (modified) (5 diffs)

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

@@ -38 +38 @@
 using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
 using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 
 namespace HeuristicLab.Encodings.PackingEncoding.PackingPlan {
@@ -128 +129 @@
             bp.PackItem(id, itemMeasures[id], position);
             remainingIDs.Remove(id);
+            break;
           }
         }
@@ -142 +144 @@
       }
       UpdateBinPackings();
+
+      var newSolution = new ObservableDictionary<int,ItemList<PackingInformation>> ();
+      foreach (var bp in BinPackings) {
+        int binIndex = newSolution.Count;
+        newSolution[binIndex] = new ItemList<PackingInformation>();
+        foreach (var entry in bp.ItemPositions)
+          newSolution[binIndex].Add(new PackingInformation (entry.Key, entry.Value.Rotated));
+      }
+      solution.PackingInformations = newSolution;
     }
     public void Pack(GroupingVectorEncoding solution, ItemList<I> itemMeasures) {
@@ -167 +178 @@
             bp.PackItem(id, itemMeasures[id], position);
             remainingIDs.Remove(id);
+            break;
           }
         }
@@ -181 +193 @@
       }
       UpdateBinPackings();
+
+      var newSolution = new int[solution.GroupingVector.Length];
+      int binIndex = 0;
+      foreach (var bp in BinPackings) {
+        foreach (var entry in bp.ItemPositions)
+          newSolution[entry.Key] = binIndex;
+        binIndex++;
+      }
+      solution.GroupingVector = new IntegerVector (newSolution);
     }
     public void Pack(PackingSequenceEncoding solution, ItemList<I> itemMeasures) {