Changeset 13606


Ignore:
Timestamp:
02/08/16 20:54:12 (6 years ago)
Author:
gkronber
Message:

#1966 refactoring (moved 2d-specific classes into separate project)

Location:
branches/HeuristicLab.BinPacking
Files:
5 added
2 deleted
5 edited
3 copied
13 moved

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3

    • Property svn:ignore set to
      bin
      obj
      *.user
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftMultiComponentVectorDecoder.cs

    r13032 r13606  
    3030using HeuristicLab.Problems.BinPacking.Interfaces;
    3131using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
     32using HeuristicLab.Problems.BinPacking2D;
    3233
    3334namespace HeuristicLab.Problems.BinPacking.Decoders {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/HeuristicLab.Problems.BinPacking2D-3.3.csproj

    r13605 r13606  
    158158  </ItemGroup>
    159159  <ItemGroup>
     160    <Compile Include="Decoders\BL\BottomLeftGroupingVectorDecoder.cs" />
     161    <Compile Include="Decoders\BL\BottomLeftMultiComponentVectorDecoder.cs" />
     162    <Compile Include="Decoders\BL\BottomLeftPackingSequenceDecoder.cs" />
     163    <Compile Include="Decoders\EP\ExtremePointGroupingVectorDecoder2D.cs" />
     164    <Compile Include="Decoders\EP\ExtremePointMultiComponentVectorDecoder2D.cs" />
     165    <Compile Include="Decoders\EP\ExtremePointPackingSequenceDecoder2D.cs" />
     166    <Compile Include="Interfaces\I2DGVDecoder.cs" />
     167    <Compile Include="Interfaces\I2DMCVDecoder.cs" />
     168    <Compile Include="Interfaces\I2DOperator.cs" />
     169    <Compile Include="Interfaces\I2DPSDecoder.cs" />
     170    <Compile Include="MoveEvaluators\PackingMoveEvaluator2DGV.cs" />
     171    <Compile Include="MoveEvaluators\PackingMoveEvaluator2DMCV.cs" />
     172    <Compile Include="MoveEvaluators\PackingMoveEvaluator2DPS.cs" />
     173    <Compile Include="PackingRatioRectangularIdenticalBinEvaluator.cs" />
    160174    <Compile Include="Plugin.cs" />
    161175    <Compile Include="Properties\AssemblyInfo.cs" />
     176    <Compile Include="RectangularIdenticalBinPackingProblem.cs" />
     177    <Compile Include="RectangularPackingBin.cs" />
     178    <Compile Include="RectangularPackingItem.cs" />
     179    <Compile Include="RectangularPackingShape.cs" />
     180    <Compile Include="TwoDimensionalPacking.cs" />
    162181  </ItemGroup>
    163182  <ItemGroup>
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs

    r13462 r13606  
    253253
    254254
    255   [Item("PackingPlan2D", "Represents a solution for a 2D bin packing problem.")]
    256   [StorableClass]
    257   public class PackingPlan2D : PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> {
    258     public PackingPlan2D(RectangularPackingBin binMeasures) : this(binMeasures, false, false) { }
    259     public PackingPlan2D(RectangularPackingBin binMeasures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }
    260     [StorableConstructor]
    261     protected PackingPlan2D(bool deserializing) : base(deserializing) { }
    262     protected PackingPlan2D(PackingPlan2D original, Cloner cloner)
    263       : base(original, cloner) {
    264     }
    265     public override IDeepCloneable Clone(Cloner cloner) {
    266       return new PackingPlan2D(this, cloner);
    267     }
    268     public override BinPacking<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> NewBinPacking() {
    269       return new BinPacking2D(BinMeasures);
    270     }
    271   }
    272 
    273 
    274 
    275 
    276 
    277   [Item("PackingPlan3D", "Represents a solution for a 3D bin packing problem.")]
    278   [StorableClass]
    279   public class PackingPlan3D : PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> {
    280     public PackingPlan3D(CuboidPackingBin binMeasures) : this(binMeasures, false, false) { }
    281     public PackingPlan3D(CuboidPackingBin binMeasures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }
    282     [StorableConstructor]
    283     protected PackingPlan3D(bool deserializing) : base(deserializing) { }
    284     protected PackingPlan3D(PackingPlan3D original, Cloner cloner)
    285       : base(original, cloner) {
    286     }
    287     public override IDeepCloneable Clone(Cloner cloner) {
    288       return new PackingPlan3D(this, cloner);
    289     }
    290     public override BinPacking<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> NewBinPacking() {
    291       return new BinPacking3D(BinMeasures);
    292     }
    293   }
     255
     256
    294257
    295258}
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

    r13605 r13606  
    160160    <Compile Include="Analyzers\BestBinPackingSolutionAnalyzer.cs" />
    161161    <Compile Include="Analyzers\BinPackingAnalyzer.cs" />
    162     <Compile Include="Decoders\2D\BL\BottomLeftMultiComponentVectorDecoder.cs" />
    163     <Compile Include="Decoders\2D\EP\ExtremePointGroupingVectorDecoder2D.cs" />
    164     <Compile Include="Decoders\2D\EP\ExtremePointMultiComponentVectorDecoder2D.cs" />
    165     <Compile Include="Decoders\2D\EP\ExtremePointPackingSequenceDecoder2D.cs" />
    166162    <Compile Include="Decoders\3D\EP\ExtremePointMultiComponentVectorDecoder3D.cs" />
    167163    <Compile Include="Decoders\3D\EP\ExtremePointGroupingVectorDecoder3D.cs" />
     
    169165    <Compile Include="Decoders\3D\DBL\DeepestBottomLeftMultiComponentVectorDecoder.cs" />
    170166    <Compile Include="Decoders\3D\DBL\DeepestBottomLeftGroupingVectorDecoder.cs" />
    171     <Compile Include="Decoders\2D\BL\BottomLeftGroupingVectorDecoder.cs" />
    172167    <Compile Include="Decoders\3D\DBL\DeepestBottomLeftPackingSequenceDecoder.cs" />
    173     <Compile Include="Decoders\2D\BL\BottomLeftPackingSequenceDecoder.cs" />
    174168    <Compile Include="Decoders\3D\EP\ISOContainerMultiComponentVectorDecoder3D.cs" />
    175169    <Compile Include="Decoders\PackingSolutionDecoder.cs" />
     
    228222    <Compile Include="Encodings\MultiComponentVector\MultiComponentVectorRandomCreator.cs" />
    229223    <Compile Include="Encodings\MultiComponentVector\ThreeWayMultiComponentVectorManipulator.cs" />
    230     <Compile Include="Encodings\PackingPlans\BinPacking2D.cs" />
    231224    <Compile Include="Encodings\PackingPlans\BinPacking3D.cs" />
    232225    <Compile Include="Encodings\PackingPlans\BinPacking.cs" />
     
    265258    <Compile Include="Encodings\PackingSolutionCrossover.cs" />
    266259    <Compile Include="Encodings\PackingSolutionManipulator.cs" />
    267     <Compile Include="Evaluators\2D\PackingRatioRectangularIdenticalBinEvaluator.cs" />
    268260    <Compile Include="Evaluators\3D\PackingRatioCuboidIdenticalBinEvaluator.cs" />
    269261    <Compile Include="Evaluators\Abstract\BinUtilizationRegularIdenticalBinEvaluator.cs" />
     
    277269    <Compile Include="Instances\BPPORLIBDataDescriptor.cs" />
    278270    <Compile Include="Instances\RealBPPData.cs" />
    279     <Compile Include="Interfaces\DecoderInterfaces\I2DMCVDecoder.cs" />
    280271    <Compile Include="Interfaces\DecoderInterfaces\I3DMCVDecoder.cs" />
    281     <Compile Include="Interfaces\DecoderInterfaces\I2DGVDecoder.cs" />
    282272    <Compile Include="Interfaces\DecoderInterfaces\I3DGVDecoder.cs" />
    283     <Compile Include="Interfaces\DecoderInterfaces\I2DPSDecoder.cs" />
    284273    <Compile Include="Interfaces\DecoderInterfaces\I3DPSDecoder.cs" />
    285274    <Compile Include="Interfaces\IPackingSequenceMoveOperator.cs" />
    286275    <Compile Include="Interfaces\I3DOperator.cs" />
    287     <Compile Include="Interfaces\I2DOperator.cs" />
    288276    <Compile Include="Interfaces\IPackingMove.cs" />
    289277    <Compile Include="Interfaces\IMultiComponentVectorMoveOperator.cs" />
     
    303291    <Compile Include="Interfaces\IPackingShape.cs" />
    304292    <Compile Include="Interfaces\IPackingDimensions.cs" />
    305     <Compile Include="MoveEvaluators\PackingMoveEvaluator2DPS.cs" />
    306293    <Compile Include="MoveEvaluators\PackingMoveEvaluator3DPS.cs" />
    307294    <Compile Include="MoveEvaluators\PackingMoveEvaluator.cs" />
    308     <Compile Include="MoveEvaluators\PackingMoveEvaluator2DGV.cs">
    309       <SubType>Code</SubType>
    310     </Compile>
    311     <Compile Include="MoveEvaluators\PackingMoveEvaluator2DMCV.cs">
    312       <SubType>Code</SubType>
    313     </Compile>
    314295    <Compile Include="MoveEvaluators\PackingMoveEvaluator3DGV.cs">
    315296      <SubType>Code</SubType>
     
    324305    <Compile Include="Dimensions\PackingDimensions.cs" />
    325306    <Compile Include="Dimensions\ThreeDimensionalPacking.cs" />
    326     <Compile Include="Dimensions\TwoDimensionalPacking.cs" />
    327     <Compile Include="Problem\RectangularIdenticalBinPackingProblem.cs" />
    328307    <Compile Include="Shapes\PackingShape.cs" />
    329308    <Compile Include="Shapes\CuboidPackingShape.cs" />
    330     <Compile Include="Shapes\RectangularPackingShape.cs" />
    331309    <Compile Include="Interfaces\IRegularPackingShape.cs" />
    332310    <Compile Include="PackingBin\CuboidPackingBin.cs" />
    333     <Compile Include="PackingBin\RectangularPackingBin.cs" />
    334311    <Compile Include="PackingItem\CuboidPackingItem.cs" />
    335312    <Compile Include="Interfaces\IPackingBin.cs" />
    336313    <Compile Include="Interfaces\IPackingItem.cs" />
    337314    <Compile Include="Interfaces\IPackingPlan.cs" />
    338     <Compile Include="PackingItem\RectangularPackingItem.cs" />
    339315    <Compile Include="Plugin.cs" />
    340316    <Compile Include="Properties\AssemblyInfo.cs" />
Note: See TracChangeset for help on using the changeset viewer.