Context Navigation

Changeset 5507 for branches

Timestamp:

02/17/11 12:16:46 (13 years ago)

Author:

mkommend

Message:

#1418: Commited remaining changes regarding OnlineEvaluators and solutions.

Location:

branches/DataAnalysis Refactoring

Files:

-                      r5500
+                      r5507
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public abstract class SymbolicDataAnalysisMultiObjectiveEvaluator : SymbolicDataAnalysisEvaluator, ISymbolicDataAnalysisMultiObjectiveEvaluator {
     private const string QualityParameterName = "Quality";
     public ILookupParameter<DoubleArray> QualityParameter {
       get { return (ILookupParameter<DoubleArray>)Parameters[QualityParameterName]; }
+    private const string QualitiesParameterName = "Qualities";
+    public ILookupParameter<DoubleArray> QualitiesParameter {
+      get { return (ILookupParameter<DoubleArray>)Parameters[QualitiesParameterName]; }
+    }
 …
     protected SymbolicDataAnalysisMultiObjectiveEvaluator()
       : base() {
       Parameters.Add(new LookupParameter<DoubleArray>(QualityParameterName, "The qualities of the evaluated symbolic data analysis solution."));
+      Parameters.Add(new LookupParameter<DoubleArray>(QualitiesParameterName, "The qualities of the evaluated symbolic data analysis solution."));
+    }
+  }

r5495	r5507
20	20	#endregion
21	21
	22	using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
22	23	namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
23	24	public interface ISymbolicDataAnalysisModel : IDataAnalysisModel {
	25	ISymbolicExpressionTree SymbolicExpressionTree;
	26	ISymbolicDataAnalysisTreeInterpreter Interpreter;
24	27	}
25	28	}

-                      r5490
+                      r5507
 #endregion
+using System;
 using HeuristicLab.Core;
 …
     IDataAnalysisModel Model { get; }
     IDataAnalysisProblemData ProblemData { get; }
+    EventHandler ModelChanged;
+    EventHandler ProblemDataChanged;
+  }
+}

-                      r5501
+                      r5507
 #endregion
+using System.Collections.Generic;
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IRegressionnSolution : IDataAnalysisSolution {
     new IRegressionModel Model { get; }
     new IRegressionProblemData ProblemData { get; }
+    IEnumerable<double> EstimatedValues { get; }
+    IEnumerable<double> EstimatedTrainingValues { get; }
+    IEnumerable<double> EstimatedTestValues { get; }
+    IEnumerable<double> GetEstimatedValues(IEnumerable<int> rows);
+  }
+}

-                      r5491
+                      r5507
 using System;
+using System.Collections.Generic;
 namespace HeuristicLab.Problems.DataAnalysis {
 …
+    }
     #endregion
+    public static double Calculate(IEnumerable<double> first, IEnumerable<double> second) {
+      IEnumerator<double> firstEnumerator = first.GetEnumerator();
+      IEnumerator<double> secondEnumerator = second.GetEnumerator();
+      OnlineCovarianceEvaluator covarianceEvaluator = new OnlineCovarianceEvaluator();
+      while (firstEnumerator.MoveNext() & secondEnumerator.MoveNext()) {
+        double estimated = secondEnumerator.Current;
+        double original = firstEnumerator.Current;
+        covarianceEvaluator.Add(original, estimated);
+      }
+      if (secondEnumerator.MoveNext() || firstEnumerator.MoveNext()) {
+        throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
+      } else {
+        return covarianceEvaluator.Covariance;
+      }
+    }
+  }
+}

-                      r5491
+                      r5507
 using System;
+using System.Collections.Generic;
 using HeuristicLab.Common;
 …
     #endregion
+    public static double Calculate(IEnumerable<double> first, IEnumerable<double> second) {
+      IEnumerator<double> firstEnumerator = first.GetEnumerator();
+      IEnumerator<double> secondEnumerator = second.GetEnumerator();
+      OnlineMeanAbsolutePercentageErrorEvaluator evaluator = new OnlineMeanAbsolutePercentageErrorEvaluator();
+      while (firstEnumerator.MoveNext() & secondEnumerator.MoveNext()) {
+        double estimated = secondEnumerator.Current;
+        double original = firstEnumerator.Current;
+        evaluator.Add(original, estimated);
+      }
+      if (secondEnumerator.MoveNext() || firstEnumerator.MoveNext()) {
+        throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
+      } else {
+        return evaluator.MeanAbsolutePercentageError;
+      }
+    }
+  }
+}

-                      r5491
+                      r5507
 using System;
+using System.Collections.Generic;
 namespace HeuristicLab.Problems.DataAnalysis {
 …
+    }
     #endregion
+    public static double Calculate(IEnumerable<double> first, IEnumerable<double> second) {
+      IEnumerator<double> firstEnumerator = first.GetEnumerator();
+      IEnumerator<double> secondEnumerator = second.GetEnumerator();
+      OnlineNormalizedMeanSquaredErrorEvaluator normalizedMSEEvaluator = new OnlineNormalizedMeanSquaredErrorEvaluator();
+      while (firstEnumerator.MoveNext() & secondEnumerator.MoveNext()) {
+        double estimated = secondEnumerator.Current;
+        double original = firstEnumerator.Current;
+        normalizedMSEEvaluator.Add(original, estimated);
+      }
+      if (secondEnumerator.MoveNext() || firstEnumerator.MoveNext()) {
+        throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
+      } else {
+        return normalizedMSEEvaluator.NormalizedMeanSquaredError;
+      }
+    }
+  }
+}

Note: See TracChangeset for help on using the changeset viewer.