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

Timestamp:

12/20/17 16:15:38 (7 years ago)

Author:

rhanghof

Message:

#2817:

• Unittests
• Bugfixes on the line projection based extreme point creation method

Location:

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

Files:

• Container3DView.xaml.cs (modified) (3 diffs)
• PackingPlan3DView.cs (modified) (2 diffs)

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

@@ -74 +74 @@
     private Dictionary<int, DiffuseMaterial> materials;
 
-    public ObservableDictionary<BinPacking3D.PackingPosition, ResidualSpace> ResidualSpaces { get; set; }
+    public ObservableDictionary<BinPacking3D.PackingPosition, IList<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, ResidualSpace>();
+      ResidualSpaces = new ObservableDictionary<BinPacking3D.PackingPosition, IList<ResidualSpace>>();
       ExtremePoints = new ObservableCollection<BinPacking3D.PackingPosition>();
       selectedExtremePointIndex = -1;
@@ -240 +240 @@
     private void AddResidualSpacesForExtremePoint(Model3DGroup modelGroup, BinPacking3D.PackingPosition extremePoint) {
       if (showResidualSpaces) {
-        var rs = ResidualSpaces[extremePoint];
-        var containerModel1 = new GeometryModel3D(new MeshGeometry3D(), new DiffuseMaterial(new SolidColorBrush(residualSpaceColor)));
-
-        modelGroup.Children.Add(containerModel1);
-        AddWireframeCube((MeshGeometry3D)containerModel1.Geometry,
-          extremePoint.X,
-          extremePoint.Y,
-          extremePoint.Z,
-          rs.Width,
-          rs.Height,
-          rs.Depth);
-
+        foreach (var rs in ResidualSpaces[extremePoint]) {
+          var containerModel1 = new GeometryModel3D(new MeshGeometry3D(), new DiffuseMaterial(new SolidColorBrush(residualSpaceColor)));
+
+          modelGroup.Children.Add(containerModel1);
+
+          AddWireframeCube((MeshGeometry3D)containerModel1.Geometry,
+            extremePoint.X,
+            extremePoint.Y,
+            extremePoint.Z,
+            rs.Width,
+            rs.Height,
+            rs.Depth);
+        }
       }
+       
     }
 

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

@@ -24 +24 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.BinPacking3D;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Problems.BinPacking.Views {
@@ -75 +76 @@
         itemSelection.Items.Add(item.Key);
       }
-      foreach (var ep in ((BinPacking3D.BinPacking3D)packing).ExtremePoints) {
-        var rs = ((BinPacking3D.BinPacking3D)packing).ResidualSpaces[ep];
+      foreach (var extremPoint in ((BinPacking3D.BinPacking3D)packing).ExtremePoints) {
+        var ep = extremPoint.Key;
         extremePointsSelection.Items.Add($"({ep.X}, {ep.Y}, {ep.Z})");
         packingPlan3D.ExtremePoints.Add(ep);
-        packingPlan3D.ResidualSpaces.Add(ep, rs);
+        packingPlan3D.ResidualSpaces.Add(ep, extremPoint.Value as IList<ResidualSpace>);
       }