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

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

Files:

• BinPacking2D.cs (modified) (1 diff)
• Decoders/BL/BottomLeftPackingSequenceDecoder.cs (modified) (2 diffs)
• Decoders/EP/ExtremePointMultiComponentVectorDecoder2D.cs (modified) (1 diff)
• Decoders/EP/ExtremePointPackingSequenceDecoder2D.cs (modified) (2 diffs)
• HeuristicLab.Problems.BinPacking2D-3.3.csproj (modified) (3 diffs)
• MoveEvaluators/PackingMoveEvaluator2DGV.cs (modified) (1 diff)
• MoveEvaluators/PackingMoveEvaluator2DMCV.cs (modified) (1 diff)
• MoveEvaluators/PackingMoveEvaluator2DPS.cs (modified) (1 diff)
• PackingSequenceProblem.cs (added)
• Problem.cs (modified) (3 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/BinPacking2D.cs

@@ -66 +66 @@
 
       //Find ExtremePoints beginning from sourcepointY
-      var sourcePointY = new PackingPosition(0, position.X, position.Y + newItem.Height);
+      var sourcePointY = new PackingPosition(0, position.X, position.Y + newHeight);
       if (sourcePointY.X < BinMeasures.Width && sourcePointY.Y < BinMeasures.Height) {
         //Traversing down the x-axis  

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);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/HeuristicLab.Problems.BinPacking2D-3.3.csproj

@@ -163 +163 @@
   <ItemGroup>
     <Compile Include="BinPacking2D.cs" />
-    <Compile Include="Decoders\BL\BottomLeftGroupingVectorDecoder.cs" />
-    <Compile Include="Decoders\BL\BottomLeftMultiComponentVectorDecoder.cs" />
-    <Compile Include="Decoders\BL\BottomLeftPackingSequenceDecoder.cs" />
-    <Compile Include="Decoders\EP\ExtremePointGroupingVectorDecoder2D.cs" />
-    <Compile Include="Decoders\EP\ExtremePointMultiComponentVectorDecoder2D.cs" />
-    <Compile Include="Decoders\EP\ExtremePointPackingSequenceDecoder2D.cs" />
+    <Compile Include="Decoders\EP\ExtremePointPackingSequenceDecoder2D.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Instances\BPPData.cs" />
     <Compile Include="Instances\RandomDataDescriptor.cs" />
@@ -176 +173 @@
     <Compile Include="Interfaces\I2DOperator.cs" />
     <Compile Include="Interfaces\I2DPSDecoder.cs" />
-    <Compile Include="MoveEvaluators\PackingMoveEvaluator2DGV.cs" />
-    <Compile Include="MoveEvaluators\PackingMoveEvaluator2DMCV.cs" />
-    <Compile Include="MoveEvaluators\PackingMoveEvaluator2DPS.cs" />
     <Compile Include="PackingItem.cs" />
     <Compile Include="PackingPosition.cs" />
     <Compile Include="PackingRatioEvaluator.cs" />
+    <Compile Include="PackingSequenceProblem.cs" />
     <Compile Include="PackingShape.cs" />
     <Compile Include="Plugin.cs" />
-    <Compile Include="Problem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Solution.cs" />
@@ -198 +192 @@
       <Name>HeuristicLab.Problems.BinPacking-3.3</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Decoders\BL\" />
+    <Folder Include="MoveEvaluators\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/MoveEvaluators/PackingMoveEvaluator2DGV.cs

@@ -29 +29 @@
   [Item("GroupingVectorMoveEvaluator2D", "Class for evaluating packing moves for 2dimensional problems.")]
   [StorableClass]
-  public class PackingMoveEvaluator2DGV : PackingMoveEvaluator<PackingPosition, PackingShape, PackingItem>, ISingleObjectiveMoveEvaluator, IGroupingVectorMoveOperator, I2DOperator {
+  public class PackingMoveEvaluator2DGV<T> : PackingMoveEvaluator<PackingPosition, PackingShape, PackingItem, T>, ISingleObjectiveMoveEvaluator, IGroupingVectorMoveOperator, I2DOperator
+  where T : class , IItem {
     [StorableConstructor]
     protected PackingMoveEvaluator2DGV(bool deserializing) : base(deserializing) { }
-    protected PackingMoveEvaluator2DGV(PackingMoveEvaluator2DGV original, Cloner cloner)
+    protected PackingMoveEvaluator2DGV(PackingMoveEvaluator2DGV<T> original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new PackingMoveEvaluator2DGV(this, cloner);
+      return new PackingMoveEvaluator2DGV<T>(this, cloner);
     }
     public PackingMoveEvaluator2DGV()

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/MoveEvaluators/PackingMoveEvaluator2DMCV.cs

@@ -29 +29 @@
   [Item("MultiComponentVectorMoveEvaluator2D", "Class for evaluating packing moves for 2dimensional problems.")]
   [StorableClass]
-  public class PackingMoveEvaluator2DMCV : PackingMoveEvaluator<PackingPosition, PackingShape, PackingItem>, ISingleObjectiveMoveEvaluator, IMultiComponentVectorMoveOperator, I2DOperator {
+  public class PackingMoveEvaluator2DMCV<T> : PackingMoveEvaluator<PackingPosition, PackingShape, PackingItem, T>, ISingleObjectiveMoveEvaluator, IMultiComponentVectorMoveOperator, I2DOperator 
+  where T : class, IItem {
     [StorableConstructor]
     protected PackingMoveEvaluator2DMCV(bool deserializing) : base(deserializing) { }
-    protected PackingMoveEvaluator2DMCV(PackingMoveEvaluator2DMCV original, Cloner cloner)
+    protected PackingMoveEvaluator2DMCV(PackingMoveEvaluator2DMCV<T> original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new PackingMoveEvaluator2DMCV(this, cloner);
+      return new PackingMoveEvaluator2DMCV<T>(this, cloner);
     }
     public PackingMoveEvaluator2DMCV()

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/MoveEvaluators/PackingMoveEvaluator2DPS.cs

@@ -29 +29 @@
   [Item("PackingSequenceMoveEvaluator2D", "Class for evaluating packing moves for 2dimensional problems.")]
   [StorableClass]
-  public class PackingMoveEvaluator2DPS : PackingMoveEvaluator<PackingPosition, PackingShape, PackingItem>, ISingleObjectiveMoveEvaluator, IPackingSequenceMoveOperator, I2DOperator {
+  public class PackingMoveEvaluator2DPS<T> : PackingMoveEvaluator<PackingPosition, PackingShape, PackingItem, T>, ISingleObjectiveMoveEvaluator, IPackingSequenceMoveOperator, I2DOperator
+  where T : class, IItem {
     [StorableConstructor]
     protected PackingMoveEvaluator2DPS(bool deserializing) : base(deserializing) { }
-    protected PackingMoveEvaluator2DPS(PackingMoveEvaluator2DPS original, Cloner cloner)
+    protected PackingMoveEvaluator2DPS(PackingMoveEvaluator2DPS<T> original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new PackingMoveEvaluator2DPS(this, cloner);
+      return new PackingMoveEvaluator2DPS<T>(this, cloner);
     }
     public PackingMoveEvaluator2DPS()

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Problem.cs

@@ -26 +26 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
-using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
 using HeuristicLab.Problems.Instances;
-using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
 using HeuristicLab.Data;
-using System;
 using HeuristicLab.Problems.BinPacking;
 
@@ -37 +34 @@
   [StorableClass]
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 300)]
-  // TODO: only support 2d BPPData
   public class Problem : Problem<PackingPosition, PackingShape, PackingItem>, IProblemInstanceConsumer<BPPData>, IProblemInstanceExporter<BPPData> {
 
@@ -131 +127 @@
       if (SolutionCreator is PackingSequenceRandomCreator) {
         PackingSolutionDecoderParameter.ValidValues.UnionWith(ApplicationManager.Manager.GetInstances<I2DPSDecoder>());
-      } else if (SolutionCreator is GroupingVectorRandomCreator) {
+      } /*else if (SolutionCreator is GroupingVectorRandomCreator) {
         PackingSolutionDecoderParameter.ValidValues.UnionWith(ApplicationManager.Manager.GetInstances<I2DGVDecoder>());
       } else if (SolutionCreator is MultiComponentVectorRandomCreator) {
         PackingSolutionDecoderParameter.ValidValues.UnionWith(ApplicationManager.Manager.GetInstances<I2DMCVDecoder>());
-      } else {
+      } */ else {
         string error = "The given problem does not support the selected solution-creator.";
         ErrorHandling.ShowErrorDialog(error, null);