Changeset 13574 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingItem/RectangularPackingItem.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/PackingItem/RectangularPackingItem.cs (modified) (3 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingItem/RectangularPackingItem.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Problems.BinPacking.PackingBin;
 
@@ -33 +35 @@
   public class RectangularPackingItem : RectangularPackingShape, IPackingItem {
 
-    [Storable]
-    public RectangularPackingBin TargetBin { get; set; }
+    public RectangularPackingBin TargetBin {
+      get { return ((IValueParameter<RectangularPackingBin>)Parameters["TargetBin"]).Value; }
+      set { ((IValueParameter<RectangularPackingBin>)Parameters["TargetBin"]).Value = value; }
+    }
 
-    [Storable]
-    public double Weight { get; set; }
+    public double Weight {
+      get { return ((IFixedValueParameter<DoubleValue>)Parameters["Weight"]).Value.Value; }
+      set { ((IFixedValueParameter<DoubleValue>)Parameters["Weight"]).Value.Value = value; }
+    }
 
-    [Storable]
-    public int Material { get; set; }
-
-    public bool SupportsStacking(IPackingItem other) {
-      return ((other.Material < this.Material) || (other.Material.Equals(this.Material) && other.Weight <= this.Weight));
+    public int Material {
+      get { return ((IFixedValueParameter<IntValue>)Parameters["Material"]).Value.Value; }
+      set { ((IFixedValueParameter<IntValue>)Parameters["Material"]).Value.Value = value; }
     }
 
@@ -50 +54 @@
     protected RectangularPackingItem(RectangularPackingItem original, Cloner cloner)
       : base(original, cloner) {
-      this.Weight = original.Weight;
-      this.Material = original.Material;
-      this.TargetBin = cloner.Clone(TargetBin);
     }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new RectangularPackingItem(this, cloner);
     }
+
     public RectangularPackingItem()
       : base() {
+      Parameters.Add(new ValueParameter<RectangularPackingBin>("TargetBin"));
+      Parameters.Add(new FixedValueParameter<DoubleValue>("Weight"));
+      Parameters.Add(new FixedValueParameter<IntValue>("Material"));
     }
 
     public RectangularPackingItem(int width, int height, RectangularPackingBin targetBin)
-      : base(width, height) {
+      : this() {
+      this.Weight = width;
+      this.Height = height;
       this.TargetBin = (RectangularPackingBin)targetBin.Clone();
+    }
+
+    public bool SupportsStacking(IPackingItem other) {
+      return ((other.Material < this.Material) || (other.Material.Equals(this.Material) && other.Weight <= this.Weight));
     }