Changeset 7100 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SingleObjective/SymbolicTimeSeriesPrognosisSingleObjectivePearsonRSquaredEvaluator.cs

Timestamp:

11/29/11 20:05:38 (13 years ago)

Author:

gkronber

Message:

#1081 worked on multi-variate time series prognosis

Location:

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4

Files:

• . (modified) (1 prop)
• SingleObjective/SymbolicTimeSeriesPrognosisSingleObjectivePearsonRSquaredEvaluator.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4

@@ -3 +3 @@
 HeuristicLabProblemsDataAnalysisSymbolicTimeSeriesPrognosisPlugin.cs
 obj
+Plugin.cs

@@ -3 +3 @@
 HeuristicLabProblemsDataAnalysisSymbolicTimeSeriesPrognosisPlugin.cs
 obj
+Plugin.cs

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SingleObjective/SymbolicTimeSeriesPrognosisSingleObjectivePearsonRSquaredEvaluator.cs

@@ -48 +48 @@
       IEnumerable<int> rows = GenerateRowsToEvaluate();
 
-      double quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows);
+      double quality = Calculate(SymbolicTimeSeriesPrognosisInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows);
       QualityParameter.ActualValue = new DoubleValue(quality);
 
@@ -56 +56 @@
     public static double Calculate(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, ITimeSeriesPrognosisProblemData problemData, IEnumerable<int> rows) {
       IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
-      IEnumerable<double> originalValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
-      OnlineCalculatorError errorState;
-      double r2 = OnlinePearsonsRSquaredCalculator.Calculate(estimatedValues, originalValues, out errorState);
-      if (errorState != OnlineCalculatorError.None) return 0.0;
-      else return r2;
+      var meanCalculator = new OnlineMeanAndVarianceCalculator();
+      foreach (var targetVariable in problemData.TargetVariables) {
+        IEnumerable<double> originalValues = problemData.Dataset.GetDoubleValues(targetVariable, rows);
+        OnlineCalculatorError errorState;
+        meanCalculator.Add(OnlinePearsonsRSquaredCalculator.Calculate(estimatedValues, originalValues, out errorState));
+        if (errorState != OnlineCalculatorError.None) return 0.0;
+      }
+      return meanCalculator.Mean;
     }
 
     public override double Evaluate(IExecutionContext context, ISymbolicExpressionTree tree, ITimeSeriesPrognosisProblemData problemData, IEnumerable<int> rows) {
-      SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = context;
+      SymbolicTimeSeriesPrognosisInterpreterParameter.ExecutionContext = context;
       EstimationLimitsParameter.ExecutionContext = context;
 
-      double r2 = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, problemData, rows);
+      double r2 = Calculate(SymbolicTimeSeriesPrognosisInterpreterParameter.ActualValue, tree, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, problemData, rows);
 
-      SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null;
+      SymbolicTimeSeriesPrognosisInterpreterParameter.ExecutionContext = null;
       EstimationLimitsParameter.ExecutionContext = null;
 

@@ -3 +3 @@
 HeuristicLabProblemsDataAnalysisSymbolicTimeSeriesPrognosisPlugin.cs
 obj
+Plugin.cs