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

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

@@ -34 +34 @@
   [StorableClass]
   public class CuboidPackingItem : CuboidPackingShape, IPackingItem {
+    public IValueParameter<CuboidPackingBin> TargetBinParameter {
+      get { return (IValueParameter<CuboidPackingBin>)Parameters["TargetBin"]; }
+    }
+    public IFixedValueParameter<DoubleValue> WeightParameter {
+      get { return (IFixedValueParameter<DoubleValue>)Parameters["Weight"]; }
+    }
+    public IFixedValueParameter<IntValue> MaterialParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["Material"]; }
+    }
+
     public CuboidPackingBin TargetBin {
-      get { return ((IValueParameter<CuboidPackingBin>)Parameters["TargetBin"]).Value; }
-      set { ((IValueParameter<CuboidPackingBin>)Parameters["TargetBin"]).Value = value; }
+      get { return TargetBinParameter.Value; }
+      set { TargetBinParameter.Value = value; }
     }
 
     public double Weight {
-      get { return ((IFixedValueParameter<DoubleValue>)Parameters["Weight"]).Value.Value; }
-      set { ((IFixedValueParameter<DoubleValue>)Parameters["Weight"]).Value.Value = value; }
+      get { return WeightParameter.Value.Value; }
+      set { WeightParameter.Value.Value = value; }
     }
 
     public int Material {
-      get { return ((IFixedValueParameter<IntValue>)Parameters["Material"]).Value.Value; }
-      set { ((IFixedValueParameter<IntValue>)Parameters["Material"]).Value.Value = value; }
+      get { return MaterialParameter.Value.Value; }
+      set { MaterialParameter.Value.Value = value; }
     }
 
@@ -57 +67 @@
     protected CuboidPackingItem(CuboidPackingItem original, Cloner cloner)
       : base(original, cloner) {
+      RegisterEvents();
     }
     public CuboidPackingItem()
@@ -63 +74 @@
       Parameters.Add(new FixedValueParameter<DoubleValue>("Weight"));
       Parameters.Add(new FixedValueParameter<IntValue>("Material"));
+
+      RegisterEvents();
     }
 
@@ -83 +96 @@
     }
 
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEvents();
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new CuboidPackingItem(this, cloner);
     }
 
-    public void AddTargetBinMeasures(int[] targetBinMeasures) {
-      TargetBin = new CuboidPackingBin(targetBinMeasures[0], targetBinMeasures[1], targetBinMeasures[2]);
+    private void RegisterEvents() {
+      // only because of ToString override
+      WeightParameter.Value.ValueChanged += (sender, args) => OnToStringChanged();
+      MaterialParameter.Value.ValueChanged += (sender, args) => OnToStringChanged();
+
+      // target bin does not occur in ToString()
     }
 
+
     public override string ToString() {
-      return String.Format("CuboidPackingItem ({0}, {1}, {2}; w={3}, m={4})", this.Width, this.Height, this.Depth, this.Weight, this.Material);
+      return string.Format("CuboidPackingItem ({0}, {1}, {2}; weight={3}, mat={4})", this.Width, this.Height, this.Depth, this.Weight, this.Material);
     }
   }