Changeset 3651 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression

Timestamp:

05/05/10 19:50:46 (15 years ago)

Author:

gkronber

Message:

Implemented analyzers for symbolic expression tree encoding, artificial ant problem and symbolic regression problem. #999 (Refactor algorithm analysis and tracing)

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3

Files:

• HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj (modified) (1 diff)
• HeuristicLabProblemsDataAnalysisRegressionPlugin.cs.frame (modified) (2 diffs)
• Symbolic/Analyzers (added)
• Symbolic/Analyzers/ISymbolicRegressionSolutionPopulationAnalyzer.cs (added)
• Symbolic/Analyzers/PopulationBestSymbolicRegressionSolutionAnalyzer.cs (added)
• Symbolic/Analyzers/PopulationSymbolicRegressionVariableFrequencyAnalyzer.cs (added)
• Symbolic/Analyzers/PopulationValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs (added)
• Symbolic/Analyzers/SymbolicRegressionSolutionLinearScaler.cs (added)
• Symbolic/BestValidationSymbolicRegressionSolutionVisualizer.cs (deleted)
• Symbolic/SymbolicRegressionProblem.cs (modified) (9 diffs)
• Symbolic/SymbolicRegressionProblemView.Designer.cs (deleted)
• Symbolic/SymbolicRegressionProblemView.cs (deleted)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj

@@ -86 +86 @@
     <Compile Include="HeuristicLabProblemsDataAnalysisRegressionPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Symbolic\BestValidationSymbolicRegressionSolutionVisualizer.cs" />
+    <Compile Include="Symbolic\Analyzers\PopulationSymbolicRegressionVariableFrequencyAnalyzer.cs" />
+    <Compile Include="Symbolic\Analyzers\PopulationValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs" />
+    <Compile Include="Symbolic\Analyzers\SymbolicRegressionSolutionLinearScaler.cs" />
+    <Compile Include="Symbolic\Analyzers\ISymbolicRegressionSolutionPopulationAnalyzer.cs" />
+    <Compile Include="Symbolic\Analyzers\PopulationBestSymbolicRegressionSolutionAnalyzer.cs" />
     <Compile Include="Symbolic\SymbolicRegressionScaledMeanSquaredErrorEvaluator.cs" />
     <Compile Include="Symbolic\SymbolicRegressionSolution.cs" />

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLabProblemsDataAnalysisRegressionPlugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.Problems.DataAnalysis.Regression","3.3.0.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Analysis", "3.3.0.0")]
   [PluginDependency("HeuristicLab.Collections", "3.3.0.0")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
@@ -38 +39 @@
   [PluginDependency("HeuristicLab.Parameters", "3.3.0.0")]
   [PluginDependency("HeuristicLab.Persistence", "3.3.0.0")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.3.0.0")]
+  [PluginDependency("HeuristicLab.Random", "3.3.0.0")]  
   public class HeuristicLabProblemsDataAnalysisRegressionPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs

@@ -39 +39 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Creators;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Interfaces;
+using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Analyzers;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Analyzers;
 
 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
@@ -150 +152 @@
       get { return BestKnownQualityParameter.Value; }
     }
-    private List<ISymbolicExpressionTreeOperator> operators;
+    private List<IOperator> operators;
     public IEnumerable<IOperator> Operators {
-      get { return operators.Cast<IOperator>(); }
+      get { return operators; }
+    }
+    public IEnumerable<ISymbolicRegressionSolutionPopulationAnalyzer> Analyzers {
+      get { return operators.OfType<ISymbolicRegressionSolutionPopulationAnalyzer>(); }
     }
     public DoubleValue PunishmentFactor {
@@ -180 +185 @@
       var grammar = new ArithmeticExpressionGrammar();
       var globalGrammar = new GlobalSymbolicExpressionGrammar(grammar);
-      var visualizer = new BestValidationSymbolicRegressionSolutionVisualizer();
       var interpreter = new SimpleArithmeticExpressionInterpreter();
       Parameters.Add(new ValueParameter<BoolValue>("Maximization", "Set to false as the error of the regression model should be minimized.", (BoolValue)new BoolValue(false).AsReadOnly()));
@@ -200 +204 @@
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
 
       UpdateGrammar();
@@ -240 +243 @@
       // paritions could be changed
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
       // input variables could have been changed
       UpdateGrammar();
@@ -260 +263 @@
     protected virtual void OnSolutionParameterNameChanged(EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
     }
@@ -267 +270 @@
       Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       ParameterizeEvaluator();
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
       RaiseEvaluatorChanged(e);
     }
     protected virtual void OnQualityParameterNameChanged(EventArgs e) {
-      ParameterizeVisualizer();
+      ParameterizeAnalyzers();
     }
     #endregion
@@ -345 +348 @@
 
     private void InitializeOperators() {
-      operators = new List<ISymbolicExpressionTreeOperator>();
-      operators.AddRange(ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeOperator>());
+      operators = new List<IOperator>();
+      operators.AddRange(ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeOperator>().OfType<IOperator>());
+      operators.Add(new PopulationValidationBestScaledSymbolicRegressionSolutionAnalyzer());
+      operators.Add(new PopulationMinAvgMaxTreeSizeAnalyzer());
+      operators.Add(new PopulationSymbolicRegressionVariableFrequencyAnalyzer());
       ParameterizeOperators();
+      ParameterizeAnalyzers();
     }
 
@@ -365 +372 @@
     }
 
