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

Timestamp:

07/21/16 13:03:42 (8 years ago)

Author:

gkronber

Message:

#1966: added abstract problem and move evaluator classes and implemented 2d bin packing problem based on integer vector encoding

Location:

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

Files:

• BinPacking2D.cs (modified) (1 diff)
• Evaluators/PackingRatioEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.BinPacking2D-3.3.csproj (modified) (1 diff)
• IntegerVectorEncoding (added)
• IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs (added)
• IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs (added)
• IntegerVectorEncoding/IntegerVectorDecoderBase.cs (added)
• IntegerVectorEncoding/IntegerVectorProblem.cs (added)
• PermutationEncoding/PermutationProblem.cs (modified) (1 diff)
• Solution.cs (modified) (1 diff)

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

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Common;
-using HeuristicLab.Encodings.PackingEncoding;
 
 namespace HeuristicLab.Problems.BinPacking2D {
   [Item("BinPacking2D", "Represents a single-bin packing for a 2D bin-packing problem.")]
   [StorableClass]
-  public class BinPacking2D : BinPacking<PackingPosition, PackingShape, PackingItem> {
+  public class BinPacking2D : BinPacking.BinPacking<PackingPosition, PackingShape, PackingItem> {
 
     public BinPacking2D(PackingShape binMeasures)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Evaluators/PackingRatioEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Common;
-using HeuristicLab.Data;
-using HeuristicLab.Encodings.PackingEncoding;
-using HeuristicLab.Problems.BinPacking;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Problems.BinPacking2D {
@@ -64 +60 @@
       const double k = 2;
       for (int i = 0; i < nrOfBins; i++) {
-        var f = solution.BinPackings[i].ItemMeasures.Sum(kvp => kvp.Value.Volume);
-        var c = solution.BinPackings[i].BinMeasures.Volume;
+        double f = solution.BinPackings[i].ItemMeasures.Sum(kvp => kvp.Value.Volume);
+        double c = solution.BinPackings[i].BinMeasures.Volume;
         result += Math.Pow(f / c, k);
       }

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

@@ -168 +168 @@
     <Compile Include="Instances\RandomDataDescriptor.cs" />
     <Compile Include="Instances\RandomInstanceProvider.cs" />
+    <Compile Include="IntegerVectorEncoding\BottomLeftIntegerVectorDecoder.cs" />
+    <Compile Include="IntegerVectorEncoding\IntegerVectorDecoderBase.cs" />
+    <Compile Include="IntegerVectorEncoding\ExtremePointIntegerVectorDecoder.cs" />
+    <Compile Include="IntegerVectorEncoding\IntegerVectorProblem.cs" />
     <Compile Include="Interfaces\IDecoder.cs" />
     <Compile Include="Interfaces\IEvaluator.cs" />

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PermutationEncoding/PermutationProblem.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.BinPacking2D {

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

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.PackingEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.BinPacking;
 
 namespace HeuristicLab.Problems.BinPacking2D {