Changeset 8535 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/RangeValueConfiguration.cs

Timestamp:

08/29/12 09:22:21 (12 years ago)

Author:

jkarder

Message:

#1853:

• enhanced combinations count calculation
• restructured code
• minor code improvements
• added license information

File:

• branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/RangeValueConfiguration.cs (modified) (4 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/RangeValueConfiguration.cs

@@ -46 +46 @@
     [StorableConstructor]
     protected RangeValueConfiguration(bool deserializing) : base(deserializing) { }
-    public RangeValueConfiguration() {
-
-    }
     protected RangeValueConfiguration(RangeValueConfiguration original, Cloner cloner)
       : base(original, cloner) {
@@ -54 +51 @@
       RegisterRangeConstraintEvents();
     }
+    public RangeValueConfiguration() : base() { }
     public RangeValueConfiguration(IItem value, Type valueDataType)
       : base(value, valueDataType) {
@@ -68 +66 @@
       }
     }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new RangeValueConfiguration(this, cloner);
-    }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
       RegisterRangeConstraintEvents();
     }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RangeValueConfiguration(this, cloner);
+    }
     #endregion
 
     private void RegisterRangeConstraintEvents() {
-      if (this.RangeConstraint != null) this.RangeConstraint.ToStringChanged += new EventHandler(RangeConstraint_ToStringChanged);
+      if (this.RangeConstraint != null) {
+        this.RangeConstraint.ToStringChanged += new EventHandler(RangeConstraint_ToStringChanged);
+        this.RangeConstraint.LowerBoundChanged += new EventHandler(RangeConstraintParametersChanged);
+        this.RangeConstraint.UpperBoundChanged += new EventHandler(RangeConstraintParametersChanged);
+        this.RangeConstraint.StepSizeChanged += new EventHandler(RangeConstraintParametersChanged);
+      }
     }
+
     private void DeregisterRangeConstraintEvents() {
-      if (this.RangeConstraint != null) this.RangeConstraint.ToStringChanged -= new EventHandler(RangeConstraint_ToStringChanged);
+      if (this.RangeConstraint != null) {
+        this.RangeConstraint.ToStringChanged -= new EventHandler(RangeConstraint_ToStringChanged);
+        this.RangeConstraint.LowerBoundChanged -= new EventHandler(RangeConstraintParametersChanged);
+        this.RangeConstraint.UpperBoundChanged -= new EventHandler(RangeConstraintParametersChanged);
+        this.RangeConstraint.StepSizeChanged -= new EventHandler(RangeConstraintParametersChanged);
+      }
     }
 
@@ -119 +128 @@
       OnToStringChanged();
     }
+    private void RangeConstraintParametersChanged(object sender, EventArgs e) {
+      OnCombinationsCountChanged();
+    }
     #endregion
   }