Changeset 7989 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisSolution.cs

Timestamp:

06/12/12 10:31:56 (12 years ago)

Author:

mkommend

Message:

#1081: Improved performance of time series prognosis.

File:

• branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisSolution.cs (modified) (3 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisSolution.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +32 @@
 
     [StorableConstructor]
-    protected TimeSeriesPrognosisSolution(bool deserializing)
-      : base(deserializing) {
-    }
-    protected TimeSeriesPrognosisSolution(TimeSeriesPrognosisSolution original, Cloner cloner)
-      : base(original, cloner) {
-    }
-    protected TimeSeriesPrognosisSolution(ITimeSeriesPrognosisModel model, ITimeSeriesPrognosisProblemData problemData)
-      : base(model, problemData) {
-    }
+    protected TimeSeriesPrognosisSolution(bool deserializing) : base(deserializing) { }
+    protected TimeSeriesPrognosisSolution(TimeSeriesPrognosisSolution original, Cloner cloner) : base(original, cloner) { }
+    protected TimeSeriesPrognosisSolution(ITimeSeriesPrognosisModel model, ITimeSeriesPrognosisProblemData problemData) : base(model, problemData) { }
 
     protected override void RecalculateResults() {
@@ -47 +40 @@
     }
 
-    public override IEnumerable<IEnumerable<double>> PrognosedTrainingValues {
-      get {
-        return GetPrognosedValues(ProblemData.TrainingIndizes.Take(1),
-          ProblemData.TrainingPartition.End - ProblemData.TrainingPartition.Start)
-          .First();
-      }
-    }
-    public override IEnumerable<IEnumerable<double>> PrognosedTestValues {
-      get {
-        return GetPrognosedValues(ProblemData.TestIndizes.Take(1),
-          ProblemData.TestPartition.End - ProblemData.TestPartition.Start)
-          .First();
-      }
-    }
-    public override IEnumerable<IEnumerable<IEnumerable<double>>> GetPrognosedValues(IEnumerable<int> rows, int horizon) {
+    public override IEnumerable<IEnumerable<double>> GetPrognosedValues(IEnumerable<int> rows, int horizon) {
       return Model.GetPrognosedValues(ProblemData.Dataset, rows, horizon);
-    }
-
-    protected override void OnProblemDataChanged() {
-      base.OnProblemDataChanged();
-    }
-
-    protected override void OnModelChanged() {
-      base.OnModelChanged();
     }
   }