Changeset 5207 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/DoubleValueRange.cs

Timestamp:

01/04/11 02:18:27 (13 years ago)

Author:

cneumuel

Message:

#1215

• lots of memory-consumption improvements
• validValues -> validTypes (this saves memory!)
• changed manipulators; modifications are less significant, out-of-bound-values are resampled instead of set to lower or upper bound
• changed the way a base-level algorithm gets executed -> introduced AlgorithmExecutor

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/DoubleValueRange.cs (modified) (1 diff)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/DoubleValueRange.cs

@@ -25 +25 @@
       do {
         val = Math.Round((random.NextDouble() * (UpperBound.Value - LowerBound.Value) + LowerBound.Value) / StepSize.Value, 0) * StepSize.Value;
-      } while (val < LowerBound.Value || val > UpperBound.Value);
+      } while (!IsInRange(val));
       return new DoubleValue(val);
     }
 
-    public void Fix(DoubleValue value) {
-      // apply stepsize
+    public void ApplyStepSize(DoubleValue value) {
       value.Value = ((int)Math.Round(value.Value / this.StepSize.Value, 0)) * this.StepSize.Value;
+    }
 
-      // repair bounds
-      if (value.Value > this.UpperBound.Value) value.Value = this.UpperBound.Value;
-      if (value.Value < this.LowerBound.Value) value.Value = this.LowerBound.Value;
+    public bool IsInRange(double value) {
+      return value <= this.UpperBound.Value && value >= this.LowerBound.Value;
     }
 
     public override IEnumerable<DoubleValue> GetCombinations() {
       var solutions = new List<DoubleValue>();
-      double value = ((int)Math.Round(LowerBound.Value / StepSize.Value, 0)) * StepSize.Value;
-      if (value < LowerBound.Value) value += StepSize.Value;
+      double value = LowerBound.Value;
 
       while (value <= UpperBound.Value) {