Changeset 4457

Timestamp:

09/21/10 10:16:49 (14 years ago)

Author:

gkronber

Message:

made DataAnalysisProblem and DataAnalysisProblemData and SymbolicTimeSeriesPrognosisSolution savable and added field for conditional evaluation to Symbolic/SymbolicTimeSeriesPrognosisSolution. #1142

Location:

branches/DataAnalysis

Files:

• HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views/3.3/ResultsView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Analyzer/ValidationBestScaledSymbolicTimeSeriesPrognosisSolutionAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/SymbolicTimeSeriesPrognosisSolution.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis.MultiVariate/3.3/MultiVariateDataAnalysisProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.MultiVariate/3.3/MultiVariateDataAnalysisProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs (modified) (1 diff)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis.Views/3.3/ResultsView.cs

@@ -145 +145 @@
 
       for (int row = start; row < end; row++) {
-        // prepare evaluators for each target variable for a new prediction window
-        foreach (var entry in evaluators) {
-          double referenceOriginalValue = Content.ProblemData.Dataset[entry.Key, row - 1];
-          foreach (IOnlineTimeSeriesPrognosisEvaluator evaluator in entry.Value.OfType<IOnlineTimeSeriesPrognosisEvaluator>()) {
-            evaluator.StartNewPredictionWindow(referenceOriginalValue);
+        if (string.IsNullOrEmpty(Content.ConditionalEvaluationVariable) || Content.ProblemData.Dataset[Content.ConditionalEvaluationVariable, row] != 0) {
+          // prepare evaluators for each target variable for a new prediction window
+          foreach (var entry in evaluators) {
+            double referenceOriginalValue = Content.ProblemData.Dataset[entry.Key, row - 1];
+            foreach (IOnlineTimeSeriesPrognosisEvaluator evaluator in entry.Value.OfType<IOnlineTimeSeriesPrognosisEvaluator>()) {
+              evaluator.StartNewPredictionWindow(referenceOriginalValue);
+            }
           }
-        }
-        List<string> targetVariables = Content.ProblemData.TargetVariables.CheckedItems.Select(x => x.Value.Value).ToList();
+          List<string> targetVariables = Content.ProblemData.TargetVariables.CheckedItems.Select(x => x.Value.Value).ToList();
 
-        int timestep = 0;
-        foreach (double[] x in Content.GetPrognosis(row)) {
-          int targetIndex = 0;
-          foreach (var targetVariable in targetVariables) {
-            double originalValue = Content.ProblemData.Dataset[targetVariable, row + timestep];
-            double estimatedValue = x[targetIndex];
-            if (IsValidValue(originalValue) && IsValidValue(estimatedValue)) {
-              foreach (IOnlineEvaluator evaluator in evaluators[targetVariable]) {
-                evaluator.Add(originalValue, estimatedValue);
+          int timestep = 0;
+          foreach (double[] x in Content.GetPrognosis(row)) {
+            int targetIndex = 0;
+            foreach (var targetVariable in targetVariables) {
+              double originalValue = Content.ProblemData.Dataset[targetVariable, row + timestep];
+              double estimatedValue = x[targetIndex];
+              if (IsValidValue(originalValue) && IsValidValue(estimatedValue)) {
+                foreach (IOnlineEvaluator evaluator in evaluators[targetVariable]) {
+                  evaluator.Add(originalValue, estimatedValue);
+                }
               }
+              targetIndex++;
             }
-            targetIndex++;
+            timestep++;
           }
-          timestep++;
         }
       }

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/Analyzer/ValidationBestScaledSymbolicTimeSeriesPrognosisSolutionAnalyzer.cs

@@ -295 +295 @@
         model.Description = "Best solution on validation partition found over the whole run.";
 
-        var solution = new SymbolicTimeSeriesPrognosisSolution(ProblemData, model, PredictionHorizon.Value);
+        var solution = new SymbolicTimeSeriesPrognosisSolution(ProblemData, model, PredictionHorizon.Value, conditionalVariableName);
         solution.Name = BestSolutionParameterName;
         solution.Description = "Best solution on validation partition found over the whole run.";

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/SymbolicTimeSeriesPrognosisSolution.cs

@@ -35 +35 @@
   [StorableClass]
   [Item("SymbolicTimeSeriesPrognosisSolution", "Represents a solution for time series prognosis.")]
-  public class SymbolicTimeSeriesPrognosisSolution : NamedItem, IMultiVariateDataAnalysisSolution {
+  public class SymbolicTimeSeriesPrognosisSolution : NamedItem, IMultiVariateDataAnalysisSolution, IStorableContent {
     [Storable]
     private MultiVariateDataAnalysisProblemData problemData;
@@ -42 +42 @@
     [Storable]
     private int horizon;
+    [Storable]
+    private string conditionalEvaluationVariable;
+
+    public string FileName { get; set; }
 
     [StorableConstructor]
@@ -50 +54 @@
     }
 
-    public SymbolicTimeSeriesPrognosisSolution(MultiVariateDataAnalysisProblemData problemData, SymbolicTimeSeriesPrognosisModel model, int horizon)
+    public SymbolicTimeSeriesPrognosisSolution(MultiVariateDataAnalysisProblemData problemData, SymbolicTimeSeriesPrognosisModel model, int horizon, string conditionalEvaluationVariable)
       : this() {
       this.problemData = problemData;
       this.model = model;
       this.horizon = horizon;
+      this.conditionalEvaluationVariable = conditionalEvaluationVariable;
     }
 
@@ -82 +87 @@
           model = value;
           RaiseModelChanged();
+        }
+      }
+    }
+
+    public string ConditionalEvaluationVariable {
+      get { return conditionalEvaluationVariable; }
+      set {
+        if (conditionalEvaluationVariable != value) {
+          conditionalEvaluationVariable = value;
+          RaiseEstimatedValuesChanged();
         }
       }
@@ -182 +197 @@
       clone.model = (SymbolicTimeSeriesPrognosisModel)cloner.Clone(model);
       clone.horizon = horizon;
+      clone.conditionalEvaluationVariable = conditionalEvaluationVariable;
       return clone;
     }

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate/3.3/MultiVariateDataAnalysisProblem.cs

@@ -33 +33 @@
   [Creatable("Problems")]
   [StorableClass]
-  public class MultiVariateDataAnalysisProblem : ParameterizedNamedItem, IMultiVariateDataAnalysisProblem {
+  public class MultiVariateDataAnalysisProblem : ParameterizedNamedItem, IMultiVariateDataAnalysisProblem, IStorableContent {
     private const string MultiVariateDataAnalysisProblemDataParameterName = "MultiVariateDataAnalysisProblem";
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
     }
+
+    public string FileName { get; set; }
 
     #region Parameter Properties

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate/3.3/MultiVariateDataAnalysisProblemData.cs

@@ -32 +32 @@
   [Item("MultiVariateDataAnalysisProblemData", "Represents an item containing all data defining a multi-variate data analysis problem.")]
   [StorableClass]
-  public class MultiVariateDataAnalysisProblemData : ParameterizedNamedItem {
+  public class MultiVariateDataAnalysisProblemData : ParameterizedNamedItem, IStorableContent {
     private bool suppressEvents = false;
+    public string FileName { get; set; }
     #region default data
     // y0 = x^4 + x^3 + x^2 + x

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblem.cs

@@ -33 +33 @@
   [Creatable("Problems")]
   [StorableClass]
-  public class DataAnalysisProblem : ParameterizedNamedItem, IDataAnalysisProblem {
+  public class DataAnalysisProblem : ParameterizedNamedItem, IDataAnalysisProblem, IStorableContent {
     private const string DataAnalysisProblemDataParameterName = "DataAnalysisProblemData";
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
     }
+
+    public string FileName { get; set; }
 
     #region Parameter Properties

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblemData.cs

@@ -33 +33 @@
   [Item("DataAnalysisProblemData", "Represents an item containing all data defining a data analysis problem.")]
   [StorableClass]
-  public class DataAnalysisProblemData : ParameterizedNamedItem {
+  public class DataAnalysisProblemData : ParameterizedNamedItem, IStorableContent {
     private bool suppressEvents = false;
+
+    #region IStorableContent Members
+    public string Filename { get; set; }
+    #endregion
+
     #region default data
     // y = x^4 + x^3 + x^2 + x

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs

@@ -33 +33 @@
   [Item("DataAnalysisSolution", "Represents a solution for a data analysis problem which can be visualized in the GUI.")]
   [StorableClass]
-  public abstract class DataAnalysisSolution : NamedItem {
+  public abstract class DataAnalysisSolution : NamedItem, IStorableContent {
+    #region IStorableContent Members
+    public string Filename { get; set; }
+    #endregion
+
+
     protected DataAnalysisSolution()
       : base() { }