Changeset 17543 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

05/18/20 13:14:56 (4 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into branch (+ corrected type in unit test).

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualAnalysisView.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualAnalysisView.cs

@@ -88 +88 @@
       var ds = problemData.Dataset;
       var runs = new RunCollection();
-      // determine relevant variables (at least two different values)
-      var doubleVars = ds.DoubleVariables.Where(vn => ds.GetDoubleValues(vn).Distinct().Skip(1).Any()).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();
+
+      var doubleVars = ds.DoubleVariables.ToArray();
+      var stringVars = ds.StringVariables.ToArray();
+      var dateTimeVars = ds.DateTimeVariables.ToArray();
 
       var predictedValues = Content.EstimatedValues.ToArray();
+      var targetValues = ds.GetReadOnlyDoubleValues(problemData.TargetVariable);
+
       foreach (var i in problemData.AllIndices) {
         var run = CreateRunForIdx(i, problemData, doubleVars, stringVars, dateTimeVars);
-        var targetValue = ds.GetDoubleValue(problemData.TargetVariable, i);
-        AddErrors(run, predictedValues[i], targetValue);
+        AddErrors(run, predictedValues[i], targetValues[i]);
 
         if (problemData.IsTrainingSample(i) && problemData.IsTestSample(i)) {
@@ -125 +126 @@
     }
 
-    private void AddErrors(IRun run, double pred, double target) {
+    private static void AddErrors(IRun run, double pred, double target) {
       var residual = target - pred;
       var relError = residual / target;
@@ -136 +137 @@
     }
 
-    private IRun CreateRunForIdx(int i, IRegressionProblemData problemData, IEnumerable<string> doubleVars, IEnumerable<string> stringVars, IEnumerable<string> dateTimeVars) {
+    private static IRun CreateRunForIdx(int i, IRegressionProblemData problemData, IEnumerable<string> doubleVars, IEnumerable<string> stringVars, IEnumerable<string> dateTimeVars) {
       var ds = problemData.Dataset;
       var run = new Run();