Changeset 8123 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

06/26/12 14:17:10 (12 years ago)

Author:

gkronber

Message:

#1810 added a unit test to check the evaluation of newly added special functions and fixed a bugs in the interpreters.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs (modified) (2 diffs)
• SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs

@@ -837 +837 @@
     public static double Psi(double x) {
       if (double.IsNaN(x)) return double.NaN;
-      else if (x.IsAlmost(0.0)) return double.NaN;
-      else if ((Math.Floor(x) - x).IsAlmost(0.0)) return double.NaN;
+      else if (x <= 0 && (Math.Floor(x) - x).IsAlmost(0)) return double.NaN;
       return alglib.psi(x);
     }
@@ -865 +864 @@
       double shi, chi;
       alglib.hyperbolicsinecosineintegrals(x, out shi, out chi);
-      return chi;
+      return shi;
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs

@@ -198 +198 @@
       { typeof(Norm), OpCodes.Norm},
       { typeof(Erf), OpCodes.Erf},
-      { typeof(Bessel), OpCodes.Bessel}      
+      { typeof(Bessel), OpCodes.Bessel}
     };
 
@@ -370 +370 @@
             var x = Evaluate(dataset, ref row, state);
             if (double.IsNaN(x)) return double.NaN;
-            else if (x.IsAlmost(0.0)) return double.NaN;
-            else if ((Math.Floor(x) - x).IsAlmost(0)) return double.NaN;
+            else if (x <= 0 && (Math.Floor(x) - x).IsAlmost(0)) return double.NaN;
             return alglib.psi(x);
           }