Changeset 14976 for branches

Timestamp:

05/12/17 14:10:55 (7 years ago)

Author:

dsouravl

Message:

#2762: worked on best fit heuristics

Location:

branches/BinPackingExtension

Files:

• HeuristicLab.Problems.BinPacking.Views/3.3/BinPacking3DProblemView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking.Views/3.3/BinPacking3DProblemView.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking/3.3/2D/BinPacking2D.cs (modified) (2 diffs)
• HeuristicLab.Problems.BinPacking/3.3/3D/BestFitHeuristic.cs (deleted)
• HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs (modified) (13 diffs)
• HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoder.cs (modified) (3 diffs)
• HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoderBase.cs (added)
• HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/FreeVolumeBestFitExtremePointPermutationDecoder.cs (added)
• HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ResidualSpaceBestFitExtremePointPermutationDecoder.cs (added)
• HeuristicLab.Problems.BinPacking/3.3/3D/ProblemBase.cs (modified) (2 diffs)
• HeuristicLab.Problems.BinPacking/3.3/BinPacking.cs (modified) (5 diffs)
• HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj (modified) (2 diffs)

branches/BinPackingExtension/HeuristicLab.Problems.BinPacking.Views/3.3/BinPacking3DProblemView.Designer.cs

@@ -128 +128 @@
             this.heuristicComboBox.Size = new System.Drawing.Size(208, 21);
             this.heuristicComboBox.TabIndex = 20;
-            this.heuristicComboBox.SelectedIndexChanged += new System.EventHandler(this.heuristicComboBox_SelectedIndexChanged);
+            //this.heuristicComboBox.SelectedIndexChanged += new System.EventHandler(this.heuristicComboBox_SelectedIndexChanged);
             // 
             // BinPacking3DProblemView

branches/BinPackingExtension/HeuristicLab.Problems.BinPacking.Views/3.3/BinPacking3DProblemView.cs

@@ -34 +34 @@
       }
 
-      private void heuristicComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      /*private void heuristicComboBox_SelectedIndexChanged(object sender, EventArgs e) {
         if (Content == null) return;
         if (heuristicComboBox.SelectedItem.ToString().CompareTo("Best Fit (Free Volume)") == 0) {
-          
         }
-      }
+      }*/
 
       private void sortingComboBox_SelectedIndexChanged(object sender, EventArgs e) {

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

@@ -147 +147 @@
       }
     }
+    public override bool ExtremePointBasedPacking(int itemID, IList<PackingItem> items, bool stackingConstraints) {
+      var item = items[itemID];
+      var positionFound = FindExtremePointForItem(item, false, stackingConstraints);
+      if (positionFound != null) {
+        PackItem(itemID, item, positionFound);
+        return true;
+      }
+      return false;
+    }
+    
     public override void ExtremePointBasedPacking(ref IList<int> sequence, IList<PackingItem> items, bool stackingConstraints, Dictionary<int, bool> rotationArray) {
       var temp = new List<int>(sequence);
@@ -183 +193 @@
       throw new NotSupportedException();
     }
