Changeset 170 for trunk/sources

Timestamp:

04/23/08 12:06:58 (16 years ago)

Author:

gkronber

Message:

small improvement for MCCEvaluator (ticket #69)

File:

• trunk/sources/HeuristicLab.StructureIdentification/Evaluation/MCCEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.StructureIdentification/Evaluation/MCCEvaluator.cs

@@ -38 +38 @@
     }
 
-    double limit = 50.0;
     public MCCEvaluator()
       : base() {
+      AddVariableInfo(new VariableInfo("ClassSeparation", "The value of separation between negative and positive target classification values (for instance 0.5 if negative=0 and positive=1).", typeof(DoubleData), VariableKind.In));
     }
 
     public override double Evaluate(IScope scope, IFunctionTree functionTree, int targetVariable, Dataset dataset) {
+      double limit = GetVariableValue<DoubleData>("ClassSeparation", scope, false).Data;
       double[] estimated = new double[dataset.Rows];
       double[] original = new double[dataset.Rows];
@@ -65 +66 @@
       }
       Array.Sort(estimated, original);
-      double best_mcc = 0.0;
+      double best_mcc = -1.0;
       double tp = 0;
       double fn = positive;
@@ -76 +77 @@
           tn--; fp++;
         }
-        double mcc = (tp * tn - fp * fn) / Math.Sqrt((tp + fp) * (tp + fn) * (tn + fp) * (tn + fn));
+        double mcc = (tp * tn - fp * fn) / Math.Sqrt(positive * (tp + fn) * (tn + fp) * negative);
         if(best_mcc < mcc) {
           best_mcc = mcc;