Changeset 14943

Timestamp:

05/05/17 20:27:21 (8 years ago)

Author:

gkronber

Message:

#2779: cleaned code and added absolute residual and error

File:

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

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

@@ -22 +22 @@
 using System.Drawing;
 using System.Linq;
-using System.Runtime.Remoting.Contexts;
-using System.Threading.Tasks;
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
@@ -31 +29 @@
   [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 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 +61 @@
     }
 
-    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();
     }
@@ -86 +89 @@
       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 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);
@@ -102 +103 @@
         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 +120 @@
       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(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)));
     }