Changeset 15094 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

06/29/17 16:07:16 (7 years ago)

Author:

mkommend

Message:

#2779: Implemented necessary methods in the Dataset and ResidualAnalysisView to handle dates correctly.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualAnalysisView.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualAnalysisView.cs

@@ -91 +91 @@
       var doubleVars = ds.DoubleVariables.Where(vn => ds.GetDoubleValues(vn).Max() > ds.GetDoubleValues(vn).Min()).ToArray();
       var stringVars = ds.StringVariables.Where(vn => ds.GetStringValues(vn).Distinct().Skip(1).Any()).ToArray();
+      var dateTimeVars = ds.DateTimeVariables.Where(vn => ds.GetDateTimeValues(vn).Distinct().Skip(1).Any()).ToArray();
 
       // produce training and test values separately as they might overlap (e.g. for ensembles)
@@ -96 +97 @@
       int j = 0; // idx for predictedValues array
       foreach (var i in problemData.TrainingIndices) {
-        var run = CreateRunForIdx(i, problemData, doubleVars, stringVars);
+        var run = CreateRunForIdx(i, problemData, doubleVars, stringVars, dateTimeVars);
         var targetValue = ds.GetDoubleValue(problemData.TargetVariable, i);
         AddErrors(run, predictedValuesTrain[j++], targetValue);
@@ -106 +107 @@
       j = 0;
       foreach (var i in problemData.TestIndices) {
-        var run = CreateRunForIdx(i, problemData, doubleVars, stringVars);
+        var run = CreateRunForIdx(i, problemData, doubleVars, stringVars, dateTimeVars);
         var targetValue = ds.GetDoubleValue(problemData.TargetVariable, i);
         AddErrors(run, predictedValuesTest[j++], targetValue);
@@ -134 +135 @@
     }
 
-    private IRun CreateRunForIdx(int i, IRegressionProblemData problemData, IEnumerable<string> doubleVars, IEnumerable<string> stringVars) {
+    private IRun CreateRunForIdx(int i, IRegressionProblemData problemData, IEnumerable<string> doubleVars, IEnumerable<string> stringVars, IEnumerable<string> dateTimeVars) {
       var ds = problemData.Dataset;
       var run = new Run();
@@ -143 +144 @@
         run.Results.Add(variableName, new StringValue(ds.GetStringValue(variableName, i)));
       }
+      foreach (var variableName in dateTimeVars) {
+        run.Results.Add(variableName, new DateTimeValue(ds.GetDateTimeValue(variableName, i)));
+      }
       return run;
     }