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

Timestamp:

01/28/16 18:32:54 (8 years ago)

Author:

gkronber

Message:

#1966: changed PackingShapes to ParameterizedItems

File:

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

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

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Common;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Problems.BinPacking.Dimensions;
 
@@ -33 +35 @@
   public abstract class CuboidPackingShape : PackingShape<ThreeDimensionalPacking>, IRegularPackingShape, IComparable<CuboidPackingShape> {
     #region Properties
-    /// <summary>
-    /// Describes the size on the X-axis
-    /// </summary>    
-    [Storable]
-    public int Width { get; set; }
-    /// <summary>
-    /// Describes the size on the Y-axis
-    /// </summary>   
-    [Storable]
-    public int Height { get; set; }
-    /// <summary>
-    /// Describes the size on the Z-axis
-    /// </summary>  
-    [Storable]
-    public int Depth { get; set; }
+    public int Height {
+      get { return ((IFixedValueParameter<IntValue>)Parameters["Height"]).Value.Value; }
+      set { ((IFixedValueParameter<IntValue>)Parameters["Height"]).Value.Value = value; }
+    }
+
+    public int Width {
+      get { return ((IFixedValueParameter<IntValue>)Parameters["Width"]).Value.Value; }
+      set { ((IFixedValueParameter<IntValue>)Parameters["Width"]).Value.Value = value; }
+    }
+
+    public int Depth {
+      get { return ((IFixedValueParameter<IntValue>)Parameters["Depth"]).Value.Value; }
+      set { ((IFixedValueParameter<IntValue>)Parameters["Depth"]).Value.Value = value; }
+    }
+
     #endregion
 
@@ -101 +103 @@
     #endregion
 
-    protected CuboidPackingShape(int width, int height, int depth)
-      : base() {
-      this.Width = width;
-      this.Height = height;
-      this.Depth = depth;
-    }
+
 
     public override void InitializeFromMeasures(int[] measures) {
@@ -119 +116 @@
     }
 
+
+    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) {
-      this.Width = original.Width;
-      this.Height = original.Height;
-      this.Depth = original.Depth;
     }
-
-    protected CuboidPackingShape() : base() { }
 
     public override string ToString() {