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

Timestamp:

03/18/11 10:01:00 (13 years ago)

Author:

gkronber

Message:

#1418 renamed bounded evaluator, added base classes for single objective and multi objective validation analzers, added overfitting analyzers for symbolic regression and classification.

File:

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

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

@@ -37 +37 @@
   [Item("SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer", "An operator that analyzes the validation best symbolic data analysis solution for single objective symbolic data analysis problems.")]
   [StorableClass]
-  public abstract class SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer<S, T, U> : SymbolicDataAnalysisValidationAnalyzer<T, U>,
-    ISymbolicDataAnalysisSingleObjectiveAnalyzer
+  public abstract class SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer<S, T, U> : SymbolicDataAnalysisSingleObjectiveValidationAnalyzer<T, U>
     where S : class, ISymbolicDataAnalysisSolution
     where T : class, ISymbolicDataAnalysisSingleObjectiveEvaluator<U>
     where U : class, IDataAnalysisProblemData {
-    private const string QualityParameterName = "Quality";
-    private const string MaximizationParameterName = "Maximization";
     private const string ValidationBestSolutionParameterName = "Best validation solution";
     private const string ValidationBestSolutionQualityParameterName = "Best validation solution quality";
-    private const string ValidationBestSolutionResultName = ValidationBestSolutionParameterName;
-    private const string ValidationBestSolutionQualityResultName = ValidationBestSolutionQualityParameterName;
 
     #region parameter properties
-    public IScopeTreeLookupParameter<DoubleValue> QualityParameter {
-      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters[QualityParameterName]; }
-    }
-    public ILookupParameter<BoolValue> MaximizationParameter {
-      get { return (ILookupParameter<BoolValue>)Parameters[MaximizationParameterName]; }
-    }
     public ILookupParameter<S> ValidationBestSolutionParameter {
       get { return (ILookupParameter<S>)Parameters[ValidationBestSolutionParameterName]; }
@@ -64 +53 @@
     #endregion
     #region properties
-    public ItemArray<DoubleValue> Quality {
-      get { return QualityParameter.ActualValue; }
-    }
-    public BoolValue Maximization {
-      get { return MaximizationParameter.ActualValue; }
-    }
     public S ValidationBestSolution {
       get { return ValidationBestSolutionParameter.ActualValue; }
@@ -85 +68 @@
     public SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer()
       : base() {
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>(QualityParameterName, "The qualities of the trees that should be analyzed."));
-      Parameters.Add(new LookupParameter<BoolValue>(MaximizationParameterName, "The direction of optimization."));
       Parameters.Add(new LookupParameter<S>(ValidationBestSolutionParameterName, "The validation best symbolic data analyis solution."));
       Parameters.Add(new LookupParameter<DoubleValue>(ValidationBestSolutionQualityParameterName, "The quality of the validation best symbolic data analysis solution."));
@@ -117 +98 @@
         ValidationBestSolutionQuality = new DoubleValue(bestQuality);
 
-        if (!results.ContainsKey(ValidationBestSolutionParameterName)) {
-          results.Add(new Result(ValidationBestSolutionResultName, ValidationBestSolution));
-          results.Add(new Result(ValidationBestSolutionQualityResultName, ValidationBestSolutionQuality));
+        if (!results.ContainsKey(ValidationBestSolutionParameter.Name)) {
+          results.Add(new Result(ValidationBestSolutionParameter.Name, ValidationBestSolutionParameter.Description, ValidationBestSolution));
+          results.Add(new Result(ValidationBestSolutionQualityParameter.Name, ValidationBestSolutionQualityParameter.Description, ValidationBestSolutionQuality));
         } else {
-          results[ValidationBestSolutionResultName].Value = ValidationBestSolution;
-          results[ValidationBestSolutionQualityResultName].Value = ValidationBestSolutionQuality;
+          results[ValidationBestSolutionParameter.Name].Value = ValidationBestSolution;
+          results[ValidationBestSolutionQualityParameter.Name].Value = ValidationBestSolutionQuality;
         }
       }