Changeset 3979 for trunk

Timestamp:

06/30/10 10:58:01 (14 years ago)

Author:

mkommend

Message:

corrected DataAnalysis.Views.ResultsView to use an internal DoubleMatrix (ticket #1020)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Regression/3.3/SupportVectorRegression/SupportVectorRegressionSolution.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/ResultsView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/ResultsView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/SupportVectorRegression/SupportVectorRegressionSolution.cs

@@ -84 +84 @@
                          select double.IsNaN(boundedX) ? UpperEstimationLimit : boundedX).ToList();
       OnEstimatedValuesChanged();
-      RecalculateResultValues();
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs

@@ -57 +57 @@
                          select double.IsNaN(boundedX) ? UpperEstimationLimit : boundedX).ToList();
       OnEstimatedValuesChanged();
-      RecalculateResultValues();
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/ResultsView.Designer.cs

@@ -44 +44 @@
     /// </summary>
     private void InitializeComponent() {
-      components = new System.ComponentModel.Container();
+      this.matrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
+      this.SuspendLayout();
+      // 
+      // matrixView
+      // 
+      this.matrixView.Caption = "StringConvertibleMatrix View";
+      this.matrixView.Content = null;
+      this.matrixView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.matrixView.Location = new System.Drawing.Point(0, 0);
+      this.matrixView.Name = "matrixView";
+      this.matrixView.ReadOnly = true;
+      this.matrixView.Size = new System.Drawing.Size(494, 317);
+      this.matrixView.TabIndex = 0;
+      // 
+      // ResultsView
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.matrixView);
+      this.Name = "ResultsView";
+      this.Size = new System.Drawing.Size(494, 317);
+      this.ResumeLayout(false);
+
     }
 
     #endregion
+
+    private HeuristicLab.Data.Views.StringConvertibleMatrixView matrixView;
   }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/ResultsView.cs

@@ -30 +30 @@
 using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Data.Views;
+using HeuristicLab.Data;
+using HeuristicLab.Problems.DataAnalysis.Evaluators;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   [Content(typeof(DataAnalysisSolution),false)]
   [View("Results View")]
-  public partial class ResultsView : StringConvertibleMatrixView {
+  public partial class ResultsView : AsynchronousContentView {
+    private List<string> rowNames = new List<string>() { "MeanSquaredError", "CoefficientOfDetermination", "MeanAbsolutePercentageError" };
+    private List<string> columnNames = new List<string>() { "Training", "Test" };
+
     public ResultsView() {
       InitializeComponent();
@@ -43 +48 @@
       set { base.Content = value; }
     }
+
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      Content.ModelChanged += new EventHandler(Content_ModelChanged);
+      Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
+      Content.EstimatedValuesChanged += new EventHandler(Content_EstimatedValuesChanged);
+    }
+    protected override void DeregisterContentEvents() {
+      base.DeregisterContentEvents();
+      Content.ModelChanged -= new EventHandler(Content_ModelChanged);
+      Content.ProblemDataChanged -= new EventHandler(Content_ProblemDataChanged);
+      Content.EstimatedValuesChanged -= new EventHandler(Content_EstimatedValuesChanged);
+    }
+
+    private void Content_ModelChanged(object sender, EventArgs e) {
+      UpdateView();
+    }
+    private void Content_ProblemDataChanged(object sender, EventArgs e) {
+      UpdateView();
+    }
+    private void Content_EstimatedValuesChanged(object sender, EventArgs e) {
+      UpdateView();
+    }
+
+    protected override void OnContentChanged() {
+      base.OnContentChanged();
+      UpdateView();
+    }
+    private void UpdateView() {
+      if (Content != null) {
+        DoubleMatrix matrix = new DoubleMatrix(rowNames.Count, columnNames.Count);
+        matrix.RowNames = rowNames;
+        matrix.ColumnNames = columnNames;
+        matrix.SortableView = false;
+
+        IEnumerable<double> originalTrainingValues = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value, Content.ProblemData.TrainingSamplesStart.Value, Content.ProblemData.TrainingSamplesEnd.Value);
+        IEnumerable<double> originalTestValues = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value, Content.ProblemData.TestSamplesStart.Value, Content.ProblemData.TestSamplesEnd.Value);
+        matrix[0, 0] = SimpleMSEEvaluator.Calculate(originalTrainingValues, Content.EstimatedTrainingValues);
+        matrix[0, 1] = SimpleMSEEvaluator.Calculate(originalTestValues, Content.EstimatedTestValues);
+        matrix[1, 0] = SimpleRSquaredEvaluator.Calculate(originalTrainingValues, Content.EstimatedTrainingValues);
+        matrix[1, 1] = SimpleRSquaredEvaluator.Calculate(originalTestValues, Content.EstimatedTestValues);
+        matrix[2, 0] = SimpleMeanAbsolutePercentageErrorEvaluator.Calculate(originalTrainingValues, Content.EstimatedTrainingValues);
+        matrix[2, 1] = SimpleMeanAbsolutePercentageErrorEvaluator.Calculate(originalTestValues, Content.EstimatedTestValues);
+
+        matrixView.Content = matrix;
+      } else
+        matrixView.Content = null;
+    }
   }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs

