Changeset 5914 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

03/31/11 18:23:02 (14 years ago)

Author:

mkommend

Message:

#1418: Changed DataAnalysisSolutions and -Models and updated GenerateRowsToEvaluate method in SymbolicDataAnalysisEvaluator.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• Evaluators/SymbolicDataAnalysisEvaluator.cs (modified) (2 diffs)
• SymbolicDataAnalysisModel.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators/SymbolicDataAnalysisEvaluator.cs

@@ -90 +90 @@
 
     protected IEnumerable<int> GenerateRowsToEvaluate() {
-      int seed = RandomParameter.ActualValue.Next();
+      return GenerateRowsToEvaluate(RelativeNumberOfEvaluatedSamplesParameter.ActualValue.Value);
+    }
+
+    protected IEnumerable<int> GenerateRowsToEvaluate(double percentageOfRows) {
+
+
+      IEnumerable<int> rows;
       int samplesStart = EvaluationPartitionParameter.ActualValue.Start;
       int samplesEnd = EvaluationPartitionParameter.ActualValue.End;
@@ -97 +103 @@
 
       if (samplesEnd < samplesStart) throw new ArgumentException("Start value is larger than end value.");
-      int count = (int)((samplesEnd - samplesStart) * RelativeNumberOfEvaluatedSamplesParameter.ActualValue.Value);
-      if (count == 0) count = 1;
-      return RandomEnumerable.SampleRandomNumbers(seed, samplesStart, samplesEnd, count)
-        .Where(i => i < testPartitionStart || testPartitionEnd <= i);
+
+      if (percentageOfRows.IsAlmost(1.0))
+        rows = Enumerable.Range(samplesStart, samplesEnd - samplesStart);
+      else {
+        int seed = RandomParameter.ActualValue.Next();
+        int count = (int)((samplesEnd - samplesStart) * percentageOfRows);
+        if (count == 0) count = 1;
+        rows = RandomEnumerable.SampleRandomNumbers(seed, samplesStart, samplesEnd, count);
+      }
+
+      return rows.Where(i => i < testPartitionStart || testPartitionEnd <= i);
     }
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisModel.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
-using System.Linq;
+using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Operators;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Optimization;
-using System;
-using System.Drawing;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {