Changeset 1916

Timestamp:

05/27/09 17:04:48 (16 years ago)

Author:

mkommend

Message:

corrected bug with total evaluated nodes; skipped samples were also counted (ticket #515)

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3

Files:

• ConditionalEvaluatorBase.cs (modified) (4 diffs)
• ConditionalSimpleEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3/ConditionalEvaluatorBase.cs

@@ -45 +45 @@
       int conditionVariable = GetVariableValue<IntData>("ConditionVariable", scope, true).Data;
 
+      int skippedSampels = 0;
       // store original and estimated values in a double array
       double[,] values = new double[end - start, 2];
@@ -51 +52 @@
         bool skip = false;
         for (int checkIndex = sample + minTimeOffset; checkIndex <= sample + maxTimeOffset && !skip ; checkIndex++) {
-          if (dataset.GetValue(checkIndex, conditionVariable) == 0)
+          if (dataset.GetValue(checkIndex, conditionVariable) == 0) {
             skip = true;
+            skippedSampels++;
+          }
         }
         if (!skip) {
@@ -65 +68 @@
       }
 
+
       // calculate quality value
       double quality = Evaluate(values);
@@ -74 +78 @@
       }
       qualityData.Data = quality;
+      scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data -= skippedSampels; 
     }
 

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3/ConditionalSimpleEvaluator.cs

@@ -53 +53 @@
       int minTimeOffset = GetVariableValue<IntData>("MinTimeOffset", scope, true).Data;
       int conditionVariable = GetVariableValue<IntData>("ConditionVariable", scope, true).Data;
+      int skippedSampels = 0;
 
       for (int sample = start; sample < end; sample++) {
@@ -58 +59 @@
         bool skip = false;
         for (int checkIndex = sample + minTimeOffset; checkIndex <= sample + maxTimeOffset && !skip ; checkIndex++) {
-          if (dataset.GetValue(checkIndex, conditionVariable) == 0)
+          if (dataset.GetValue(checkIndex, conditionVariable) == 0) {
             skip = true;
+            skippedSampels++;
+          }
         }
         if (!skip) {
@@ -73 +76 @@
         }
       }
+      scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data -= skippedSampels; 
     }
   }