Changeset 8535 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/RangeConstraints/Range.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/RangeConstraints/Range.cs (modified) (8 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/RangeConstraints/Range.cs

@@ -38 +38 @@
         if (lowerBound != value) {
           if (lowerBound != null) {
+            lowerBound.ValueChanged -= new EventHandler(lowerBound_ValueChanged);
             lowerBound.ValueChanged -= new EventHandler(lowerBound_ToStringChanged);
           }
           lowerBound = value;
           if (lowerBound != null) {
+            lowerBound.ValueChanged += new EventHandler(lowerBound_ValueChanged);
             lowerBound.ValueChanged += new EventHandler(lowerBound_ToStringChanged);
           }
@@ -56 +58 @@
         if (upperBound != value) {
           if (upperBound != null) {
+            upperBound.ValueChanged -= new EventHandler(upperBound_ValueChanged);
             upperBound.ValueChanged -= new EventHandler(upperBound_ToStringChanged);
           }
           upperBound = value;
           if (upperBound != null) {
+            upperBound.ValueChanged += new EventHandler(upperBound_ValueChanged);
             upperBound.ValueChanged += new EventHandler(upperBound_ToStringChanged);
           }
@@ -74 +78 @@
         if (stepSize != value) {
           if (stepSize != null) {
+            stepSize.ValueChanged -= new EventHandler(stepSize_ValueChanged);
             stepSize.ValueChanged -= new EventHandler(stepSize_ToStringChanged);
           }
           stepSize = value;
           if (stepSize != null) {
+            stepSize.ValueChanged += new EventHandler(stepSize_ValueChanged);
             stepSize.ValueChanged += new EventHandler(stepSize_ToStringChanged);
           }
@@ -101 +107 @@
 
     #region Constructors and Cloning
-    public Range(T lowerBound, T upperBound, T stepSize) {
-      this.LowerBound = lowerBound;
-      this.UpperBound = upperBound;
-      this.StepSize = stepSize;
-    }
-
     [StorableConstructor]
     protected Range(bool deserializing) : base(deserializing) { }
@@ -115 +115 @@
       this.StepSize = cloner.Clone(original.StepSize);
     }
-
+    public Range(T lowerBound, T upperBound, T stepSize)
+      : base() {
+      this.LowerBound = lowerBound;
+      this.UpperBound = upperBound;
+      this.StepSize = stepSize;
+    }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
       if (lowerBound != null) {
+        lowerBound.ValueChanged += new EventHandler(lowerBound_ValueChanged);
         lowerBound.ValueChanged += new EventHandler(lowerBound_ToStringChanged);
       }
       if (upperBound != null) {
+        upperBound.ValueChanged += new EventHandler(upperBound_ValueChanged);
         upperBound.ValueChanged += new EventHandler(upperBound_ToStringChanged);
       }
       if (stepSize != null) {
+        stepSize.ValueChanged += new EventHandler(stepSize_ValueChanged);
         stepSize.ValueChanged += new EventHandler(stepSize_ToStringChanged);
       }
@@ -131 +139 @@
 
     #region Events
+    private void lowerBound_ValueChanged(object sender, EventArgs e) {
+      OnLowerBoundChanged();
+    }
+    private void upperBound_ValueChanged(object sender, EventArgs e) {
+      OnUpperBoundChanged();
+    }
+    private void stepSize_ValueChanged(object sender, EventArgs e) {
+      OnStepSizeChanged();
+    }
     private void lowerBound_ToStringChanged(object sender, EventArgs e) {
       OnToStringChanged();
@@ -189 +206 @@
     }
     public bool Validate(string value, out string errorMessage) {
-      // TODO: check that upper is larger than lower and that stepsize < upper-lower
+      // TODO: check that stepsize < upper - lower
       T lower = (T)lowerBound.Clone();
       T upper = (T)upperBound.Clone();
@@ -206 +223 @@
           upperBound.SetValue(parts2[1]) &&
           stepSize.SetValue(parts1[1])) {
+        if (Comparer<T>.Default.Compare(lowerBound, upperBound) >= 0) {
+          errorMessage = "Invalid bounds. (Lower >= Upper)"; return false;
+        }
         errorMessage = string.Empty; return true;
       } else {