Changeset 15488 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Encoding

Timestamp:

11/28/17 16:10:31 (7 years ago)

Author:

rhanghof

Message:

#2817:

• Added line projection based bin packing
• Added residual spaces to the view

Location:

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Encoding

Files:

• ExtremePointPermutationDecoder.cs (modified) (5 diffs)
• PermutationProblem.cs (modified) (1 diff)

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Encoding/ExtremePointPermutationDecoder.cs

@@ -30 +30 @@
 using HeuristicLab.Common;
 using HeuristicLab.Problems.BinPacking3D.Packer;
+using HeuristicLab.Parameters;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.BinPacking3D.Encoding {
@@ -38 +40 @@
   [Item("Extreme-point Permutation Decoder (3d) Base", "Base class for 3d decoders")]
   [StorableClass]
-  public class ExtremePointPermutationDecoder : Item, IDecoder<Permutation>
-    //where TBinPacker : BinPacker, new ()
-    {
+  public class ExtremePointPermutationDecoder : ParameterizedNamedItem, IDecoder<Permutation> {
+
+    [Storable]
+    private IValueParameter<EnumValue<FittingMethod>> fittingMethodParameter;
+    public IValueParameter<EnumValue<FittingMethod>> FittingMethodParameter {
+      get { return fittingMethodParameter; }
+    }
+
+    public FittingMethod FittingMethod {
+      get { return fittingMethodParameter.Value.Value; }
+      set { fittingMethodParameter.Value.Value = value; }
+    }
+
+    [Storable]
+    private readonly IValueParameter<EnumValue<ExtremePointCreationMethod>> extremePointCreationMethodParameter;
+    public IValueParameter<EnumValue<ExtremePointCreationMethod>> ExtremePointCreationMethodParameter {
+      get { return extremePointCreationMethodParameter; }
+    }
+
+    public ExtremePointCreationMethod ExtremePointCreationMethod {
+      get { return extremePointCreationMethodParameter.Value.Value; }
+      set { extremePointCreationMethodParameter.Value.Value = value; }
+    }
 
     [StorableConstructor]
@@ -46 +68 @@
     protected ExtremePointPermutationDecoder(ExtremePointPermutationDecoder original, Cloner cloner)
       : base(original, cloner) {
+      fittingMethodParameter = cloner.Clone(original.fittingMethodParameter);
+      //_binPacker = cloner.Clone(original._binPacker);
     }
+    public ExtremePointPermutationDecoder() {
+      Parameters.Add(fittingMethodParameter = 
+            new ValueParameter<EnumValue<FittingMethod>>("Fitting Method", 
+                                                         "The fitting method that the decoder uses.", 
+                                                         new EnumValue<FittingMethod>(FittingMethod.FirstFit)));
 
-    /// <summary>
-    /// Creates an extrem point based permutation decoder
-    /// </summary>
-    /// <param name="binPacker">Contains the packing algorithm for packing the items</param>
-    public ExtremePointPermutationDecoder(BinPacker binPacker) : base() {
-      _binPacker = binPacker;
+      Parameters.Add(extremePointCreationMethodParameter =
+            new ValueParameter<EnumValue<ExtremePointCreationMethod>>("Extreme Point Generation Method",
+                                                         "The Extreme point generation method that the decoder uses.",
+                                                         new EnumValue<ExtremePointCreationMethod>(ExtremePointCreationMethod.PointProjection)));
     }
 
@@ -60 +87 @@
     }
 
+    /*[Storable]
     BinPacker _binPacker;
-
+    */
     /// <summary>
     /// Creates a solution for displaying it on the HEAL gui
@@ -70 +98 @@
     /// <param name="useStackingConstraints"></param>
     /// <returns></returns>
-    public Solution Decode(Permutation permutation, PackingShape binShape, IList<PackingItem> items, bool useStackingConstraints) {
+    public Solution Decode(Permutation permutation, PackingShape binShape, IList<PackingItem> items,bool useStackingConstraints) {
+      var binPacker = BinPackerFactory.CreateBinPacker(FittingMethod);
       Solution solution = new Solution(binShape, useExtremePoints: true, stackingConstraints: useStackingConstraints);
-      foreach (var packedBin in _binPacker.PackItems(permutation, binShape, items, useStackingConstraints)) {
+      foreach (var packedBin in binPacker.PackItems(permutation, binShape, items, ExtremePointCreationMethod, useStackingConstraints)) {
         solution.Bins.Add(packedBin);
       }

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Encoding/PermutationProblem.cs

@@ -50 +50 @@
     public PermutationProblem()
       : base() {
-      Decoder = new ExtremePointPermutationDecoder(new BinPackerFirstFit()); // default decoder
+      Decoder = new ExtremePointPermutationDecoder(); // default decoder
 
       Encoding = new Encodings.PermutationEncoding.PermutationEncoding(EncodedSolutionName, Items.Count, PermutationTypes.Absolute);