Changeset 9495 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem

Timestamp:

05/15/13 22:23:36 (12 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;

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem

Files:

• CuboidIdenticalBinPackingProblem.cs (modified) (3 diffs)
• ISOContainerBinPackingProblem.cs (added)
• RectangularIdenticalBinPackingProblem.cs (modified) (1 diff)
• RegularIdenticalBinPackingProblem.cs (modified) (3 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem/CuboidIdenticalBinPackingProblem.cs

@@ -44 +44 @@
 using HeuristicLab.Problems.Instances;
 using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
-using HeuristicLab.Encodings.PackingEncoding.Potvin;
 
 namespace HeuristicLab.Problems.BinPacking.Problem {
@@ -120 +119 @@
     #region Helpers
     protected override void InitializeDecoder() {
+      Operators.RemoveAll(op => typeof(I2DOperator).IsAssignableFrom(op.GetType()));
+
       if (SolutionCreator is PackingSequenceRandomCreator) {
         PackingSolutionDecoder = new ExtremePointPackingSequenceDecoder3D();
@@ -126 +127 @@
       } else if (SolutionCreator is MultiComponentVectorRandomCreator) {
         PackingSolutionDecoder = new ExtremePointMultiComponentVectorDecoder3D();
-      } else if (SolutionCreator is PotvinRandomCreator) {
-        PackingSolutionDecoder = new ExtremePointPotvinDecoder3D();
       } else {
         string error = "The given problem does not support the selected solution-creator.";

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem/RectangularIdenticalBinPackingProblem.cs

@@ -114 +114 @@
     #region Helpers
     protected override void InitializeDecoder() {
+      Operators.RemoveAll(op => typeof(I3DOperator).IsAssignableFrom(op.GetType()));
+
       if (SolutionCreator is PackingSequenceRandomCreator) {
         PackingSolutionDecoder = new ExtremePointPackingSequenceDecoder2D();

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem/RegularIdenticalBinPackingProblem.cs

@@ -43 +43 @@
 using HeuristicLab.Problems.Instances;
 using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
-using HeuristicLab.Encodings.PackingEncoding.Potvin;
 
 namespace HeuristicLab.Problems.BinPacking.Problem {
@@ -67 +66 @@
       set { PackingBinMeasuresParameter.Value = value; } 
     }
-    public IdenticalBinPackingSolutionDecoder<D,B,I, PackingPlan<D,B,I>> PackingSolutionDecoder {
-      get { return PackingSolutionDecoderParameter.Value as IdenticalBinPackingSolutionDecoder<D, B, I, PackingPlan<D, B, I>>; }
+    public PackingSolutionDecoder<D,B,I> PackingSolutionDecoder {
+      get { return PackingSolutionDecoderParameter.Value as PackingSolutionDecoder<D, B, I>; }
       set { PackingSolutionDecoderParameter.Value = value; }
     }
@@ -139 +138 @@
         Operators.AddRange(ApplicationManager.Manager.GetInstances<IMultiComponentVectorOperator>());
         InitializeDecoder();
-      } else if (SolutionCreator.GetType() == typeof(PotvinRandomCreator)) {
-        Operators.AddRange(ApplicationManager.Manager.GetInstances<IPotvinOperator>());
-        InitializeDecoder();
       } 
     }