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

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/Analyzer (added)
• Symbolic/Analyzer/ValidationBestSymbolicClassificationSolutionAnalyzer.cs (added)
• Symbolic/SingleObjectiveSymbolicClassificationEvaluator.cs (modified) (5 diffs)
• Symbolic/SymbolicClassificationMeanSquaredErrorEvaluator.cs (modified) (4 diffs)
• Symbolic/SymbolicClassificationProblem.cs (modified) (12 diffs)
• Symbolic/SymbolicClassificationSolution.cs (added)

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/SingleObjectiveSymbolicClassificationEvaluator.cs

@@ -61 +61 @@
     }
 
-    public ILookupParameter<DataAnalysisProblemData> RegressionProblemDataParameter {
-      get { return (ILookupParameter<DataAnalysisProblemData>)Parameters[RegressionProblemDataParameterName]; }
+    public ILookupParameter<ClassificationProblemData> RegressionProblemDataParameter {
+      get { return (ILookupParameter<ClassificationProblemData>)Parameters[RegressionProblemDataParameterName]; }
     }
 
@@ -92 +92 @@
       get { return SymbolicExpressionTreeParameter.ActualValue; }
     }
-    public DataAnalysisProblemData RegressionProblemData {
+    public ClassificationProblemData RegressionProblemData {
       get { return RegressionProblemDataParameter.ActualValue; }
     }
@@ -118 +118 @@
       Parameters.Add(new LookupParameter<ISymbolicExpressionTreeInterpreter>(SymbolicExpressionTreeInterpreterParameterName, "The interpreter that should be used to calculate the output values of the symbolic expression tree."));
       Parameters.Add(new LookupParameter<SymbolicExpressionTree>(FunctionTreeParameterName, "The symbolic regression solution encoded as a symbolic expression tree."));
-      Parameters.Add(new LookupParameter<DataAnalysisProblemData>(RegressionProblemDataParameterName, "The problem data on which the symbolic regression solution should be evaluated."));
+      Parameters.Add(new LookupParameter<ClassificationProblemData>(RegressionProblemDataParameterName, "The problem data on which the symbolic regression solution should be evaluated."));
       Parameters.Add(new ValueLookupParameter<IntValue>(SamplesStartParameterName, "The start index of the dataset partition on which the symbolic regression solution should be evaluated."));
       Parameters.Add(new ValueLookupParameter<IntValue>(SamplesEndParameterName, "The end index of the dataset partition on which the symbolic regression solution should be evaluated."));
@@ -139 +139 @@
       int seed = Random.Next();
       IEnumerable<int> rows = GenerateRowsToEvaluate(seed, RelativeNumberOfEvaluatedSamples.Value, SamplesStart.Value, SamplesEnd.Value);
+
       double quality = Evaluate(SymbolicExpressionTreeInterpreter, SymbolicExpressionTree, LowerEstimationLimit.Value, UpperEstimationLimit.Value,
-        RegressionProblemData.Dataset,
-        RegressionProblemData.TargetVariable.Value, rows);
+        RegressionProblemData.Dataset, RegressionProblemData.TargetVariable.Value, RegressionProblemData.SortedClassValues, rows);
       QualityParameter.ActualValue = new DoubleValue(quality);
       return base.Apply();
@@ -157 +157 @@
       Dataset dataset,
       string targetVariable,
+      IEnumerable<double> sortedClassValues,
       IEnumerable<int> rows);
   }

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -37 +39 @@
     }
 
-    public override double Evaluate(ISymbolicExpressionTreeInterpreter interpreter, SymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, Dataset dataset, string targetVariable, IEnumerable<int> rows) {
-      double mse = Calculate(interpreter, solution, lowerEstimationLimit, upperEstimationLimit, dataset, targetVariable, rows);
+    public override double Evaluate(ISymbolicExpressionTreeInterpreter interpreter, SymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, Dataset dataset, string targetVariable, IEnumerable<double> sortedClassValues, IEnumerable<int> rows) {
+      double mse = Calculate(interpreter, solution, lowerEstimationLimit, upperEstimationLimit, dataset, targetVariable, sortedClassValues, rows);
       return mse;
     }
 
-    public static double Calculate(ISymbolicExpressionTreeInterpreter interpreter, SymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, Dataset dataset, string targetVariable, IEnumerable<int> rows) {
+    public static double Calculate(ISymbolicExpressionTreeInterpreter interpreter, SymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, Dataset dataset, string targetVariable, IEnumerable<double> sortedClassValues, IEnumerable<int> rows) {
       IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, dataset, rows);
       IEnumerable<double> originalValues = dataset.GetEnumeratedVariableValues(targetVariable, rows);
@@ -49 +51 @@
       OnlineMeanSquaredErrorEvaluator mseEvaluator = new OnlineMeanSquaredErrorEvaluator();
 
+
+      double firstClassValue = sortedClassValues.First();
+      double lastClassValue = sortedClassValues.Last();
       while (originalEnumerator.MoveNext() && estimatedEnumerator.MoveNext()) {
         double estimated = estimatedEnumerator.Current;
@@ -54 +59 @@
         if (double.IsNaN(estimated))
           estimated = upperEstimationLimit;
+        else if (estimated < original && original.IsAlmost(firstClassValue))
+          estimated = original;
+        else if (estimated > original && original.IsAlmost(lastClassValue))
+          estimated = original;
         else
           estimated = Math.Min(upperEstimationLimit, Math.Max(lowerEstimationLimit, estimated));

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