Changeset 3916 for trunk/sources

Timestamp:

06/11/10 14:14:01 (15 years ago)

Author:

mkommend

Message:

added ResultsView for DataAnalysisSolutions and implemented IStringConvertibleMatrix in DataAnalysisSolution (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/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/LineChartView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/ResultsView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/ResultsView.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs (modified) (4 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/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj

@@ -92 +92 @@
       <DependentUpon>DataAnalysisSolutionView.cs</DependentUpon>
     </Compile>
+    <Compile Include="ResultsView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ResultsView.Designer.cs">
+      <DependentUpon>ResultsView.cs</DependentUpon>
+    </Compile>
     <Compile Include="SupportVectorRegressionSolutionView.cs">
       <SubType>UserControl</SubType>

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

@@ -43 +43 @@
     public new DataAnalysisSolution Content {
       get { return (DataAnalysisSolution)base.Content; }
-      set {
-        base.Content = value;
-      }
+      set { base.Content = value; }
     }
 
@@ -94 +92 @@
       Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
     }
-
     protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
@@ -101 +98 @@
     }
 
-    void Content_ProblemDataChanged(object sender, EventArgs e) {
+    private void Content_ProblemDataChanged(object sender, EventArgs e) {
       RedrawChart();
     }
 
-    void Content_EstimatedValuesChanged(object sender, EventArgs e) {
+    private void Content_EstimatedValuesChanged(object sender, EventArgs e) {
       UpdateEstimatedValuesLineChart();
     }

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

@@ -28 +28 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Problems.DataAnalysis.Evaluators;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -35 +36 @@
   [Item("DataAnalysisSolution", "Represents a solution for a data analysis problem which can be visualized in the GUI.")]
   [StorableClass]
-  public abstract class DataAnalysisSolution : NamedItem {
+  public abstract class DataAnalysisSolution : NamedItem, IStringConvertibleMatrix {
     protected DataAnalysisSolution()
       : base() { }
@@ -144 +145 @@
     public event EventHandler EstimatedValuesChanged;
     protected virtual void OnEstimatedValuesChanged() {
+      RecalculateResultValues();
       var listeners = EstimatedValuesChanged;
       if (listeners != null)
@@ -160 +162 @@
       return clone;
     }
+
+    #region IStringConvertibleMatrix implementation
+    private List<string> rowNames = new List<string>() { "MeanSquaredError", "CoefficientOfDetermination" };
+    private List<string> columnNames = new List<string>() { "Training", "Test" };
+    private double[,] resultValues = new double[2, 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);
+      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
   }
 }