Changeset 15094 for trunk

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.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualAnalysisView.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataset.cs (modified) (2 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;
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

@@ -181 +181 @@
     }
 
+    public IEnumerable<string> DateTimeVariables {
+      get { return variableValues.Where(p => p.Value is IList<DateTime>).Select(p => p.Key); }
+    }
+
     public IEnumerable<double> GetDoubleValues(string variableName) {
       return GetValues<double>(variableName);
@@ -215 +219 @@
       return new ReadOnlyCollection<string>(values);
     }
+
+    public DateTime GetDateTimeValue(string variableName, int row) {
+      var values = GetValues<DateTime>(variableName);
+      return values[row];
+    }
+    public IEnumerable<DateTime> GetDateTimeValues(string variableName, IEnumerable<int> rows) {
+      return GetValues<DateTime>(variableName, rows);
+    }
+    public ReadOnlyCollection<DateTime> GetReadOnlyDateTimeValues(string variableName) {
+      var values = GetValues<DateTime>(variableName);
+      return new ReadOnlyCollection<DateTime>(values);
+    }
+
 
     private IEnumerable<T> GetValues<T>(string variableName, IEnumerable<int> rows) {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataset.cs

@@ -31 +31 @@
     IEnumerable<string> DoubleVariables { get; }
     IEnumerable<string> StringVariables { get; }
+    IEnumerable<string> DateTimeVariables { get; }
 
     bool VariableHasType<T>(string variableName);
@@ -44 +45 @@
     ReadOnlyCollection<string> GetReadOnlyStringValues(string VariableName);
 
+    System.DateTime GetDateTimeValue(string variableName, int row);
     IEnumerable<DateTime> GetDateTimeValues(string variableName);
+    IEnumerable<DateTime> GetDateTimeValues(string variableName, IEnumerable<int> rows);
+    ReadOnlyCollection<DateTime> GetReadOnlyDateTimeValues(string variableName);
   }
 }