Changeset 6415 for branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis

Timestamp:

06/15/11 23:02:01 (14 years ago)

Author:

mkommend

Message:

#1479: Merged trunk changes, refactored grammar editor and added copy functionality.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Files:

• Classification/ClassificationSolution.cs (modified) (3 diffs)
• Classification/DiscriminantFunctionClassificationSolution.cs (modified) (5 diffs)
• Clustering/ClusteringSolution.cs (modified) (1 diff)
• DataAnalysisSolution.cs (modified) (3 diffs)
• Regression/RegressionSolution.cs (modified) (3 diffs)

branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolution.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -66 +65 @@
       Add(new Result(TrainingAccuracyResultName, "Accuracy of the model on the training partition (percentage of correctly classified instances).", new PercentValue()));
       Add(new Result(TestAccuracyResultName, "Accuracy of the model on the test partition (percentage of correctly classified instances).", new PercentValue()));
-      RecalculateResults();
+      CalculateResults();
     }
 
@@ -73 +72 @@
     }
 
-    protected override void OnProblemDataChanged(EventArgs e) {
-      base.OnProblemDataChanged(e);
-      RecalculateResults();
+    protected override void RecalculateResults() {
+      CalculateResults();
     }
 
-    protected override void OnModelChanged(EventArgs e) {
-      base.OnModelChanged(e);
-      RecalculateResults();
-    }
-
-    protected void RecalculateResults() {
+    private void CalculateResults() {
       double[] estimatedTrainingClassValues = EstimatedTrainingClassValues.ToArray(); // cache values
       IEnumerable<double> originalTrainingClassValues = ProblemData.Dataset.GetEnumeratedVariableValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes);

branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolution.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -89 +89 @@
       Add(new Result(TrainingRSquaredResultName, "Squared Pearson's correlation coefficient of the model output and the actual values on the training partition", new DoubleValue()));
       Add(new Result(TestRSquaredResultName, "Squared Pearson's correlation coefficient of the model output and the actual values on the test partition", new DoubleValue()));
+      SetAccuracyMaximizingThresholds();
+
+      //mkommend: important to recalculate accuracy because during the calculation before no thresholds were present     
+      base.RecalculateResults();
+      CalculateResults();
       RegisterEventHandler();
-      SetAccuracyMaximizingThresholds();
-      RecalculateResults();
     }
 
@@ -99 +102 @@
     }
 
-    protected new void RecalculateResults() {
+    protected override void OnModelChanged(EventArgs e) {
+      DeregisterEventHandler();
+      SetAccuracyMaximizingThresholds();
+      RegisterEventHandler();
+      base.OnModelChanged(e);
+    }
+
+    protected override void RecalculateResults() {
+      base.RecalculateResults();
+      CalculateResults();
+    }
+
+    private void CalculateResults() {
       double[] estimatedTrainingValues = EstimatedTrainingValues.ToArray(); // cache values
       IEnumerable<double> originalTrainingValues = ProblemData.Dataset.GetEnumeratedVariableValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes);
@@ -119 +134 @@
     private void RegisterEventHandler() {
       Model.ThresholdsChanged += new EventHandler(Model_ThresholdsChanged);
+    }
+    private void DeregisterEventHandler() {
+      Model.ThresholdsChanged -= new EventHandler(Model_ThresholdsChanged);
     }
     private void Model_ThresholdsChanged(object sender, EventArgs e) {
@@ -142 +160 @@
     }
 
-    protected override void OnModelChanged(EventArgs e) {
-      base.OnModelChanged(e);
-      SetAccuracyMaximizingThresholds();
-      RecalculateResults();
-    }
-
-    protected override void OnProblemDataChanged(EventArgs e) {
-      base.OnProblemDataChanged(e);
-      SetAccuracyMaximizingThresholds();
-      RecalculateResults();
-    }
     protected virtual void OnModelThresholdsChanged(EventArgs e) {
-      base.OnModelChanged(e);
       RecalculateResults();
     }

branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringSolution.cs

@@ -45 +45 @@
     }
 
+    protected override void RecalculateResults() {
+    }
+
     #region IClusteringSolution Members
 

branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisSolution.cs

@@ -86 +86 @@
     }
 
+    protected abstract void RecalculateResults();
+
     private void ProblemData_Changed(object sender, EventArgs e) {
       OnProblemDataChanged(e);
@@ -92 +94 @@
     public event EventHandler ModelChanged;
     protected virtual void OnModelChanged(EventArgs e) {
+      RecalculateResults();
       var listeners = ModelChanged;
       if (listeners != null) listeners(this, e);
@@ -98 +101 @@
     public event EventHandler ProblemDataChanged;
     protected virtual void OnProblemDataChanged(EventArgs e) {
+      RecalculateResults();
       var listeners = ProblemDataChanged;
       if (listeners != null) listeners(this, e);

branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -110 +109 @@
       Add(new Result(TestNormalizedMeanSquaredErrorResultName, "Normalized mean of squared errors of the model on the test partition", new DoubleValue()));
 
-      RecalculateResults();
+      CalculateResults();
     }
 
@@ -117 +116 @@
     }
 
-    protected override void OnProblemDataChanged(EventArgs e) {
-      RecalculateResults();
-      base.OnProblemDataChanged(e);
-    }
-    protected override void OnModelChanged(EventArgs e) {
-      RecalculateResults();
-      base.OnModelChanged(e);
+    protected override void RecalculateResults() {
+      CalculateResults();
     }
 
-    protected void RecalculateResults() {
+    private void CalculateResults() {
       double[] estimatedTrainingValues = EstimatedTrainingValues.ToArray(); // cache values
       IEnumerable<double> originalTrainingValues = ProblemData.Dataset.GetEnumeratedVariableValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes);