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

Timestamp:

02/08/16 21:32:33 (8 years ago)

Author:

gkronber

Message:

#1966: continue splitting into 2d and 3d implementations

Location:

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

Files:

• HeuristicLab.Problems.BinPacking2D-3.3.csproj (modified) (1 diff)
• PackingPlan2D.cs (modified) (1 diff)
• RectangularIdenticalBinPackingProblem.cs (modified) (1 diff)

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

@@ -158 +158 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BinPacking2D.cs" />
     <Compile Include="Decoders\BL\BottomLeftGroupingVectorDecoder.cs" />
     <Compile Include="Decoders\BL\BottomLeftMultiComponentVectorDecoder.cs" />

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

@@ -43 +43 @@
     }
     public override BinPacking<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> NewBinPacking() {
-      return new BinPacking2D(BinMeasures);
+      return new Encodings.PackingEncoding.PackingPlan.BinPacking2D(BinMeasures);
     }
   }

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

@@ -104 +104 @@
     #region Helpers
     protected override void InitializeDecoder() {
-      Operators.RemoveAll(op => op is I3DOperator);
+      // Operators.RemoveAll(op => op is I3DOperator); TODO
 
       PackingSolutionDecoderParameter.ValidValues.Clear();