Changeset 14128 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs

Timestamp:

07/20/16 14:02:36 (8 years ago)

Author:

gkronber

Message:

#1966: refactoring of bin packing implementation

File:

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

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

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Collections;
-using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
-using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
-using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Problems.BinPacking;
+using HeuristicLab.Encodings.PermutationEncoding;
 
 namespace HeuristicLab.Encodings.PackingEncoding {
@@ -98 +96 @@
     }
 
+    /*
     public void Pack(MultiComponentVectorEncoding solution, ItemList<I> itemMeasures) {
       var sequenceMatrix = solution.GenerateSequenceMatrix();
@@ -197 +196 @@
       solution.GroupingVector = new IntegerVector(newSolution);
     }
-    public void Pack(PackingSequenceEncoding solution, ItemList<I> itemMeasures) {
-      List<int> remainingIDs = new List<int>(solution.PackingSequence);
+     * 
+     
+    public void Pack(Permutation solution, ItemList<I> itemMeasures) {
+      List<int> remainingIDs = new List<int>(solution);
       while (remainingIDs.Count > 0) {
         var bp = NewBinPacking();
@@ -210 +211 @@
     }
 
-
+    */
     #region Events
     public event EventHandler QualityChanged;