Changeset 5337 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints

Timestamp:

01/20/11 01:30:44 (14 years ago)

Author:

cneumuel

Message:

#1215

• made all IAlgorithm types compatible to be loaded into MetaOptimization.
• valid problem types are now automatically set

Location:

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

Files:

• DoubleValueRange.cs (modified) (2 diffs)
• IntValueRange.cs (modified) (1 diff)
• PercentValueRange.cs (modified) (2 diffs)

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

@@ -29 +29 @@
     }
 
-    public void ApplyStepSize(DoubleValue value) {
-      value.Value = ((int)Math.Round(value.Value / this.StepSize.Value, 0)) * this.StepSize.Value;
+    public double ApplyStepSize(double value) {
+      return (Math.Round(value / this.StepSize.Value, 0)) * this.StepSize.Value;
     }
 
@@ -44 +44 @@
         solutions.Add(new DoubleValue(value));
         value += StepSize.Value;
+        value = ApplyStepSize(value);
       }
       return solutions;

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

@@ -29 +29 @@
     }
 
-    public void ApplyStepSize(IntValue value) {
-      value.Value = ((int)Math.Round(value.Value / (double)this.StepSize.Value, 0)) * this.StepSize.Value;
+    public int ApplyStepSize(int value) {
+      return ((int)Math.Round(value / (double)this.StepSize.Value, 0)) * this.StepSize.Value;
     }
 

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

@@ -33 +33 @@
     }
 
-    public void ApplyStepSize(PercentValue value) {
-      value.Value = ((int)Math.Round(value.Value / this.StepSize.Value, 0)) * this.StepSize.Value;
+    public double ApplyStepSize(double value) {
+      return ((int)Math.Round(value / this.StepSize.Value, 0)) * this.StepSize.Value;
     }
 
@@ -48 +48 @@
         solutions.Add(new PercentValue(value));
         value += StepSize.Value;
+        value = ApplyStepSize(value);
       }
       return solutions;