-
     protected override void InitializeOccupationLayers() {
       for (int i = 0; i * 10 <= BinShape.Width; i += 1) {

branches/BinPackingExtension/HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -35 +36 @@
       : base(binShape) {
       ExtremePoints = new SortedSet<PackingPosition>();
-      ExtremePoints.Add(binShape.Origin);
+      ResidualSpace = new Dictionary<PackingPosition, Tuple<int,int,int>>();
+      AddExtremePoint(binShape.Origin);
       InitializeOccupationLayers();
     }
@@ -43 +45 @@
       : base(original, cloner) {
       this.ExtremePoints = new SortedSet<PackingPosition>(original.ExtremePoints.Select(p => cloner.Clone(p)));
+      this.ResidualSpace = new Dictionary<PackingPosition, Tuple<int, int, int>>();
+      foreach (var o in original.ResidualSpace)
+        this.ResidualSpace.Add(cloner.Clone(o.Key), Tuple.Create(o.Value.Item1, o.Value.Item2, o.Value.Item3));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -60 +65 @@
           current = PackingPosition.MoveDown(current);
         }
-        ExtremePoints.Add((PackingPosition)current.Clone());
+        AddExtremePoint((PackingPosition)current.Clone());
         while (current.X > 0 && !IsPointOccupied(PackingPosition.MoveLeft(current))) {
           current = PackingPosition.MoveLeft(current);
         }
-        ExtremePoints.Add(current);
+        AddExtremePoint(current);
 
         //Traversing down the z-axis
@@ -71 +76 @@
           current = PackingPosition.MoveBack(current);
         }
-        ExtremePoints.Add((PackingPosition)current.Clone());
-        while (current.Y > 0 && !IsPointOccupied(PackingPosition.MoveDown(current))) {
-          current = PackingPosition.MoveDown(current);
-        }
-        ExtremePoints.Add(current);
+        AddExtremePoint((PackingPosition)current.Clone());
+        while (current.Y > 0 && !IsPointOccupied(PackingPosition.MoveDown(current))) {
+          current = PackingPosition.MoveDown(current);
+        }
+        AddExtremePoint(current);
       }
 
@@ -86 +91 @@
           current = PackingPosition.MoveLeft(current);
         }
-        ExtremePoints.Add((PackingPosition)current.Clone());
-        while (current.Y > 0 && !IsPointOccupied(PackingPosition.MoveDown(current))) {
-          current = PackingPosition.MoveDown(current);
-        }
-        ExtremePoints.Add(current);
+        AddExtremePoint((PackingPosition)current.Clone());
+        while (current.Y > 0 && !IsPointOccupied(PackingPosition.MoveDown(current))) {
+          current = PackingPosition.MoveDown(current);
+        }
+        AddExtremePoint(current);
 
         //Traversing down the z-axis
@@ -97 +102 @@
           current = PackingPosition.MoveBack(current);
         }
-        ExtremePoints.Add((PackingPosition)current.Clone());
-        while (current.Y > 0 && !IsPointOccupied(PackingPosition.MoveDown(current))) {
-          current = PackingPosition.MoveDown(current);
-        }
-        ExtremePoints.Add(current);
+        AddExtremePoint((PackingPosition)current.Clone());
+        while (current.Y > 0 && !IsPointOccupied(PackingPosition.MoveDown(current))) {
+          current = PackingPosition.MoveDown(current);
+        }
+        AddExtremePoint(current);
       }
 
@@ -112 +117 @@
           current = PackingPosition.MoveLeft(current);
         }
-        ExtremePoints.Add((PackingPosition)current.Clone());
-        while (current.Y > 0 && !IsPointOccupied(PackingPosition.MoveDown(current))) {
-          current = PackingPosition.MoveDown(current);
-        }
-        ExtremePoints.Add(current);
+        AddExtremePoint((PackingPosition)current.Clone());
+        while (current.Y > 0 && !IsPointOccupied(PackingPosition.MoveDown(current))) {
+          current = PackingPosition.MoveDown(current);
+        }
+        AddExtremePoint(current);
 
         //Traversing down the y-axis
@@ -123 +128 @@
           current = PackingPosition.MoveDown(current);
         }
-        ExtremePoints.Add((PackingPosition)current.Clone());
+        AddExtremePoint((PackingPosition)current.Clone());
         while (current.X > 0 && !IsPointOccupied(PackingPosition.MoveLeft(current))) {
           current = PackingPosition.MoveLeft(current);
         }
-        ExtremePoints.Add(current);
+        AddExtremePoint(current);
+      }
+    }
+
+    private void AddExtremePoint(PackingPosition current) {
+      if (ExtremePoints.Add(current)) {
+        var tuple = Tuple.Create(BinShape.Width - current.X, BinShape.Height - current.Y, BinShape.Depth - current.Z);
+        ResidualSpace.Add(current, tuple);
       }
     }
