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

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

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Common;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Problems.BinPacking.PackingBin;
 
@@ -32 +34 @@
   [StorableClass]
   public class CuboidPackingItem : CuboidPackingShape, IPackingItem {
-    [Storable]
-    public CuboidPackingBin TargetBin { get; set; }
+    public CuboidPackingBin TargetBin {
+      get { return ((IValueParameter<CuboidPackingBin>)Parameters["TargetBin"]).Value; }
+      set { ((IValueParameter<CuboidPackingBin>)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 int Material {
+      get { return ((IFixedValueParameter<IntValue>)Parameters["Material"]).Value.Value; }
+      set { ((IFixedValueParameter<IntValue>)Parameters["Material"]).Value.Value = value; }
+    }
 
     public bool SupportsStacking(IPackingItem other) {
@@ -49 +57 @@
     protected CuboidPackingItem(CuboidPackingItem 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 CuboidPackingItem(this, cloner);
     }
     public CuboidPackingItem()
       : base() {
+      Parameters.Add(new ValueParameter<CuboidPackingBin>("TargetBin"));
+      Parameters.Add(new FixedValueParameter<DoubleValue>("Weight"));
+      Parameters.Add(new FixedValueParameter<IntValue>("Material"));
     }
 
     public CuboidPackingItem(int width, int height, int depth, CuboidPackingBin targetBin, double weight, int material)
-      : this(width, height, depth, targetBin) {
+      : this() {
+      this.Width = width;
+      this.Height = height;
+      this.Depth = depth;
       this.Weight = weight;
       this.Material = material;
+      this.TargetBin = (CuboidPackingBin)targetBin.Clone();
     }
 
     public CuboidPackingItem(int width, int height, int depth, CuboidPackingBin targetBin)
-      : base(width, height, depth) {
+      : this() {
+      this.Width = width;
+      this.Height = height;
+      this.Depth = depth;
       this.TargetBin = (CuboidPackingBin)targetBin.Clone();
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CuboidPackingItem(this, cloner);
     }