Changeset 13605 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/CuboidPackingShape.cs

Timestamp:

02/08/16 20:42:24 (8 years ago)

Author:

gkronber

Message:

#1966 refactoring

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/CuboidPackingShape.cs (modified) (3 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/CuboidPackingShape.cs

@@ -21 +21 @@
 
 using System;
-using System.Diagnostics;
 using HeuristicLab.Problems.BinPacking.Interfaces;
 using HeuristicLab.Core;
@@ -34 +33 @@
   [StorableClass]
   public abstract class CuboidPackingShape : PackingShape<ThreeDimensionalPacking>, IRegularPackingShape, IComparable<CuboidPackingShape> {
-    #region Properties
+    public IFixedValueParameter<IntValue> HeightParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["Height"]; }
+    }
+    public IFixedValueParameter<IntValue> WidthParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["Width"]; }
+    }
+    public IFixedValueParameter<IntValue> DepthParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["Depth"]; }
+    }
+
     public int Height {
-      get { return ((IFixedValueParameter<IntValue>)Parameters["Height"]).Value.Value; }
-      set { ((IFixedValueParameter<IntValue>)Parameters["Height"]).Value.Value = value; }
+      get { return HeightParameter.Value.Value; }
+      set { HeightParameter.Value.Value = value; }
     }
 
     public int Width {
-      get { return ((IFixedValueParameter<IntValue>)Parameters["Width"]).Value.Value; }
-      set { ((IFixedValueParameter<IntValue>)Parameters["Width"]).Value.Value = value; }
+      get { return WidthParameter.Value.Value; }
+      set { WidthParameter.Value.Value = value; }
     }
 
     public int Depth {
-      get { return ((IFixedValueParameter<IntValue>)Parameters["Depth"]).Value.Value; }
-      set { ((IFixedValueParameter<IntValue>)Parameters["Depth"]).Value.Value = value; }
+      get { return DepthParameter.Value.Value; }
+      set { DepthParameter.Value.Value = value; }
+    }
+
+    [StorableConstructor]
+    protected CuboidPackingShape(bool deserializing) : base(deserializing) { }
+    protected CuboidPackingShape(CuboidPackingShape original, Cloner cloner)
+      : base(original, cloner) {
+      RegisterEvents();
+    }
+    protected CuboidPackingShape()
+      : base() {
+      Parameters.Add(new FixedValueParameter<IntValue>("Width"));
+      Parameters.Add(new FixedValueParameter<IntValue>("Height"));
+      Parameters.Add(new FixedValueParameter<IntValue>("Depth"));
+
+      RegisterEvents();
+    }
+
+    protected CuboidPackingShape(int width, int height, int depth)
+      : this() {
+      this.Width = width;
+      this.Height = height;
+      this.Depth = depth;
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEvents();
+    }
+
+    private void RegisterEvents() {
+      // only because of ToString override
+      HeightParameter.Value.ValueChanged += (sender, args) => OnToStringChanged();
+      WidthParameter.Value.ValueChanged += (sender, args) => OnToStringChanged();
+      DepthParameter.Value.ValueChanged += (sender, args) => OnToStringChanged();
+    }
+
+    public override string ToString() {
+      return String.Format("CuboidPackingShape ({0}, {1}, {2})", this.Width, this.Height, this.Depth);
+    }
+
+    #region IComparable Members
+
+    public int CompareTo(CuboidPackingShape other) {
+      //Using "Clustered-Area-Height"-comparison as descr
+
+      int result = (this.Width * this.Depth).CompareTo(other.Width * other.Depth);
+
+      if (result == 0)
+        result = this.Volume.CompareTo(other.Volume);
+      if (result == 0)
+        result = this.Height.CompareTo(other.Height);
+      return result;
+    }
+
+    public int CompareTo(object obj) {
+      var other = (CuboidPackingShape)obj;
+      if (other != null) return CompareTo(other);
+      else throw new ArgumentException(string.Format("Cannot compare with object {0}", obj), "obj");
     }
 
     #endregion
 