@@ -137 +149 @@
         item.Height,
         rotated ? item.Width : item.Depth,
-        item.TargetBin);
+        item.TargetBin, item.Weight, item.Material);
 
       int epIndex = 0;
@@ -212 +224 @@
         if (positionFound != null) {
           PackItem(itemID, item, positionFound);
+          if (!(positionFound.X == 0 && positionFound.Y == 0 && positionFound.Z == 0)) {
+            UpdateResidualSpace(item, positionFound);
+          }
           sequence.Remove(itemID);
         }
       }
+    }
+    public override bool ExtremePointBasedPacking(int itemID, IList<PackingItem> items, bool stackingConstraints) {
+      var item = items[itemID];
+      var positionFound = FindExtremePointForItem(item, false, stackingConstraints);
+      if (positionFound != null) {
+       PackItem(itemID, item, positionFound);
+       return true;
+      }
+      return false;
     }
     public override void ExtremePointBasedPacking(ref IList<int> sequence, IList<PackingItem> items, bool stackingConstraints, Dictionary<int, bool> rotationArray) {
@@ -227 +251 @@
       }
     }
-
     public override int ShortestPossibleSideFromPoint(PackingPosition position) {
 
@@ -320 +343 @@
       for (int i = z1; i <= z2; i++)
         result.AddRange(OccupationLayers[i]);
-
       return result;
     }
+    
+    public void UpdateResidualSpace(PackingItem item, PackingPosition pos) {
+      foreach (var ep in ExtremePoints) {
+        if (ep.Z >= pos.Z && ep.Z <= pos.Z + item.Depth) {
+          if (ep.X <= pos.X && ep.Y >= pos.Y && ep.Y <= pos.Y + item.Height) {
+            var diff = pos.X - ep.X;
+            var newRSX = ResidualSpace[ep].Item1 < diff ? ResidualSpace[ep].Item1 : diff;
+            ResidualSpace[ep] = Tuple.Create(newRSX, ResidualSpace[ep].Item2, ResidualSpace[ep].Item3);
+          }
+          if (ep.Y <= pos.Y && ep.X >= pos.X && ep.X <= pos.X + item.Width) {
+            var diff = pos.Y - ep.Y;
+            var newRSY = ResidualSpace[ep].Item2 < diff ? ResidualSpace[ep].Item2 : diff;
+            ResidualSpace[ep] = Tuple.Create(ResidualSpace[ep].Item1, newRSY, ResidualSpace[ep].Item3);
+          }
+        }
+        if (ep.Z <= pos.Z && 
+          ep.Y >= pos.Y && ep.Y <= pos.Y + item.Height &&
+          ep.X >= pos.X && ep.X <= pos.X + item.Width) {
+            var diff = pos.Z - ep.Z;
+            var newRSZ = ResidualSpace[ep].Item3 < diff ? ResidualSpace[ep].Item3 : diff;
+            ResidualSpace[ep] = Tuple.Create(ResidualSpace[ep].Item1, ResidualSpace[ep].Item2, newRSZ);
+        }
+      }
+      return;
+    }
+    public int GetResidualSpace(PackingItem item, PackingPosition ep) {
+      return ((ResidualSpace[ep].Item1 - item.Width) +
+          (ResidualSpace[ep].Item2 - item.Height) +
+          (ResidualSpace[ep].Item3 - item.Depth));
+      }
+    }
   }
-
-}

branches/BinPackingExtension/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoder.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -25 +26 @@
 using System.Collections.Generic;
 using HeuristicLab.Encodings.PermutationEncoding;
