Changeset 13611


Ignore:
Timestamp:
02/08/16 21:32:33 (6 years ago)
Author:
gkronber
Message:

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

Location:
branches/HeuristicLab.BinPacking
Files:
6 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r13607 r13611  
    158158  </ItemGroup>
    159159  <ItemGroup>
     160    <Compile Include="BinPacking2D.cs" />
    160161    <Compile Include="Decoders\BL\BottomLeftGroupingVectorDecoder.cs" />
    161162    <Compile Include="Decoders\BL\BottomLeftMultiComponentVectorDecoder.cs" />

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

    r13606 r13611  
    4343    }
    4444    public override BinPacking<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> NewBinPacking() {
    45       return new BinPacking2D(BinMeasures);
     45      return new Encodings.PackingEncoding.PackingPlan.BinPacking2D(BinMeasures);
    4646    }
    4747  }

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

    r13606 r13611  
    104104    #region Helpers
    105105    protected override void InitializeDecoder() {
    106       Operators.RemoveAll(op => op is I3DOperator);
     106      // Operators.RemoveAll(op => op is I3DOperator); TODO
    107107
    108108      PackingSolutionDecoderParameter.ValidValues.Clear();

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/HeuristicLab.Problems.BinPacking3D-3.3.csproj

    r13609 r13611  
    178178    <Compile Include="MoveEvaluators\PackingMoveEvaluator3DMCV.cs" />
    179179    <Compile Include="MoveEvaluators\PackingMoveEvaluator3DPS.cs" />
     180    <Compile Include="PackingPlan3D.cs" />
    180181    <Compile Include="PackingRatioCuboidIdenticalBinEvaluator.cs" />
    181182    <Compile Include="Plugin.cs" />

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs

    r13607 r13611  
    2424using System.Linq;
    2525using HeuristicLab.Problems.BinPacking.Interfaces;
    26 using HeuristicLab.Problems.BinPacking.PackingItem;
    2726using HeuristicLab.Problems.BinPacking.Shapes;
    2827using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3130using HeuristicLab.Data;
    3231using HeuristicLab.Collections;
    33 using HeuristicLab.Problems.BinPacking.Dimensions;
    34 using HeuristicLab.Problems.BinPacking.PackingBin;
    3532using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
    3633using HeuristicLab.Encodings.PackingEncoding.GroupingVector;

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

    r13608 r13611  
    215215    <Compile Include="Encodings\MultiComponentVector\MultiComponentVectorRandomCreator.cs" />
    216216    <Compile Include="Encodings\MultiComponentVector\ThreeWayMultiComponentVectorManipulator.cs" />
    217     <Compile Include="Encodings\PackingPlans\BinPacking3D.cs" />
    218217    <Compile Include="Encodings\PackingPlans\BinPacking.cs" />
    219218    <Compile Include="Encodings\PackingPlans\PackingPlan.cs" />
    … …  
    251250    <Compile Include="Encodings\PackingSolutionCrossover.cs" />
    252251    <Compile Include="Encodings\PackingSolutionManipulator.cs" />
     252    <Compile Include="Evaluators\BinUtilizationRegularIdenticalBinEvaluator.cs" />
     253    <Compile Include="Evaluators\PackingPlanEvaluationAlgorithm.cs" />
     254    <Compile Include="Evaluators\PackingPlanEvaluator.cs" />
     255    <Compile Include="Evaluators\PackingRatioRegularIdenticalBinEvaluator.cs" />
     256    <Compile Include="Evaluators\RegularSimpleRotationIdenticalBinPackingPlanEvaluator.cs" />
    253257    <Compile Include="Instances\BPPData.cs" />
    254258    <Compile Include="Instances\BPPInstanceProvider.cs" />
    … …  
    276280    <Compile Include="PackingDimensions.cs" />
    277281    <Compile Include="PackingMoveEvaluator.cs" />
    278     <Compile Include="PackingPlan3D.cs" />
    279282    <Compile Include="Interfaces\IRegularPackingShape.cs" />
    280283    <Compile Include="Interfaces\IPackingBin.cs" />
Note: See TracChangeset for help on using the changeset viewer.