Changeset 14128 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders

Timestamp:

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

Author:

gkronber

Message:

#1966: refactoring of bin packing implementation

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders

Files:

• BL/BottomLeftPackingSequenceDecoder.cs (modified) (2 diffs)
• EP/ExtremePointMultiComponentVectorDecoder2D.cs (modified) (1 diff)
• EP/ExtremePointPackingSequenceDecoder2D.cs (modified) (2 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftPackingSequenceDecoder.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Common;
-using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
 using HeuristicLab.Problems.BinPacking;
 using HeuristicLab.Encodings.PackingEncoding;
+using HeuristicLab.Encodings.PermutationEncoding;
 
 namespace HeuristicLab.Problems.BinPacking2D {
@@ -45 +45 @@
 
     public override PackingPlan<PackingPosition, PackingShape, PackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, PackingShape binMeasures, ItemList<PackingItem> itemMeasures) {
-      var solution = encodedSolution as PackingSequenceEncoding;
+      var solution = encodedSolution as Permutation;
       if (solution == null) throw new InvalidOperationException("Encoding is not of type PackingSequence");
       Solution result = new Solution(binMeasures);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointMultiComponentVectorDecoder2D.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Common;
-using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
 using HeuristicLab.Problems.BinPacking;
 using HeuristicLab.Encodings.PackingEncoding;

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointPackingSequenceDecoder2D.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Common;
-using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
 using HeuristicLab.Problems.BinPacking;
 using HeuristicLab.Encodings.PackingEncoding;
+using HeuristicLab.Encodings.PermutationEncoding;
 
 namespace HeuristicLab.Problems.BinPacking2D {
@@ -45 +45 @@
 
     public override PackingPlan<PackingPosition, PackingShape, PackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, PackingShape binMeasures, ItemList<PackingItem> itemMeasures) {
-      var solution = encodedSolution as PackingSequenceEncoding;
-      if (solution == null) throw new InvalidOperationException("Encoding is not of type PackingSequence");
+      var solution = encodedSolution as Permutation;
+      if (solution == null) throw new InvalidOperationException("Encoding is not of type Permutation");
       Solution result = new Solution(binMeasures, true, false);
       result.Pack(solution, itemMeasures);