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

Timestamp:

12/21/10 01:13:49 (13 years ago)

Author:

cneumuel

Message:

#1215

• added possibility to create all parameter combinations from a ParameterConfigurationTree and generate an experiment from them

Location:

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

Files:

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

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

@@ -37 +37 @@
       if (value.Value < this.LowerBound.Value) 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;
+
+      while (value <= UpperBound.Value) {
+        //yield return new DoubleValue(value);
+        solutions.Add(new DoubleValue(value));
+        value += StepSize.Value;
+      }
+      return solutions;
+    }
   }
 }

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

@@ -37 +37 @@
       if (value.Value < this.LowerBound.Value) value.Value = this.LowerBound.Value;
     }
+
+    public override IEnumerable<IntValue> GetCombinations() {
+      var solutions = new List<IntValue>();
+      int value = (this.LowerBound.Value / StepSize.Value) * StepSize.Value;
+      if (value < this.LowerBound.Value) value += StepSize.Value;
+
+      while (value <= this.UpperBound.Value) {
+        //yield return new IntValue(value);
+        solutions.Add(new IntValue(value));
+        value += this.StepSize.Value;
+      }
+      return solutions;
+    }
   }
 }

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

@@ -32 +32 @@
       return new DoubleValueRange(LowerBound, UpperBound, StepSize);
     }
+
+    public override IEnumerable<PercentValue> GetCombinations() {
+      var solutions = new List<PercentValue>();
+      double value = ((int)Math.Round(LowerBound.Value / StepSize.Value, 0)) * StepSize.Value;
+      if (value < LowerBound.Value) value += StepSize.Value;
+
+      while (value <= UpperBound.Value) {
+        //yield return new PercentValue(value);
+        solutions.Add(new PercentValue(value));
+        value += StepSize.Value;
+      }
+      return solutions;
+    }
   }
 }

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

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -206 +208 @@
 
     protected abstract T GetRandomSample(IRandom random);
-
     IItem IRange.GetRandomValue(IRandom random) {
       return GetRandomValue(random);
     }
+
+    public abstract IEnumerable<T> GetCombinations();
+    IEnumerable<IItem> IRange.GetCombinations() {
+      return GetCombinations().Cast<IItem>().ToArray();
+    }
   }
 }