Changeset 8857 for trunk/sources/HeuristicLab.Problems.DataAnalysis

Timestamp:

10/30/12 11:00:55 (12 years ago)

Author:

sforsten

Message:

#1920: changes made in r8528 have been extended to TimeSeriesPrognosis and to DiscriminantFunctionClassificationModel, which has been missed

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Files:

• Classification/DiscriminantFunctionClassificationModel.cs (modified) (1 diff)
• TimeSeriesPrognosis/Models/ConstantTimeSeriesPrognosisModel.cs (modified) (1 diff)
• TimeSeriesPrognosis/Models/TimeSeriesPrognosisAutoRegressiveModel.cs (modified) (1 diff)
• TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs

@@ -136 +136 @@
 
     public virtual IDiscriminantFunctionClassificationSolution CreateDiscriminantFunctionClassificationSolution(IClassificationProblemData problemData) {
-      return new DiscriminantFunctionClassificationSolution(this, problemData);
+      return new DiscriminantFunctionClassificationSolution(this, new ClassificationProblemData(problemData));
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/Models/ConstantTimeSeriesPrognosisModel.cs

@@ -44 +44 @@
 
     public ITimeSeriesPrognosisSolution CreateTimeSeriesPrognosisSolution(ITimeSeriesPrognosisProblemData problemData) {
-      return new TimeSeriesPrognosisSolution(this, problemData);
+      return new TimeSeriesPrognosisSolution(this, new TimeSeriesPrognosisProblemData(problemData));
     }
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/Models/TimeSeriesPrognosisAutoRegressiveModel.cs

@@ -109 +109 @@
 
     public ITimeSeriesPrognosisSolution CreateTimeSeriesPrognosisSolution(ITimeSeriesPrognosisProblemData problemData) {
-      return new TimeSeriesPrognosisSolution(this, problemData);
+      return new TimeSeriesPrognosisSolution(this, new TimeSeriesPrognosisProblemData(problemData));
     }
     public IRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData) {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs

@@ -1595 +1595 @@
     }
 
+    public TimeSeriesPrognosisProblemData(ITimeSeriesPrognosisProblemData timeseriesProblemData)
+      : this(timeseriesProblemData.Dataset, timeseriesProblemData.AllowedInputVariables, timeseriesProblemData.TargetVariable) {
+
+      TestHorizon = timeseriesProblemData.TestHorizon;
+      TrainingHorizon = timeseriesProblemData.TestHorizon;
+    }
+
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {