Changeset 4054 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs

Timestamp:

07/20/10 14:58:29 (14 years ago)

Author:

mkommend

Message:

improved Analyzers for SymoblicRegressionProblems (ticket #1074)

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs

@@ -236 +236 @@
       }
 
-      int trainingStart = ProblemData.TrainingSamplesStart.Value;
-      int trainingEnd = ProblemData.TrainingSamplesEnd.Value;
-      int testStart = ProblemData.TestSamplesStart.Value;
-      int testEnd = ProblemData.TestSamplesEnd.Value;
-
-      SymbolicRegressionModelQualityAnalyzer.Analyze(scaledTrees, SymbolicExpressionTreeInterpreter,
-        UpperEstimationLimit.Value, LowerEstimationLimit.Value,
-        ProblemData, trainingStart, trainingEnd, testStart, testEnd, Results);
-
-      #region validation best model
       string targetVariable = ProblemData.TargetVariable.Value;
       int validationStart = ValidiationSamplesStart.Value;
@@ -268 +258 @@
       }
 
-
       if (BestSolutionQualityParameter.ActualValue == null || BestSolutionQualityParameter.ActualValue.Value > bestValidationMse) {
         var model = new SymbolicRegressionModel((ISymbolicExpressionTreeInterpreter)SymbolicExpressionTreeInterpreter.Clone(),
@@ -293 +282 @@
       AddValue(validationValues, BestSolutionQualityParameter.ActualValue.Value, BestSolutionQualityParameterName, BestSolutionQualityParameterName);
       AddValue(validationValues, bestValidationMse, CurrentBestValidationQualityParameterName, CurrentBestValidationQualityParameterName);
-      #endregion
       return base.Apply();
     }