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

Timestamp:

05/04/13 17:51:14 (12 years ago)

Author:

jhelm

Message:

#1966: Implemented new encoding (MultiComponentVector/MCV); Implemented move-operators for MCV and GV encodings; Implemented new decoding-methods for PS, GV and MCV encodings (ExtremePoint-based packing);

Location:

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

Files:

• BinPackingProblem.cs (modified) (1 diff)
• CuboidIdenticalBinPackingProblem.cs (modified) (2 diffs)
• RectangularIdenticalBinPackingProblem.cs (modified) (2 diffs)
• RegularIdenticalBinPackingProblem.cs (modified) (5 diffs)

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

@@ -31 +31 @@
 using HeuristicLab.Common;
 using HeuristicLab.Parameters;
-using HeuristicLab.Problems.BinPacking.PackingPlans;
+using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
 using HeuristicLab.Problems.BinPacking.Evaluators;
 using HeuristicLab.Problems.BinPacking.Analyzers;

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

@@ -43 +43 @@
 using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
 using HeuristicLab.Problems.Instances;
+using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
 
 namespace HeuristicLab.Problems.BinPacking.Problem {
@@ -119 +120 @@
     protected override void InitializeDecoder() {
       if (SolutionCreator is PackingSequenceRandomCreator) {
-        PackingSolutionDecoder = new ThreeDimensionalBottomLeftPackingSequenceDecoder();
+        PackingSolutionDecoder = new ExtremePointPackingSequenceDecoder3D();
       } else if (SolutionCreator is GroupingVectorRandomCreator) {
-        PackingSolutionDecoder = new ThreeDimensionalBottomLeftGroupingVectorDecoder();
+        PackingSolutionDecoder = new ExtremePointGroupingVectorDecoder3D();
+      } else if (SolutionCreator is MultiComponentVectorRandomCreator) {
+        PackingSolutionDecoder = new ExtremePointMultiComponentVectorDecoder3D();
       } else {
         string error = "The given problem does not support the selected solution-creator.";

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

@@ -39 +39 @@
 using HeuristicLab.Data;
 using HeuristicLab.Problems.BinPacking.Decoders;
-using HeuristicLab.Problems.BinPacking.PackingPlans;
+using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
 using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
 using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
 using HeuristicLab.Problems.Instances;
+using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
 
 namespace HeuristicLab.Problems.BinPacking.Problem {
@@ -114 +115 @@
     protected override void InitializeDecoder() {
       if (SolutionCreator is PackingSequenceRandomCreator) {
-        PackingSolutionDecoder = new TwoDimensionalBottomLeftPackingSequenceDecoder();
+        PackingSolutionDecoder = new ExtremePointPackingSequenceDecoder2D();
       } else if (SolutionCreator is GroupingVectorRandomCreator) {
-        PackingSolutionDecoder = new TwoDimensionalBottomLeftGroupingVectorDecoder();
+        PackingSolutionDecoder = new ExtremePointGroupingVectorDecoder2D();
+      } else if (SolutionCreator is MultiComponentVectorRandomCreator) {
+        PackingSolutionDecoder = new ExtremePointMultiComponentVectorDecoder2D();
       } else {
         string error = "The given problem does not support the selected solution-creator.";

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

@@ -36 +36 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Data;
-using HeuristicLab.Problems.BinPacking.PackingPlans;
+using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
 using HeuristicLab.Problems.BinPacking.Analyzers;
 using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
@@ -42 +42 @@
 using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
 using HeuristicLab.Problems.Instances;
+using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
 
 namespace HeuristicLab.Problems.BinPacking.Problem {
@@ -79 +80 @@
     }
 
-    protected RegularIdenticalBinPackingProblem(IPackingPlanEvaluationAlgorithm e) : this(e, new GroupingVectorRandomCreator()) { }
+    protected RegularIdenticalBinPackingProblem(IPackingPlanEvaluationAlgorithm e) : this(e, new MultiComponentVectorRandomCreator()) { }
     protected RegularIdenticalBinPackingProblem(IPackingPlanEvaluationAlgorithm e, IPackingSolutionCreator c)
       : base(e, c) {
@@ -134 +135 @@
         Operators.AddRange(ApplicationManager.Manager.GetInstances<IGroupingVectorOperator>());
         InitializeDecoder();
+      } else if (SolutionCreator.GetType() == typeof(MultiComponentVectorRandomCreator)) {
+        Operators.AddRange(ApplicationManager.Manager.GetInstances<IMultiComponentVectorOperator>());
+        InitializeDecoder();
       } 
     }
@@ -192 +196 @@
       if (PackingSolutionDecoder != null) PackingSolutionDecoder.PackingPlanParameter.ActualNameChanged += PackingSolutionDecoder_PackingPlanParameter_ActualNameChanged;
     }
+
     #endregion