Changeset 5663 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionScatterPlotView.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)
• RegressionSolutionScatterPlotView.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.3/ScatterPlotView.cs) (5 diffs)

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  [View("Scatter Plot View")]
-  [Content(typeof(DataAnalysisSolution), true)]
-  public partial class ScatterPlotView : AsynchronousContentView {
-    private const string ALL_SERIES = "All Samples";
-    private const string TRAINING_SERIES = "Training Samples";
-    private const string TEST_SERIES = "Test Samples";
-
-    public new DataAnalysisSolution Content {
-      get { return (DataAnalysisSolution)base.Content; }
+  [View("Regression solution scatter plot")]
+  [Content(typeof(IRegressionSolution))]
+  public partial class RegressionSolutionScatterPlotView : AsynchronousContentView {
+    private const string ALL_SERIES = "All samples";
+    private const string TRAINING_SERIES = "Training samples";
+    private const string TEST_SERIES = "Test samples";
+
+    public new IRegressionSolution Content {
+      get { return (IRegressionSolution)base.Content; }
       set { base.Content = value; }
     }
 
-    public ScatterPlotView()
+    public RegressionSolutionScatterPlotView()
       : base() {
       InitializeComponent();
@@ -77 +77 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.EstimatedValuesChanged += new EventHandler(Content_EstimatedValuesChanged);
+      Content.ModelChanged += new EventHandler(Content_ModelChanged);
       Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
     }
     protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
-      Content.EstimatedValuesChanged -= new EventHandler(Content_EstimatedValuesChanged);
+      Content.ModelChanged -= new EventHandler(Content_ModelChanged);
       Content.ProblemDataChanged -= new EventHandler(Content_ProblemDataChanged);
     }
@@ -90 +90 @@
       UpdateChart();
     }
-    private void Content_EstimatedValuesChanged(object sender, EventArgs e) {
+    private void Content_ModelChanged(object sender, EventArgs e) {
       UpdateSeries();
     }
@@ -126 +126 @@
       if (InvokeRequired) Invoke((Action)UpdateSeries);
       else {
-        string targetVariableName = Content.ProblemData.TargetVariable.Value;
+        string targetVariableName = Content.ProblemData.TargetVariable;
         Dataset dataset = Content.ProblemData.Dataset;
         if (this.chart.Series[ALL_SERIES].Points.Count > 0)
@@ -170 +170 @@
         }
       } else if (Content != null) {
-        string targetVariableName = Content.ProblemData.TargetVariable.Value;
+        string targetVariableName = Content.ProblemData.TargetVariable;
 
         IEnumerable<double> predictedValues = null;