Changeset 5849 for trunk/sources

Timestamp:

03/28/11 18:40:02 (14 years ago)

Author:

gkronber

Message:

#1418 fixed bug in threshold calculation and added missing wiring of model changed event in DiscriminantFunctionClassificationSolution.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification

Files:

• DiscriminantFunctionClassificationSolution.cs (modified) (1 diff)
• ThresholdCalculators/NormalDistributionCutPointsThresholdCalculator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolution.cs

@@ -102 +102 @@
     }
     protected virtual void OnModelThresholdsChanged(EventArgs e) {
-      RecalculateResults();
+      base.OnModelChanged(e);
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/NormalDistributionCutPointsThresholdCalculator.cs

@@ -100 +100 @@
 
         // determine class with maximal probability density in m
-        double maxDensity = 0;
+        double maxDensity = double.MinValue;
         double maxDensityClassValue = -1;
         foreach (var classValue in originalClasses) {
@@ -136 +136 @@
 
     private static double NormalDensity(double x, double mu, double sigma) {
-      return (1.0 / Math.Sqrt(2.0 * Math.PI * sigma * sigma)) * Math.Exp(-((x - mu) * (x - mu)) / (2.0 * sigma * sigma));
+      if (sigma.IsAlmost(0.0)) {
+        if (x.IsAlmost(mu)) return 1.0; else return 0.0;
+      } else {
+        return (1.0 / Math.Sqrt(2.0 * Math.PI * sigma * sigma)) * Math.Exp(-((x - mu) * (x - mu)) / (2.0 * sigma * sigma));
+      }
     }