-    private void ParameterizeVisualizer() {
-      //var solutionVisualizer = Visualizer as BestValidationSymbolicRegressionSolutionVisualizer;
-      //if (solutionVisualizer != null) {
-      //  solutionVisualizer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-      //  solutionVisualizer.DataAnalysisProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
-      //  solutionVisualizer.UpperEstimationLimitParameter.ActualName = UpperEstimationLimitParameter.Name;
-      //  solutionVisualizer.LowerEstimationLimitParameter.ActualName = LowerEstimationLimitParameter.Name;
-      //  solutionVisualizer.QualityParameter.ActualName = Evaluator.QualityParameter.Name;
-      //  solutionVisualizer.SymbolicExpressionTreeInterpreterParameter.ActualName = SymbolicExpressionTreeInterpreterParameter.Name;
-      //  solutionVisualizer.ValidationSamplesStartParameter.Value = ValidationSamplesStart;
-      //  solutionVisualizer.ValidationSamplesEndParameter.Value = ValidationSamplesEnd;
-      //}
+    private void ParameterizeAnalyzers() {
+      foreach (var analyzer in Analyzers) {
+        analyzer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+        var bestValidationSolutionAnalyzer = analyzer as PopulationValidationBestScaledSymbolicRegressionSolutionAnalyzer;
+        if (bestValidationSolutionAnalyzer != null) {
+          bestValidationSolutionAnalyzer.ProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
+          bestValidationSolutionAnalyzer.UpperEstimationLimitParameter.ActualName = UpperEstimationLimitParameter.Name;
+          bestValidationSolutionAnalyzer.LowerEstimationLimitParameter.ActualName = LowerEstimationLimitParameter.Name;
+          bestValidationSolutionAnalyzer.SymbolicExpressionTreeInterpreterParameter.ActualName = SymbolicExpressionTreeInterpreterParameter.Name;
+          bestValidationSolutionAnalyzer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+          bestValidationSolutionAnalyzer.SamplesStartParameter.Value = ValidationSamplesStart;
+          bestValidationSolutionAnalyzer.SamplesEndParameter.Value = ValidationSamplesEnd;
+        }
+        var varFreqAnalyzer = analyzer as PopulationSymbolicRegressionVariableFrequencyAnalyzer;
+        if (varFreqAnalyzer != null) {
+          varFreqAnalyzer.ProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
+        }
+      }
+      foreach (ISymbolicExpressionTreePopulationAnalyzer analyzer in Operators.OfType<ISymbolicExpressionTreePopulationAnalyzer>()) {
+        analyzer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+      }
     }