Changeset 9440 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlans

Timestamp:

05/04/13 17:51:14 (12 years ago)

Author:

jhelm

Message:

#1966: Implemented new encoding (MultiComponentVector/MCV); Implemented move-operators for MCV and GV encodings; Implemented new decoding-methods for PS, GV and MCV encodings (ExtremePoint-based packing);

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlans

Files:

• PackingPlan2DView.cs (modified) (5 diffs)
• PackingPlan3DView.cs (modified) (5 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlans/PackingPlan2DView.cs

@@ -3 +3 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
-using HeuristicLab.Problems.BinPacking.PackingPlans;
+using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
 using HeuristicLab.Problems.BinPacking.Interfaces;
 using HeuristicLab.Problems.BinPacking.PackingItem;
@@ -13 +13 @@
 namespace HeuristicLab.Problems.BinPacking.Views {
   [View("2-dimensional packing plan View")]
-  [Content(typeof(RegularSimpleRotationPackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem>), true)]
+  [Content(typeof(PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem>), true)]
   public partial class PackingPlan2DView : NamedItemView {
 
@@ -21 +21 @@
 
 
-    public new RegularSimpleRotationPackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> Content {
-      get { return (RegularSimpleRotationPackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem>)base.Content; }
+    public new PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> Content {
+      get { return (PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem>)base.Content; }
       set { base.Content = value; }
     }
@@ -44 +44 @@
     }
 
-    private void Redraw(RegularSimpleRotationPackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> plan) {     
+    private void Redraw(PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> plan) {     
       int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
       var bin = plan.PackingBinMeasures;
@@ -52 +52 @@
         var position = plan.PackingItemPositions[i++];
         if (position.AssignedBin == currentBin)
-          packingPlan2D.AddItemToContainer(item.Width, item.Height, position.X, position.Y, i.ToString());
+          packingPlan2D.AddItemToContainer(
+            position.Rotated ? item.Height : item.Width,
+            position.Rotated ? item.Width : item.Height, 
+            position.X, position.Y, i.ToString());
       }
     }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlans/PackingPlan3DView.cs

@@ -3 +3 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
-using HeuristicLab.Problems.BinPacking.PackingPlans;
+using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
 using HeuristicLab.Problems.BinPacking.Interfaces;
 using HeuristicLab.Problems.BinPacking.PackingItem;
@@ -13 +13 @@
 namespace HeuristicLab.Problems.BinPacking.Views {
   [View("3-dimensional packing plan View")]
-  [Content(typeof(RegularSimpleRotationPackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>), true)]
+  [Content(typeof(PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>), true)]
   public partial class PackingPlan3DView : NamedItemView {
 
@@ -22 +22 @@
 
 
-    public new RegularSimpleRotationPackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> Content {
-      get { return (RegularSimpleRotationPackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>)base.Content; }
+    public new PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> Content {
+      get { return (PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>)base.Content; }
       set { base.Content = value; }
     }
@@ -51 +51 @@
         var position = Content.PackingItemPositions[i];
         if (position.AssignedBin == currentBin) 
-          packingPlan3D.AddItemToContainer(item.Width, item.Height, item.Depth, position.X, position.Y, position.Z, i);
+          packingPlan3D.AddItemToContainer(
+            position.Rotated ? item.Depth : item.Width, 
+            item.Height, 
+            position.Rotated ? item.Width : item.Depth, 
+            position.X, position.Y, position.Z, i);
         i++;
       }
@@ -76 +80 @@
           itemSelection.Items.Add(i);
       }
-      itemSelection.Items.Add("enum");
+      //itemSelection.Items.Add("enum");
 
       packingPlan3D.Invalidate();