Changeset 3790 for trunk/sources

Timestamp:

05/11/10 21:44:55 (14 years ago)

Author:

abeham

Message:

#893

• Updated ValidationBestScaledSymbolicRegressionSolutionAnalyzer to track BestKnownQuality

File:

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

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

@@ -60 +60 @@
     private const string CurrentBestValidationQualityParameterName = "Current best validation quality";
     private const string ResultsParameterName = "Results";
+    private const string BestKnownQualityParameterName = "BestKnownQuality";
 
     public ScopeTreeLookupParameter<SymbolicExpressionTree> SymbolicExpressionTreeParameter {
@@ -90 +91 @@
     public ILookupParameter<ResultCollection> ResultsParameter {
       get { return (ILookupParameter<ResultCollection>)Parameters[ResultsParameterName]; }
+    }
+    public ILookupParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }
     }
 
@@ -111 +115 @@
       Parameters.Add(new LookupParameter<DoubleValue>(BestSolutionQualityParameterName, "The quality of the best symbolic regression solution."));
       Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The result collection where the best symbolic regression solution should be stored."));
+      Parameters.Add(new LookupParameter<DoubleValue>(BestKnownQualityParameterName, "The best known (validation) quality achieved on the data set."));
 
       #region operator initialization
@@ -117 +122 @@
       SymbolicRegressionMeanSquaredErrorEvaluator validationMseEvaluator = new SymbolicRegressionMeanSquaredErrorEvaluator();
       bestSolutionAnalyzer = new BestSymbolicRegressionSolutionAnalyzer();
+      BestQualityMemorizer bestKnownQualityMemorizer = new BestQualityMemorizer();
        bestAvgWorstValidationQualityCalculator = new BestAverageWorstQualityCalculator();
       DataTableValuesCollector validationValuesCollector = new DataTableValuesCollector();
@@ -157 +163 @@
       bestAvgWorstValidationQualityCalculator.WorstQualityParameter.ActualName = "Current worst validation quality";
 
+      bestKnownQualityMemorizer.BestQualityParameter.ActualName = BestKnownQualityParameterName;
+      bestKnownQualityMemorizer.MaximizationParameter.Value = new BoolValue(false);
+      bestKnownQualityMemorizer.QualityParameter.ActualName = CurrentBestValidationQualityParameterName;
+      bestKnownQualityMemorizer.QualityParameter.Depth = 0;
+
       validationValuesCollector.DataTableParameter.ActualName = "Validation quality";
       validationValuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>(CurrentBestValidationQualityParameterName, null, CurrentBestValidationQualityParameterName));
@@ -174 +185 @@
       subScopesProcessor.Successor = bestSolutionAnalyzer;
       bestSolutionAnalyzer.Successor = bestAvgWorstValidationQualityCalculator;
-      bestAvgWorstValidationQualityCalculator.Successor = validationValuesCollector;
+      bestAvgWorstValidationQualityCalculator.Successor = bestKnownQualityMemorizer;
+      bestKnownQualityMemorizer.Successor = validationValuesCollector;
       validationValuesCollector.Successor = resultsCollector;
       resultsCollector.Successor = null;