Changeset 4056 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionEvaluator.cs

Timestamp:

07/20/10 21:46:03 (14 years ago)

Author:

gkronber

Message:

Added new plugins for multi-variate regression. #1089

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionEvaluator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionEvaluator.cs

@@ -141 +141 @@
 
 
-    //algorithm taken from progamming pearls page 127
-    //IMPORTANT because IEnumerables with yield are used the seed must best be specified to return always 
-    //the same sequence of numbers without caching the values.
     private static IEnumerable<int> GenerateRowsToEvaluate(uint seed, double relativeAmount, int start, int end) {
       if (end < start) throw new ArgumentException("Start value is larger than end value.");
       int count = (int)((end - start) * relativeAmount);
       if (count == 0) count = 1;
-
-      int remaining = end - start;
-      MersenneTwister random = new MersenneTwister(seed);
-      for (int i = start; i < end && count > 0; i++) {
-        double probabilty = random.NextDouble();
-        if (probabilty < ((double)count) / remaining) {
-          count--;
-          yield return i;
-        }
-        remaining--;
-      }
+      return RandomEnumerable.SampleRandomNumbers(seed, start, end, count);
     }