Changeset 14170 for stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding

Timestamp:

07/21/16 21:57:36 (9 years ago)

Author:

gkronber

Message:

#2641: merged r14162,r14163,r14167,r14168,r14169 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.BinPacking (copied) (copied from trunk/sources/HeuristicLab.Problems.BinPacking)
• HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/BottomLeftPermutationDecoder.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoder.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/PermutationProblem.cs (modified) (1 diff)

stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/BottomLeftPermutationDecoder.cs

@@ -47 +47 @@
         var bp = new BinPacking3D(binShape);
         bp.SlidingBasedPacking(ref remainingIDs, items);
-        result.BinPackings.Add(bp);
+        result.Bins.Add(bp);
       }
       result.UpdateBinPackings();

stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoder.cs

@@ -47 +47 @@
         var bp = new BinPacking3D(binShape);
         bp.ExtremePointBasedPacking(ref remainingIDs, items, stackingConstraints: useStackingConstraints);
-        result.BinPackings.Add(bp);
+        result.Bins.Add(bp);
       }
       result.UpdateBinPackings();

stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/PermutationProblem.cs

@@ -34 +34 @@
   [Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 320)]
   public sealed class PermutationProblem : ProblemBase<PermutationEncoding, Permutation> {
-    // persistence
     [StorableConstructor]
     private PermutationProblem(bool deserializing) : base(deserializing) { }