Changeset 15161 for stable/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

07/06/17 14:31:05 (7 years ago)

Author:

gkronber

Message:

#2779: merged r14889,r14890,r14943,r15024,r15088,r15094 from trunk to stable

Location:

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• Regression/RegressionSolutionResidualAnalysisView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualAnalysisView.Designer.cs)
• Regression/RegressionSolutionResidualAnalysisView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualAnalysisView.cs) (6 diffs)

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -271 +271 @@
     <Compile Include="Regression\RegressionSolutionResidualsLineChartView.Designer.cs">
       <DependentUpon>RegressionSolutionResidualsLineChartView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Regression\RegressionSolutionResidualAnalysisView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Regression\RegressionSolutionResidualAnalysisView.Designer.cs">
+      <DependentUpon>RegressionSolutionResidualAnalysisView.cs</DependentUpon>
     </Compile>
     <Compile Include="Regression\RegressionSolutionVariableImpactsView.cs">

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualAnalysisView.cs

@@ -20 +20 @@
 #endregion
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using System.Runtime.Remoting.Contexts;
-using System.Threading.Tasks;
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
@@ -31 +30 @@
   [View("Residual Analysis")]
   [Content(typeof(IRegressionSolution))]
-  public partial class RegressionSolutionResidualAnalysisView : DataAnalysisSolutionEvaluationView {
+  public sealed partial class RegressionSolutionResidualAnalysisView : DataAnalysisSolutionEvaluationView {
+
+    // names should be relatively save to prevent collisions with variable names in the dataset
+    private const string TargetLabel = "> Target";
+    private const string PredictionLabel = "> Prediction";
+    private const string ResidualLabel = "> Residual";
+    private const string AbsResidualLabel = "> Residual (abs.)";
+    private const string RelativeErrorLabel = "> Relative Error";
+    private const string AbsRelativeErrorLabel = "> Relative Error (abs.)";
+    private const string PartitionLabel = "> Partition";
 
     public new IRegressionSolution Content {
       get { return (IRegressionSolution)base.Content; }
-      set {
-        base.Content = value;
-      }
+      set { base.Content = value; }
     }
 
-    public RegressionSolutionResidualAnalysisView()
-      : base() {
+    public RegressionSolutionResidualAnalysisView() : base() {
       InitializeComponent();
     }
@@ -58 +63 @@
     }
 
-    protected virtual void Content_ProblemDataChanged(object sender, EventArgs e) {
+    private void Content_ProblemDataChanged(object sender, EventArgs e) {
       OnContentChanged();
     }
 
-    protected virtual void Content_ModelChanged(object sender, EventArgs e) {
+    private void Content_ModelChanged(object sender, EventArgs e) {
       OnContentChanged();
     }
@@ -83 +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).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)
       var predictedValuesTrain = Content.EstimatedTrainingValues.ToArray();
       int j = 0; // idx for predictedValues array
-      var partitionId = "Partition";
-      while (ds.VariableNames.Contains(partitionId)) partitionId += "_";
       foreach (var i in problemData.TrainingIndices) {
-        var run = CreateRunForIdx(i, problemData);
+        var run = CreateRunForIdx(i, problemData, doubleVars, stringVars, dateTimeVars);
         var targetValue = ds.GetDoubleValue(problemData.TargetVariable, i);
         AddErrors(run, predictedValuesTrain[j++], targetValue);
-        run.Results.Add(partitionId, new StringValue("Training"));
+        run.Results.Add(PartitionLabel, new StringValue("Training"));
         run.Color = Color.Gold;
         runs.Add(run);
@@ -99 +107 @@
       j = 0;
       foreach (var i in problemData.TestIndices) {
-        var run = CreateRunForIdx(i, problemData);
+        var run = CreateRunForIdx(i, problemData, doubleVars, stringVars, dateTimeVars);
         var targetValue = ds.GetDoubleValue(problemData.TargetVariable, i);
         AddErrors(run, predictedValuesTest[j++], targetValue);
-        run.Results.Add(partitionId, new StringValue("Test"));
+        run.Results.Add(PartitionLabel, new StringValue("Test"));
         run.Color = Color.Red;
         runs.Add(run);
@@ -119 +127 @@
       var residual = target - pred;
       var relError = residual / target;
-      var predId = "Prediction";
-      while (run.Results.ContainsKey(predId)) predId += "_";
-      var resId = "Residual";
-      while (run.Results.ContainsKey(resId)) resId += "_";
-      var relErrorId = "Rel. Error";
-      while (run.Results.ContainsKey(relErrorId)) relErrorId+= "_";
-      run.Results.Add(predId, new DoubleValue(pred));
-      run.Results.Add(resId, new DoubleValue(residual));
-      run.Results.Add(relErrorId, new DoubleValue(relError));
+      run.Results.Add(TargetLabel, new DoubleValue(target));
+      run.Results.Add(PredictionLabel, new DoubleValue(pred));
+      run.Results.Add(ResidualLabel, new DoubleValue(residual));
+      run.Results.Add(AbsResidualLabel, new DoubleValue(Math.Abs(residual)));
+      run.Results.Add(RelativeErrorLabel, new DoubleValue(relError));
+      run.Results.Add(AbsRelativeErrorLabel, new DoubleValue(Math.Abs(relError)));
     }
 
-    private IRun CreateRunForIdx(int i, IRegressionProblemData problemData) {
+    private IRun CreateRunForIdx(int i, IRegressionProblemData problemData, IEnumerable<string> doubleVars, IEnumerable<string> stringVars, IEnumerable<string> dateTimeVars) {
       var ds = problemData.Dataset;
       var run = new Run();
-      foreach (var variableName in ds.DoubleVariables) {
+      foreach (var variableName in doubleVars) {
         run.Results.Add(variableName, new DoubleValue(ds.GetDoubleValue(variableName, i)));
       }
-      foreach (var variableName in ds.StringVariables) {
+      foreach (var variableName in stringVars) {
         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;
     }