@@ -36 +36 @@
   [Item("DataAnalysisSolution", "Represents a solution for a data analysis problem which can be visualized in the GUI.")]
   [StorableClass]
-  public abstract class DataAnalysisSolution : NamedItem, IStringConvertibleMatrix {
+  public abstract class DataAnalysisSolution : NamedItem {
     protected DataAnalysisSolution()
       : base() { }
@@ -162 +162 @@
       return clone;
     }
-
-    #region IStringConvertibleMatrix implementation
-    private List<string> rowNames = new List<string>() { "MeanSquaredError", "CoefficientOfDetermination", "MeanAbsolutePercentageError" };
-    private List<string> columnNames = new List<string>() { "Training", "Test" };
-    private double[,] resultValues = new double[3, 2];
-    int IStringConvertibleMatrix.Rows { get { return rowNames.Count; } set { } }
-    int IStringConvertibleMatrix.Columns { get { return columnNames.Count; } set { } }
-    IEnumerable<string> IStringConvertibleMatrix.ColumnNames { get { return columnNames; } set { } }
-    IEnumerable<string> IStringConvertibleMatrix.RowNames { get { return rowNames; } set { } }
-    bool IStringConvertibleMatrix.SortableView { get { return false; } set { } }
-    bool IStringConvertibleMatrix.ReadOnly { get { return true; } }
-
-    string IStringConvertibleMatrix.GetValue(int rowIndex, int columnIndex) {
-      return resultValues[rowIndex, columnIndex].ToString();
-    }
-    bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
-      errorMessage = "This matrix is readonly.";
-      return false;
-    }
-    bool IStringConvertibleMatrix.SetValue(string value, int rowIndex, int columnIndex) { return false; }
-
-    protected void RecalculateResultValues() {
-      IEnumerable<double> originalTrainingValues = problemData.Dataset.GetVariableValues(problemData.TargetVariable.Value, problemData.TrainingSamplesStart.Value, problemData.TrainingSamplesEnd.Value);
-      IEnumerable<double> originalTestValues = problemData.Dataset.GetVariableValues(problemData.TargetVariable.Value, problemData.TestSamplesStart.Value, problemData.TestSamplesEnd.Value);
-      resultValues[0, 0] = SimpleMSEEvaluator.Calculate(originalTrainingValues, EstimatedTrainingValues);
-      resultValues[0, 1] = SimpleMSEEvaluator.Calculate(originalTestValues, EstimatedTestValues);
-      resultValues[1, 0] = SimpleRSquaredEvaluator.Calculate(originalTrainingValues, EstimatedTrainingValues);
-      resultValues[1, 1] = SimpleRSquaredEvaluator.Calculate(originalTestValues, EstimatedTestValues);
-      resultValues[2, 0] = SimpleMeanAbsolutePercentageErrorEvaluator.Calculate(originalTrainingValues, EstimatedTrainingValues);
-      resultValues[2, 1] = SimpleMeanAbsolutePercentageErrorEvaluator.Calculate(originalTestValues, EstimatedTestValues);
-
-      this.OnReset();
-    }
-
-    public event EventHandler ColumnNamesChanged;
-    public event EventHandler RowNamesChanged;
-    public event EventHandler SortableViewChanged;
-    public event EventHandler<EventArgs<int, int>> ItemChanged;
-    public event EventHandler Reset;
-    protected virtual void OnReset() {
-      EventHandler handler = Reset;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
-    }
-    #endregion
   }
 }