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

Timestamp:

07/21/16 21:57:36 (8 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/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs (modified) (3 diffs)
• HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorProblem.cs (modified) (1 diff)

stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs

@@ -60 +60 @@
       Solution partialSolution,
       ref IList<int> remainingIDs, IList<PackingItem> items, bool useStackingConstraints) {
-      var bp = new BinPacking3D(partialSolution.BinMeasures);
+      var bp = new BinPacking3D(partialSolution.BinShape);
       bp.SlidingBasedPacking(ref remainingIDs, items);
       return bp;

stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs

@@ -53 +53 @@
       Solution partialSolution,
       ref IList<int> remainingIDs, IList<PackingItem> items, bool useStackingConstraints) {
-      var bp = new BinPacking3D(partialSolution.BinMeasures);
+      var bp = new BinPacking3D(partialSolution.BinShape);
       bp.ExtremePointBasedPacking(ref remainingIDs, items, useStackingConstraints);
       return bp;

stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs

@@ -47 +47 @@
       foreach (var sequence in sequenceMatrix) {
         remainingIDs = remainingIDs.Concat(sequence).ToList();
-        result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
+        result.Bins.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
       }
       result.UpdateBinPackings();
@@ -54 +54 @@
       var temp = new List<int>(remainingIDs);
       foreach (int id in temp) {
-        foreach (BinPacking3D bp in result.BinPackings) {
+        foreach (BinPacking3D bp in result.Bins) {
           var position = FindPositionForItem(bp, items[id], useStackingConstraints);
           if (position != null) {
@@ -66 +66 @@
       //Put still remaining items in new bins
       while (remainingIDs.Count > 0) {
-        result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
+        result.Bins.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
       }
       result.UpdateBinPackings();

stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorProblem.cs

@@ -35 +35 @@
   [Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 330)]
   public sealed class IntegerVectorProblem : ProblemBase<IntegerVectorEncoding, IntegerVector> {
-    // persistence
     [StorableConstructor]
     private IntegerVectorProblem(bool deserializing) : base(deserializing) { }