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

Timestamp:

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

Author:

gkronber

Message:

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

Location:

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

Files:

• Encodings/PackingPlans/PackingPlan.cs (modified) (2 diffs)
• HeuristicLab.Problems.BinPacking-3.3.csproj (modified) (3 diffs)

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

@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Problems.BinPacking.Interfaces;
-using HeuristicLab.Problems.BinPacking.PackingItem;
 using HeuristicLab.Problems.BinPacking.Shapes;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.Collections;
-using HeuristicLab.Problems.BinPacking.Dimensions;
-using HeuristicLab.Problems.BinPacking.PackingBin;
 using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
 using HeuristicLab.Encodings.PackingEncoding.GroupingVector;

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

@@ -215 +215 @@
     <Compile Include="Encodings\MultiComponentVector\MultiComponentVectorRandomCreator.cs" />
     <Compile Include="Encodings\MultiComponentVector\ThreeWayMultiComponentVectorManipulator.cs" />
-    <Compile Include="Encodings\PackingPlans\BinPacking3D.cs" />
     <Compile Include="Encodings\PackingPlans\BinPacking.cs" />
     <Compile Include="Encodings\PackingPlans\PackingPlan.cs" />
@@ -251 +250 @@
     <Compile Include="Encodings\PackingSolutionCrossover.cs" />
     <Compile Include="Encodings\PackingSolutionManipulator.cs" />
+    <Compile Include="Evaluators\BinUtilizationRegularIdenticalBinEvaluator.cs" />
+    <Compile Include="Evaluators\PackingPlanEvaluationAlgorithm.cs" />
+    <Compile Include="Evaluators\PackingPlanEvaluator.cs" />
+    <Compile Include="Evaluators\PackingRatioRegularIdenticalBinEvaluator.cs" />
+    <Compile Include="Evaluators\RegularSimpleRotationIdenticalBinPackingPlanEvaluator.cs" />
     <Compile Include="Instances\BPPData.cs" />
     <Compile Include="Instances\BPPInstanceProvider.cs" />
@@ -276 +280 @@
     <Compile Include="PackingDimensions.cs" />
     <Compile Include="PackingMoveEvaluator.cs" />
-    <Compile Include="PackingPlan3D.cs" />
     <Compile Include="Interfaces\IRegularPackingShape.cs" />
     <Compile Include="Interfaces\IPackingBin.cs" />