Changeset 5759 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer.cs

Timestamp:

03/19/11 02:22:45 (13 years ago)

Author:

mkommend

Message:

#1418:

• Worked on IntRange and DoubleRange
• Updated evaluators, analyzers, problems and problem data to use IntRanges
• Removed properties to access the value of LookupParameter
• Corrected files.txt

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer.cs (modified) (2 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -78 +78 @@
       ISymbolicExpressionTree[] tree = SymbolicExpressionTrees.ToArray();
       double[] quality = new double[tree.Length];
-      var evaluator = Evaluator;
-      int start = ValidationSamplesStart.Value;
-      int end = ValidationSamplesEnd.Value;
-      IEnumerable<int> rows = Enumerable.Range(start, end - start);
+      var evaluator = EvaluatorParameter.ActualValue;
+      int start = ValidationPartitionParameter.ActualValue.Start;
+      int end = ValidationPartitionParameter.ActualValue.End;
+      int count = (int)((end - start) * RelativeNumberOfEvaluatedSamplesParameter.ActualValue.Value);
+      if (count <= 0) return base.Apply();
+
+      IEnumerable<int> rows = RandomEnumerable.SampleRandomNumbers(start, end, count);
       IExecutionContext childContext = (IExecutionContext)ExecutionContext.CreateChildOperation(evaluator);
       for (int i = 0; i < tree.Length; i++) {
-        quality[i] = evaluator.Evaluate(childContext, tree[i], ProblemData, rows);
+        quality[i] = evaluator.Evaluate(childContext, tree[i], ProblemDataParameter.ActualValue, rows);
         if (IsBetter(quality[i], bestQuality, Maximization.Value)) {
           bestQuality = quality[i];