Changeset 5663 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionEstimatedValuesView.cs

Timestamp:

03/10/11 14:41:17 (13 years ago)

Author:

gkronber

Message:

#1418 ported estimated values view for classification and regression solutions and porter scatter plot and line chart for regression solutions.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression

Files:

• . (added)
• RegressionSolutionEstimatedValuesView.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.3/EstimatedValuesView.cs) (6 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionEstimatedValuesView.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  [View("Estimated Values View")]
-  [Content(typeof(DataAnalysisSolution))]
-  public partial class EstimatedValuesView : AsynchronousContentView {
+  [View("Regression solution estimated values view")]
+  [Content(typeof(IRegressionSolution))]
+  public partial class RegressionSolutionEstimatedValuesView : AsynchronousContentView {
     private const string TARGETVARIABLE_SERIES_NAME = "TargetVariable";
     private const string ESTIMATEDVALUES_SERIES_NAME = "EstimatedValues";
 
-    public new DataAnalysisSolution Content {
-      get { return (DataAnalysisSolution)base.Content; }
+    public new IRegressionSolution Content {
+      get { return (IRegressionSolution)base.Content; }
       set {
         base.Content = value;
@@ -43 +43 @@
     private StringConvertibleMatrixView matrixView;
 
-    public EstimatedValuesView()
+    public RegressionSolutionEstimatedValuesView()
       : base() {
       InitializeComponent();
@@ -56 +56 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.EstimatedValuesChanged += new EventHandler(Content_EstimatedValuesChanged);
+      Content.ModelChanged += new EventHandler(Content_ModelChanged);
       Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
     }
@@ -62 +62 @@
     protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
-      Content.EstimatedValuesChanged -= new EventHandler(Content_EstimatedValuesChanged);
+      Content.ModelChanged -= new EventHandler(Content_ModelChanged);
       Content.ProblemDataChanged -= new EventHandler(Content_ProblemDataChanged);
     }
 
-    void Content_ProblemDataChanged(object sender, EventArgs e) {
+    private void Content_ProblemDataChanged(object sender, EventArgs e) {
       OnContentChanged();
     }
 
-    void Content_EstimatedValuesChanged(object sender, EventArgs e) {
+    private void Content_ModelChanged(object sender, EventArgs e) {
       OnContentChanged();
     }
@@ -86 +86 @@
           double[,] values = new double[Content.ProblemData.Dataset.Rows, 4];
 
-          double[] target = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value);
+          double[] target = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable);
           double[] estimated = Content.EstimatedValues.ToArray();
           for (int row = 0; row < target.Length; row++) {
@@ -96 +96 @@
 
           matrix = new DoubleMatrix(values);
-          matrix.ColumnNames = new string[] { "Original", "Estimated", "Error", "Rel. Error" };
+          matrix.ColumnNames = new string[] { TARGETVARIABLE_SERIES_NAME, ESTIMATEDVALUES_SERIES_NAME, "Absolute Error", "Relative Error" };
         }
         matrixView.Content = matrix;