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

Timestamp:

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

Author:

gkronber

Message:

#1966 refactoring

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/RectangularPackingShape.cs (modified) (4 diffs)

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

@@ -34 +34 @@
   [StorableClass]
   public abstract class RectangularPackingShape : PackingShape<TwoDimensionalPacking>, IRegularPackingShape, IComparable<RectangularPackingShape> {
-    #region Properties
     public int Height {
       get { return ((IFixedValueParameter<IntValue>)Parameters["Height"]).Value.Value; }
@@ -45 +44 @@
     }
 
-    #endregion
-
+    [StorableConstructor]
+    protected RectangularPackingShape(bool deserializing) : base(deserializing) { }
+    protected RectangularPackingShape(RectangularPackingShape original, Cloner cloner)
+      : base(original, cloner) {
+    }
     protected RectangularPackingShape()
       : base() {
@@ -57 +59 @@
       this.Width = width;
     }
-
-    [StorableConstructor]
-    protected RectangularPackingShape(bool deserializing) : base(deserializing) { }
-    protected RectangularPackingShape(RectangularPackingShape original, Cloner cloner)
-      : base(original, cloner) {
-    }
-
-    public override void InitializeFromMeasures(int[] measures) {
-      if (measures.Length != 2)
-        throw new InvalidOperationException("Nr of measures does not fit shape-dimension.");
-      this.Width = measures[0];
-      this.Height = measures[1];
-    }
-
-
 
     public override string ToString() {
@@ -94 +81 @@
     #endregion
 
-    public override int[] ToArray() {
-      return new int[] { Width, Height };
-    }
-
-
 
     #region Helpers
     public override TwoDimensionalPacking Origin { get { return new TwoDimensionalPacking(0, 0, 0); } }
-    public override int MultipliedMeasures { get { return Height * Width; } }
+    public override int Volume { get { return Height * Width; } }
 
     public override bool EnclosesPoint(TwoDimensionalPacking myPosition, TwoDimensionalPacking checkedPoint) {