Changeset 712 for trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/AccuracyEvaluator.cs

Timestamp:

11/05/08 21:34:12 (15 years ago)

Author:

gkronber

Message:

fixed a stupid mistake introduced with r702 #328 (GP evaluation doesn't work in a thread parallel engine).

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/AccuracyEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification.Classification/AccuracyEvaluator.cs

@@ -45 +45 @@
     public override void Evaluate(IScope scope, BakedTreeEvaluator evaluator, Dataset dataset, int targetVariable, double[] classes, double[] thresholds, int start, int end) {
       DoubleData accuracy = GetVariableValue<DoubleData>("Accuracy", scope, false, false);
-      if(accuracy == null) {
+      if (accuracy == null) {
         accuracy = new DoubleData();
         scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("Accuracy"), accuracy));
@@ -52 +52 @@
       int nSamples = end - start;
       int nCorrect = 0;
-      for(int sample = start; sample < end; sample++) {
+      for (int sample = start; sample < end; sample++) {
         double est = evaluator.Evaluate(sample);
-        double origClass = dataset.GetValue(targetVariable, sample);
+        double origClass = dataset.GetValue(sample, targetVariable);
         double estClass = double.NaN;
         // if estimation is lower than the smallest threshold value -> estimated class is the lower class
-        if(est < thresholds[0]) estClass = classes[0];
+        if (est < thresholds[0]) estClass = classes[0];
         // if estimation is larger (or equal) than the largest threshold value -> estimated class is the upper class
-        else if(est >= thresholds[thresholds.Length - 1]) estClass = classes[classes.Length - 1];
+        else if (est >= thresholds[thresholds.Length - 1]) estClass = classes[classes.Length - 1];
         else {
           // otherwise the estimated class is the class which upper threshold is larger than the estimated value
-          for(int k = 0; k < thresholds.Length; k++) {
-            if(thresholds[k] > est) {
+          for (int k = 0; k < thresholds.Length; k++) {
+            if (thresholds[k] > est) {
               estClass = classes[k];
               break;
@@ -69 +69 @@
           }
         }
-        if(Math.Abs(estClass - origClass) < EPSILON) nCorrect++;
+        if (Math.Abs(estClass - origClass) < EPSILON) nCorrect++;
       }
       accuracy.Data = nCorrect / (double)nSamples;