Changeset 11348 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ValueGenerator.cs

Timestamp:

09/06/14 00:38:34 (10 years ago)

Author:

bburlacu

Message:

#2236: GenerateSteps: added the ability to generate sequences on negative or decreasing intervals.

File:

• trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ValueGenerator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ValueGenerator.cs

@@ -38 +38 @@
     /// <returns>An sequence of values from start to end (inclusive)</returns>
     public static IEnumerable<double> GenerateSteps(double start, double end, double stepWidth) {
-      if (start > end) throw new ArgumentException("start must be less than or equal end.");
-      if (stepWidth <= 0) throw new ArgumentException("stepwith must be larger than zero.", "stepWidth");
+      if (stepWidth.IsAlmost(0))
+        throw new ArgumentException("The step width cannot be zero.");
+      if (start < end && stepWidth < 0)
+        throw new ArgumentException("The step width must be larger than zero for increasing sequences (start < end).");
+      if (start > end && stepWidth > 0)
+        throw new ArgumentException("The step width must be smaller than zero for decreasing sequences (start > end).");
       double x = start;
       // x<=end could skip the last value because of numerical problems
@@ -68 +72 @@
     /// <returns></returns>
     public static IEnumerable<double> GenerateSteps(double start, double end, double stepWidth, Func<double, double> transform) {
-      return GenerateSteps(start, end, stepWidth).Select(transform).Where(x => x < end || x.IsAlmost(end));
+      return GenerateSteps(start, end, stepWidth).Select(transform);
     }