Changeset 5507 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis

Timestamp:

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

Author:

mkommend

Message:

#1418: Commited remaining changes regarding OnlineEvaluators and solutions.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Interfaces/IDataAnalysisSolution.cs (modified) (2 diffs)
• Interfaces/Regression/IRegressionSolution.cs (modified) (1 diff)
• OnlineEvaluators/OnlineCovarianceEvaluator.cs (modified) (2 diffs)
• OnlineEvaluators/OnlineMeanAbsolutePercentageErrorEvaluator.cs (modified) (2 diffs)
• OnlineEvaluators/OnlineNormalizedMeanSquaredErrorEvaluator.cs (modified) (2 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisSolution.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Core;
 
@@ -26 +27 @@
     IDataAnalysisModel Model { get; }
     IDataAnalysisProblemData ProblemData { get; }
+
+    EventHandler ModelChanged;
+    EventHandler ProblemDataChanged;
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionSolution.cs

@@ -20 +20 @@
 #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);
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineCovarianceEvaluator.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -67 +68 @@
     }
     #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;
+      }
+    }
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineMeanAbsolutePercentageErrorEvaluator.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using HeuristicLab.Common;
 
@@ -63 +64 @@
 
     #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;
+      }
+    }
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineNormalizedMeanSquaredErrorEvaluator.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -60 +61 @@
     }
     #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;
+      }
+    }
   }
 }