Changeset 4366 for branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationProblem.cs

Timestamp:

09/07/10 10:03:21 (14 years ago)

Author:

mkommend

Message:

added draft version of classification (ticket #939)

Location:

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3

Files:

• . (modified) (1 prop)
• Symbolic/SymbolicClassificationProblem.cs (modified) (12 diffs)

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3

@@ -3 +3 @@
 obj
 HeuristicLabProblemsDataAnalysisClassifcationPlugin.cs
+HeuristicLabProblemsDataAnalysisClassificationPlugin.cs

@@ -3 +3 @@
 obj
 HeuristicLabProblemsDataAnalysisClassifcationPlugin.cs
+HeuristicLabProblemsDataAnalysisClassificationPlugin.cs

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationProblem.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Creators;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Interfaces;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
+using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
 
 namespace HeuristicLab.Problems.DataAnalysis.Classification {
@@ -52 +55 @@
       protected set { SymbolicExpressionTreeInterpreterParameter.Value = value; }
     }
-    public ValueParameter<ISymbolicExpressionTreeInterpreter> SymbolicExpressionTreeInterpreterParameter {
-      get { return (ValueParameter<ISymbolicExpressionTreeInterpreter>)Parameters[SymbolicExpressionTreeInterpreterParameterName]; }
+    public IValueParameter<ISymbolicExpressionTreeInterpreter> SymbolicExpressionTreeInterpreterParameter {
+      get { return (IValueParameter<ISymbolicExpressionTreeInterpreter>)Parameters[SymbolicExpressionTreeInterpreterParameterName]; }
     }
 
@@ -60 +63 @@
       protected set { FunctionTreeGrammarParameter.Value = value; }
     }
-    public ValueParameter<ISymbolicExpressionGrammar> FunctionTreeGrammarParameter {
-      get { return (ValueParameter<ISymbolicExpressionGrammar>)Parameters[FunctionTreeGrammarParameterName]; }
+    public IValueParameter<ISymbolicExpressionGrammar> FunctionTreeGrammarParameter {
+      get { return (IValueParameter<ISymbolicExpressionGrammar>)Parameters[FunctionTreeGrammarParameterName]; }
     }
 
@@ -68 +71 @@
       protected set { MaxExpressionLengthParameter.Value = value; }
     }
-    public ValueParameter<IntValue> MaxExpressionLengthParameter {
-      get { return (ValueParameter<IntValue>)Parameters[MaxExpressionLengthParameterName]; }
+    public IValueParameter<IntValue> MaxExpressionLengthParameter {
+      get { return (IValueParameter<IntValue>)Parameters[MaxExpressionLengthParameterName]; }
     }
 
@@ -84 +87 @@
       protected set { UpperEstimationLimitParameter.Value = value; }
     }
-    public ValueParameter<DoubleValue> UpperEstimationLimitParameter {
-      get { return (ValueParameter<DoubleValue>)Parameters[UpperEstimationLimitParameterName]; }
+    public IValueParameter<DoubleValue> UpperEstimationLimitParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters[UpperEstimationLimitParameterName]; }
     }
 
@@ -92 +95 @@
       protected set { LowerEstimationLimitParameter.Value = value; }
     }
-    public ValueParameter<DoubleValue> LowerEstimationLimitParameter {
-      get { return (ValueParameter<DoubleValue>)Parameters[LowerEstimationLimitParameterName]; }
+    public IValueParameter<DoubleValue> LowerEstimationLimitParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters[LowerEstimationLimitParameterName]; }
     }
 
@@ -100 +103 @@
       protected set { MaxFunctionDefiningBranchesParameter.Value = value; }
     }
-    public ValueParameter<IntValue> MaxFunctionDefiningBranchesParameter {
-      get { return (ValueParameter<IntValue>)Parameters[MaxFunctionDefiningBranchensParameterName]; }
+    public IValueParameter<IntValue> MaxFunctionDefiningBranchesParameter {
+      get { return (IValueParameter<IntValue>)Parameters[MaxFunctionDefiningBranchensParameterName]; }
     }
 
@@ -108 +111 @@
       protected set { MaxFunctionArgumentsParameter.Value = value; }
     }
-    public ValueParameter<IntValue> MaxFunctionArgumentsParameter {
-      get { return (ValueParameter<IntValue>)Parameters[MaxFunctionArgumentsParameterName]; }
+    public IValueParameter<IntValue> MaxFunctionArgumentsParameter {
+      get { return (IValueParameter<IntValue>)Parameters[MaxFunctionArgumentsParameterName]; }
     }
 
@@ -225 +228 @@
       Operators.AddRange(ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeOperator>().OfType<IOperator>());
       Operators.Add(new MinAverageMaxSymbolicExpressionTreeSizeAnalyzer());
+      Operators.Add(new ValidationBestSymbolicClassificationSolutionAnalyzer());
     }
 
@@ -249 +253 @@
 
     private void ParameterizeGrammar() {
+      List<LaggedVariable> laggedSymbols = FunctionTreeGrammar.Symbols.OfType<LaggedVariable>().ToList();
+      foreach (Symbol symbol in laggedSymbols)
+        FunctionTreeGrammar.RemoveSymbol(symbol);
       foreach (var varSymbol in FunctionTreeGrammar.Symbols.OfType<HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable>()) {
         varSymbol.VariableNames = ClassificationProblemData.InputVariables.CheckedItems.Select(x => x.Value.Value);
@@ -287 +294 @@
 
     private void ParameterizeAnalyzers() {
-
+      foreach (ISymbolicExpressionTreeAnalyzer analyzer in Operators.OfType<ISymbolicExpressionTreeAnalyzer>()) {
+        analyzer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+        var bestValidationSolutionAnalyzer = analyzer as ValidationBestSymbolicClassificationSolutionAnalyzer;
+        if (bestValidationSolutionAnalyzer != null) {
+          bestValidationSolutionAnalyzer.ClassificationProblemDataParameter.ActualName = ClassificationProblemDataParameter.Name;
+          bestValidationSolutionAnalyzer.UpperEstimationLimitParameter.ActualName = UpperEstimationLimitParameter.Name;
+          bestValidationSolutionAnalyzer.LowerEstimationLimitParameter.ActualName = LowerEstimationLimitParameter.Name;
+          bestValidationSolutionAnalyzer.SymbolicExpressionTreeInterpreterParameter.ActualName = SymbolicExpressionTreeInterpreterParameter.Name;
+          bestValidationSolutionAnalyzer.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+          bestValidationSolutionAnalyzer.ValidationSamplesStartParameter.Value = ValidationSamplesStart;
+          bestValidationSolutionAnalyzer.ValidationSamplesEndParameter.Value = ValidationSamplesEnd;
+        }
+      }
     }
     #endregion

@@ -3 +3 @@
 obj
 HeuristicLabProblemsDataAnalysisClassifcationPlugin.cs
+HeuristicLabProblemsDataAnalysisClassificationPlugin.cs