Changeset 1068

Timestamp:

12/25/08 13:50:04 (16 years ago)

Author:

gkronber

Message:

fixed #447 (Differential symbol should evaluate to 0 if the previous value is NaN, Inf. or out of range) in CEDMA refactoring branch (#419).

File:

• branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/BakedTreeEvaluator.cs (modified) (1 diff)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/BakedTreeEvaluator.cs

@@ -162 +162 @@
         case EvaluatorSymbolTable.DIFFERENTIAL: {
             int row = sampleIndex + currInstr.i_arg1;
-            if (row < 1 || row >= dataset.Rows) return double.NaN;
-            else return currInstr.d_arg0 * (dataset.GetValue(row, currInstr.i_arg0) - dataset.GetValue(row - 1, currInstr.i_arg0));
+            if (row < 0 || row >= dataset.Rows) return double.NaN;
+            else if (row < 1) return 0.0;
+            else {
+              double prevValue = dataset.GetValue(row - 1, currInstr.i_arg0);
+              if (double.IsNaN(prevValue) || double.IsInfinity(prevValue)) return 0.0;
+              else return currInstr.d_arg0 * (dataset.GetValue(row, currInstr.i_arg0) - prevValue);
+            }
           }
         case EvaluatorSymbolTable.MULTIPLICATION: {