Changeset 15520 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views

Timestamp:

12/13/17 09:47:49 (7 years ago)

Author:

rhanghof

Message:

#2817:

• Changed the calculation algorithm for creating extreme points by using line based projection
• Changed the calculation of the residual spaces for line based projection

Location:

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3

Files:

• Container3DView.xaml.cs (modified) (3 diffs)
• PackingPlan3DView.cs (modified) (1 diff)

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs

@@ -74 +74 @@
     private Dictionary<int, DiffuseMaterial> materials;
 
-    public ObservableDictionary<BinPacking3D.PackingPosition, Tuple<int, int, int>> ResidualSpaces { get; set; }
+    public ObservableDictionary<BinPacking3D.PackingPosition, ResidualSpace> ResidualSpaces { get; set; }
     public ObservableCollection<BinPacking3D.PackingPosition> ExtremePoints { get; set; }
 
@@ -81 +81 @@
       camMain.Position = new Point3D(0.5, 3, 3); // for design time we use a different camera position 
       materials = new Dictionary<int, DiffuseMaterial>();
-      ResidualSpaces = new ObservableDictionary<BinPacking3D.PackingPosition, Tuple<int, int, int>>();
+      ResidualSpaces = new ObservableDictionary<BinPacking3D.PackingPosition, ResidualSpace>();
       ExtremePoints = new ObservableCollection<BinPacking3D.PackingPosition>();
       selectedExtremePointIndex = -1;
@@ -248 +248 @@
           extremePoint.Y,
           extremePoint.Z,
-          rs.Item1,
-          rs.Item2,
-          rs.Item3);
+          rs.Width,
+          rs.Height,
+          rs.Depth);
 
       }

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan3DView.cs

@@ -75 +75 @@
         itemSelection.Items.Add(item.Key);
       }
-      foreach (var ep in packing.ExtremePoints) {
-        var rs = ((BinPacking3D.BinPacking3D)packing).ResidualSpace[ep];
+      foreach (var ep in ((BinPacking3D.BinPacking3D)packing).ExtremePoints) {
+        var rs = ((BinPacking3D.BinPacking3D)packing).ResidualSpaces[ep];
         extremePointsSelection.Items.Add($"({ep.X}, {ep.Y}, {ep.Z})");
         packingPlan3D.ExtremePoints.Add(ep);