Changeset 5747 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

03/18/11 10:01:00 (14 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.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• Analyzers/SymbolicDataAnalysisMultiObjectiveTrainingBestSolutionAnalyzer.cs (modified) (3 diffs)
• Analyzers/SymbolicDataAnalysisMultiObjectiveValidationAnalyzer.cs (moved) (moved from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisValidationAnalyzer.cs) (2 diffs)
• Analyzers/SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer.cs (modified) (5 diffs)
• Analyzers/SymbolicDataAnalysisSingleObjectiveTrainingBestSolutionAnalyzer.cs (modified) (2 diffs)
• Analyzers/SymbolicDataAnalysisSingleObjectiveValidationAnalyzer.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisValidationAnalyzer.cs) (2 diffs)
• Analyzers/SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)

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

@@ -42 +42 @@
     private const string TrainingBestSolutionsParameterName = "Best training solutions";
     private const string TrainingBestSolutionQualitiesParameterName = "Best training solution qualities";
-    private const string TrainingBestSolutionsResultName = TrainingBestSolutionsParameterName;
-    private const string TrainingBestSolutionQualitiesResultName = TrainingBestSolutionQualitiesParameterName;
 
     #region parameter properties
@@ -79 +77 @@
         TrainingBestSolutions = new ItemList<T>();
         TrainingBestSolutionQualities = new ItemList<DoubleArray>();
-        results.Add(new Result(TrainingBestSolutionQualitiesResultName, TrainingBestSolutionQualities));
-        results.Add(new Result(TrainingBestSolutionsResultName, TrainingBestSolutions));
+        results.Add(new Result(TrainingBestSolutionQualitiesParameter.Name, TrainingBestSolutionQualitiesParameter.Description, TrainingBestSolutionQualities));
+        results.Add(new Result(TrainingBestSolutionsParameter.Name, TrainingBestSolutionsParameter.Description, TrainingBestSolutions));
       }
 
@@ -123 +121 @@
         }
 
-        results[TrainingBestSolutionsResultName].Value = nonDominatedSolutions;
-        results[TrainingBestSolutionQualitiesResultName].Value = nonDominatedQualities;
+        results[TrainingBestSolutionsParameter.Name].Value = nonDominatedSolutions;
+        results[TrainingBestSolutionQualitiesParameter.Name].Value = nonDominatedQualities;
       }
       #endregion

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

@@ -36 +36 @@
   /// </summary>
   [StorableClass]
-  public abstract class SymbolicDataAnalysisValidationAnalyzer<T, U> : SymbolicDataAnalysisAnalyzer,
+  public abstract class SymbolicDataAnalysisMultiObjectiveValidationAnalyzer<T, U> : SymbolicDataAnalysisMultiObjectiveAnalyzer,
     ISymbolicDataAnalysisValidationAnalyzer<T, U>