+    private struct CuboidDiagonal {
+      public int x1;
+      public int y1;
+      public int z1;
+      public int x2;
+      public int y2;
+      public int z2;
+      public CuboidDiagonal(CuboidPackingShape myShape) : this(new ThreeDimensionalPacking(0, 0, 0, 0), myShape) { }
+      public CuboidDiagonal(ThreeDimensionalPacking myPosition, CuboidPackingShape myShape) {
+        x1 = myPosition.X;
+        y1 = myPosition.Y;
+        z1 = myPosition.Z;
+        x2 = myPosition.X + (myPosition.Rotated ? myShape.Depth : myShape.Width) - 1;
+        y2 = myPosition.Y + myShape.Height - 1;
+        z2 = myPosition.Z + (myPosition.Rotated ? myShape.Width : myShape.Depth) - 1;
+      }
+    }
+
+
     #region Helpers
     public override ThreeDimensionalPacking Origin { get { return new ThreeDimensionalPacking(0, 0, 0, 0); } }
-    public override int MultipliedMeasures { get { return Width * Height * Depth; } }
+    public override int Volume { get { return Width * Height * Depth; } }
 
     public override bool EnclosesPoint(ThreeDimensionalPacking myPosition, ThreeDimensionalPacking checkedPoint) {
@@ -103 +188 @@
     #endregion
 
-
-
-    public override void InitializeFromMeasures(int[] measures) {
-      if (measures.Length != 3)
-        throw new InvalidOperationException("Nr of measures does not fit shape-dimension.");
-      this.Width = measures[0];
-      this.Height = measures[1];
-      this.Depth = measures[2];
-    }
-    public override int[] ToArray() {
-      return new int[] { Width, Height, Depth };
-    }
-
-
-    protected CuboidPackingShape()
-      : base() {
-      Parameters.Add(new FixedValueParameter<IntValue>("Width"));
-      Parameters.Add(new FixedValueParameter<IntValue>("Height"));
-      Parameters.Add(new FixedValueParameter<IntValue>("Depth"));
-    }
-
-    protected CuboidPackingShape(int width, int height, int depth)
-      : this() {
-      this.Width = width;
-      this.Height = height;
-      this.Depth = depth;
-    }
-
-    [StorableConstructor]
-    protected CuboidPackingShape(bool deserializing) : base(deserializing) { }
-    protected CuboidPackingShape(CuboidPackingShape original, Cloner cloner)
-      : base(original, cloner) {
-    }
-
-    public override string ToString() {
-      return String.Format("CuboidPackingShape ({0}, {1}, {2})", this.Width, this.Height, this.Depth);
-    }
-
-    #region IComparable Members
-
-    public int CompareTo(CuboidPackingShape other) {
-      //Using "Clustered-Area-Height"-comparison as descr
-
-      int result = (this.Width * this.Depth).CompareTo(other.Width * other.Depth);
-
-      if (result == 0)
-        result = this.MultipliedMeasures.CompareTo(other.MultipliedMeasures);
-      if (result == 0)
-        result = this.Height.CompareTo(other.Height);
-      return result;
-    }
-
-    public int CompareTo(object obj) {
-      var other = (CuboidPackingShape)obj;
-      if (other != null) return CompareTo(other);
-      else throw new ArgumentException(string.Format("Cannot compare with object {0}", obj), "obj");
-    }
-
-    #endregion
-
-    private struct CuboidDiagonal {
-      public int x1;
-      public int y1;
-      public int z1;
-      public int x2;
-      public int y2;
-      public int z2;
-      public CuboidDiagonal(CuboidPackingShape myShape) : this(new ThreeDimensionalPacking(0, 0, 0, 0), myShape) { }
-      public CuboidDiagonal(ThreeDimensionalPacking myPosition, CuboidPackingShape myShape) {
-        x1 = myPosition.X;
-        y1 = myPosition.Y;
-        z1 = myPosition.Z;
-        x2 = myPosition.X + (myPosition.Rotated ? myShape.Depth : myShape.Width) - 1;
-        y2 = myPosition.Y + myShape.Height - 1;
-        z2 = myPosition.Z + (myPosition.Rotated ? myShape.Width : myShape.Depth) - 1;
-      }
-    }
   }
 }