Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs
- Timestamp:
- 07/03/12 16:46:35 (12 years ago)
- Location:
- branches/GP-MoveOperators
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GP-MoveOperators
- Property svn:mergeinfo changed
/trunk/sources merged: 8084,8088-8090,8092-8100,8102-8113,8115,8117-8132,8134-8146,8148-8156,8158-8160,8163-8170,8173-8176,8178-8190,8192-8205
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs
r7708 r8206 198 198 { typeof(Norm), OpCodes.Norm}, 199 199 { typeof(Erf), OpCodes.Erf}, 200 { typeof(Bessel), OpCodes.Bessel} 200 { typeof(Bessel), OpCodes.Bessel} 201 201 }; 202 202 … … 370 370 var x = Evaluate(dataset, ref row, state); 371 371 if (double.IsNaN(x)) return double.NaN; 372 else if (x.IsAlmost(0.0)) return double.NaN; 373 else if ((Math.Floor(x) - x).IsAlmost(0)) return double.NaN; 372 else if (x <= 0 && (Math.Floor(x) - x).IsAlmost(0)) return double.NaN; 374 373 return alglib.psi(x); 375 374 }
Note: See TracChangeset
for help on using the changeset viewer.