-    where T : class, ISymbolicDataAnalysisEvaluator<U>
+    where T : class, ISymbolicDataAnalysisMultiObjectiveEvaluator<U>
     where U : class, IDataAnalysisProblemData {
     private const string ProblemDataParameterName = "ProblemData";
@@ -73 +73 @@
 
     [StorableConstructor]
-    protected SymbolicDataAnalysisValidationAnalyzer(bool deserializing) : base(deserializing) { }
-    protected SymbolicDataAnalysisValidationAnalyzer(SymbolicDataAnalysisValidationAnalyzer<T, U> original, Cloner cloner)
+    protected SymbolicDataAnalysisMultiObjectiveValidationAnalyzer(bool deserializing) : base(deserializing) { }
+    protected SymbolicDataAnalysisMultiObjectiveValidationAnalyzer(SymbolicDataAnalysisMultiObjectiveValidationAnalyzer<T, U> original, Cloner cloner)
       : base(original, cloner) {
     }
-    public SymbolicDataAnalysisValidationAnalyzer()
+    public SymbolicDataAnalysisMultiObjectiveValidationAnalyzer()
       : base() {
       Parameters.Add(new LookupParameter<U>(ProblemDataParameterName, "The problem data of the symbolic data analysis problem."));

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

@@ -38 +38 @@
   [Item("SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer", "An operator that analyzes the validation best symbolic data analysis solution for multi objective symbolic data analysis problems.")]
   [StorableClass]
-  public abstract class SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer<S, T, U> : SymbolicDataAnalysisValidationAnalyzer<T, U>,
+  public abstract class SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer<S, T, U> : SymbolicDataAnalysisMultiObjectiveValidationAnalyzer<T, U>,
     ISymbolicDataAnalysisMultiObjectiveAnalyzer
     where S : class, ISymbolicDataAnalysisSolution
     where T : class, ISymbolicDataAnalysisMultiObjectiveEvaluator<U>
     where U : class, IDataAnalysisProblemData {
-    private const string QualitiesParameterName = "Qualities";
-    private const string MaximizationParameterName = "Maximization";
     private const string ValidationBestSolutionsParameterName = "Best validation solutions";
     private const string ValidationBestSolutionQualitiesParameterName = "Best validation solution qualities";
-    private const string ValidationBestSolutionsResultName = ValidationBestSolutionsParameterName;
-    private const string ValidationBestSolutionQualitiesResultName = ValidationBestSolutionQualitiesParameterName;
 
     #region parameter properties
-    public IScopeTreeLookupParameter<DoubleArray> QualitiesParameter {
-      get { return (IScopeTreeLookupParameter<DoubleArray>)Parameters[QualitiesParameterName]; }
-    }
-    public ILookupParameter<BoolArray> MaximizationParameter {
-      get { return (ILookupParameter<BoolArray>)Parameters[MaximizationParameterName]; }
-    }
     public ILookupParameter<ItemList<S>> ValidationBestSolutionsParameter {
       get { return (ILookupParameter<ItemList<S>>)Parameters[ValidationBestSolutionsParameterName]; }
@@ -65 +55 @@
     #endregion
     #region properties
-    public ItemArray<DoubleArray> Qualities {
-      get { return QualitiesParameter.ActualValue; }
-    }
-    public BoolArray Maximization {
-      get { return MaximizationParameter.ActualValue; }
-    }
     public ItemList<S> ValidationBestSolutions {
       get { return ValidationBestSolutionsParameter.ActualValue; }
@@ -86 +70 @@
     public SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer()
       : base() {
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleArray>(QualitiesParameterName, "The qualities of the trees that should be analyzed."));
-      Parameters.Add(new LookupParameter<BoolArray>(MaximizationParameterName, "The directions of optimization for each dimension."));
       Parameters.Add(new LookupParameter<ItemList<S>>(ValidationBestSolutionsParameterName, "The validation best (Pareto-optimal) symbolic data analysis solutions."));
       Parameters.Add(new LookupParameter<ItemList<DoubleArray>>(ValidationBestSolutionQualitiesParameterName, "The qualities of the validation best (Pareto-optimal) solutions."));
@@ -98 +80 @@
         ValidationBestSolutions = new ItemList<S>();
         ValidationBestSolutionQualities = new ItemList<DoubleArray>();
-        results.Add(new Result(ValidationBestSolutionQualitiesResultName, ValidationBestSolutionQualities));
-        results.Add(new Result(ValidationBestSolutionsResultName, ValidationBestSolutions));
+        results.Add(new Result(ValidationBestSolutionQualitiesParameter.Name, ValidationBestSolutionQualitiesParameter.Description, ValidationBestSolutionQualities));
+        results.Add(new Result(ValidationBestSolutionsParameter.Name, ValidationBestSolutionsParameter.Description, ValidationBestSolutions));
       }
 
@@ -148 +130 @@
         }
 
-        results[ValidationBestSolutionsResultName].Value = nonDominatedSolutions;
-        results[ValidationBestSolutionQualitiesResultName].Value = nonDominatedQualities;
+        results[ValidationBestSolutionsParameter.Name].Value = nonDominatedSolutions;
+        results[ValidationBestSolutionQualitiesParameter.Name].Value = nonDominatedQualities;
       }
       #endregion

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

@@ -41 +41 @@
     private const string TrainingBestSolutionParameterName = "Best training solution";
     private const string TrainingBestSolutionQualityParameterName = "Best training solution quality";
-    private const string TrainingBestSolutionResultName = TrainingBestSolutionParameterName;
-    private const string TrainingBestSolutionQualityResultName = TrainingBestSolutionQualityParameterName;
 
     #region parameter properties
@@ -92 +90 @@
         TrainingBestSolutionQuality = new DoubleValue(bestQuality);
 
-        if (!results.ContainsKey(TrainingBestSolutionParameterName)) {
-          results.Add(new Result(TrainingBestSolutionResultName, TrainingBestSolution));
-          results.Add(new Result(TrainingBestSolutionQualityResultName, TrainingBestSolutionQuality));
+        if (!results.ContainsKey(TrainingBestSolutionParameter.Name)) {
+          results.Add(new Result(TrainingBestSolutionParameter.Name, TrainingBestSolutionParameter.Description, TrainingBestSolution));
+          results.Add(new Result(TrainingBestSolutionQualityParameter.Name, TrainingBestSolutionQualityParameter.Description, TrainingBestSolutionQuality));
         } else {
-          results[TrainingBestSolutionResultName].Value = TrainingBestSolution;
-          results[TrainingBestSolutionQualityResultName].Value = TrainingBestSolutionQuality;
+          results[TrainingBestSolutionParameter.Name].Value = TrainingBestSolution;
+          results[TrainingBestSolutionQualityParameter.Name].Value = TrainingBestSolutionQuality;
         }
       }

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

@@ -36 +36 @@
   /// </summary>
   [StorableClass]
-  public abstract class SymbolicDataAnalysisValidationAnalyzer<T, U> : SymbolicDataAnalysisAnalyzer,
+  public abstract class SymbolicDataAnalysisSingleObjectiveValidationAnalyzer<T, U> : SymbolicDataAnalysisSingleObjectiveAnalyzer,
     ISymbolicDataAnalysisValidationAnalyzer<T, U>
-    where T : class, ISymbolicDataAnalysisEvaluator<U>
+    where T : class, ISymbolicDataAnalysisSingleObjectiveEvaluator<U>
     where U : class, IDataAnalysisProblemData {
     private const string ProblemDataParameterName = "ProblemData";
@@ -73 +73 @@
 
     [StorableConstructor]
-    protected SymbolicDataAnalysisValidationAnalyzer(bool deserializing) : base(deserializing) { }
-    protected SymbolicDataAnalysisValidationAnalyzer(SymbolicDataAnalysisValidationAnalyzer<T, U> original, Cloner cloner)
+    protected SymbolicDataAnalysisSingleObjectiveValidationAnalyzer(bool deserializing) : base(deserializing) { }
+    protected SymbolicDataAnalysisSingleObjectiveValidationAnalyzer(SymbolicDataAnalysisSingleObjectiveValidationAnalyzer<T, U> original, Cloner cloner)
       : base(original, cloner) {
     }
-    public SymbolicDataAnalysisValidationAnalyzer()
+    public SymbolicDataAnalysisSingleObjectiveValidationAnalyzer()
       : base() {
       Parameters.Add(new LookupParameter<U>(ProblemDataParameterName, "The problem data of the symbolic data analysis problem."));

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;
         }
       }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -108 +108 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\SymbolicDataAnalysisMultiObjectiveValidationAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectiveValidationAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer.cs" />
-    <Compile Include="Analyzers\SymbolicDataAnalysisValidationAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisMultiObjectiveAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectiveAnalyzer.cs" />