Changeset 4457 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic

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/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic

Files:

• Analyzer/ValidationBestScaledSymbolicTimeSeriesPrognosisSolutionAnalyzer.cs (modified) (1 diff)
• SymbolicTimeSeriesPrognosisSolution.cs (modified) (5 diffs)

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;
     }