+using System.Linq;
+
 
 namespace HeuristicLab.Problems.BinPacking3D {
   [Item("Extreme-point Permutation Decoder (3d)", "Decodes the permutation and creates a packing solution candidate")]
   [StorableClass]
-  public class ExtremePointPermutationDecoder : Item, IDecoder<Permutation> {
+  public class ExtremePointPermutationDecoder : ExtremePointPermutationDecoderBase {
 
     [StorableConstructor]
@@ -41 +44 @@
     }
 
-    public Solution Decode(Permutation permutation, PackingShape binShape, IList<PackingItem> items, bool useStackingConstraints) {
+    public override Solution Decode(Permutation permutation, PackingShape binShape, IList<PackingItem> items, bool useStackingConstraints) {
       Solution result = new Solution(binShape, useExtremePoints: true, stackingConstraints: useStackingConstraints);
       IList<int> remainingIDs = new List<int>(permutation);

branches/BinPackingExtension/HeuristicLab.Problems.BinPacking/3.3/3D/ProblemBase.cs

@@ -175 +175 @@
     public override bool Maximization { get { return true; } }
 
-
     public override double Evaluate(Individual individual, IRandom random) {
       var encodedSolutionCand = (TSol)individual[EncodedSolutionName];
@@ -237 +236 @@
       BinShape = data.BinShape;
       var items = new ItemList<PackingItem>(data.Items);
-      items.Sort((x, y) => y.CompareTo(x));
       Items = items.AsReadOnly();
 

branches/BinPackingExtension/HeuristicLab.Problems.BinPacking/3.3/BinPacking.cs

@@ -51 +51 @@
     protected Dictionary<int, List<int>> OccupationLayers { get; set; }
 
+    [Storable]
+    public Dictionary<TPos, Tuple<int,int,int>> ResidualSpace { get; protected set; }
+
     #endregion Properties
 
@@ -64 +67 @@
       OccupationLayers = new Dictionary<int, List<int>>();
     }
-
 
     [StorableConstructor]
@@ -93 +95 @@
     public abstract void SlidingBasedPacking(ref IList<int> sequence, IList<TItem> items, Dictionary<int, bool> rotationArray);
     public abstract void ExtremePointBasedPacking(ref IList<int> sequence, IList<TItem> items, bool stackingConstraints);
+    public abstract bool ExtremePointBasedPacking(int ID, IList<TItem> items, bool stackingConstraints);
     public abstract void ExtremePointBasedPacking(ref IList<int> sequence, IList<TItem> items, bool stackingConstraints, Dictionary<int, bool> rotationArray);
 
@@ -99 +102 @@
       Positions[itemID] = position;
       ExtremePoints.Remove(position);
+      if (ResidualSpace != null) ResidualSpace.Remove(position);
       foreach (int id in Items.Select(x => x.Key))
         GenerateNewExtremePointsForNewItem(Items[id], Positions[id]);
-
+      
       AddNewItemToOccupationLayers(itemID, item, position);
     }
@@ -146 +150 @@
     public abstract bool IsStaticStable(TItem measures, TPos position);
 
-
     protected abstract void InitializeOccupationLayers();
     protected abstract void AddNewItemToOccupationLayers(int itemID, TItem item, TPos position);

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

@@ -155 +155 @@
     <Compile Include="2D\ProblemBase.cs" />
     <Compile Include="2D\Solution.cs" />
-    <Compile Include="3D\BestFitHeuristic.cs" />
     <Compile Include="3D\BinPacking3D.cs" />
     <Compile Include="3D\Evaluators\BinUtilizationEvaluator.cs" />
@@ -177 +176 @@
     <Compile Include="3D\PackingShape.cs" />
     <Compile Include="3D\PermutationEncoding\BottomLeftPermutationDecoder.cs" />
+    <Compile Include="3D\PermutationEncoding\ResidualSpaceBestFitExtremePointPermutationDecoder.cs" />
+    <Compile Include="3D\PermutationEncoding\FreeVolumeBestFitExtremePointPermutationDecoder.cs" />
+    <Compile Include="3D\PermutationEncoding\ExtremePointPermutationDecoderBase.cs" />
     <Compile Include="3D\PermutationEncoding\ExtremePointPermutationDecoder.cs" />
     <Compile Include="3D\PermutationEncoding\PermutationProblem.cs" />