Changeset 7707

Timestamp:

04/05/12 10:28:47 (13 years ago)

Author:

gkronber

Message:

#1810 fixed issues with newly added symbols to fix unit tests

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/FullFunctionalExpressionGrammar.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/FullFunctionalExpressionGrammar.cs

@@ -62 +62 @@
       sqrt.InitialFrequency = 0.0;
       var airyA = new AiryA();
+      airyA.InitialFrequency = 0.0;
       var airyB = new AiryB();
+      airyB.InitialFrequency = 0.0;
       var bessel = new Bessel();
+      bessel.InitialFrequency = 0.0;
       var cosineIntegral = new CosineIntegral();
+      cosineIntegral.InitialFrequency = 0.0;
       var dawson = new Dawson();
+      dawson.InitialFrequency = 0.0;
       var erf = new Erf();
+      erf.InitialFrequency = 0.0;
       var expIntegralEi = new ExponentialIntegralEi();
+      expIntegralEi.InitialFrequency = 0.0;
       var fresnelCosineIntegral = new FresnelCosineIntegral();
+      fresnelCosineIntegral.InitialFrequency = 0.0;
       var fresnelSineIntegral = new FresnelSineIntegral();
+      fresnelSineIntegral.InitialFrequency = 0.0;
       var gamma = new Gamma();
+      gamma.InitialFrequency = 0.0;
       var hypCosineIntegral = new HyperbolicCosineIntegral();
+      hypCosineIntegral.InitialFrequency = 0.0;
       var hypSineIntegral = new HyperbolicSineIntegral();
+      hypSineIntegral.InitialFrequency = 0.0;
       var norm = new Norm();
+      norm.InitialFrequency = 0.0;
       var psi = new Psi();
+      psi.InitialFrequency = 0.0;
       var sineIntegral = new SineIntegral();
+      sineIntegral.InitialFrequency = 0.0;
 
       var exp = new Exponential();

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

@@ -370 +370 @@
             var x = Evaluate(dataset, ref row, state);
             if (double.IsNaN(x)) return double.NaN;
-            else if (x.IsAlmost(0.0)) return 0.0;
-            else if (x.IsAlmost(-1.0)) return 0.0;
+            else if (x.IsAlmost(0.0)) return double.NaN;
+            else if ((Math.Floor(x) - x).IsAlmost(-1.0)) return double.NaN;
             return alglib.psi(x);
           }

trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs

@@ -56 +56 @@
     [TestMethod]
     public void SymbolicDataAnalysisExpressionTreeInterpreterArithmeticGrammarPerformanceTest() {
-      FullGrammarPerformanceTest(new SymbolicDataAnalysisExpressionTreeInterpreter(), 12.5e6);
+      ArithmeticGrammarPerformanceTest(new SymbolicDataAnalysisExpressionTreeInterpreter(), 12.5e6);
     }
 
@@ -65 +65 @@
     [TestMethod]
     public void SymbolicDataAnalysisExpressionTreeILEmittingInterpreterArithmeticGrammarPerformanceTest() {
-      FullGrammarPerformanceTest(new SymbolicDataAnalysisExpressionTreeILEmittingInterpreter(), 7.5e6);
+      ArithmeticGrammarPerformanceTest(new SymbolicDataAnalysisExpressionTreeILEmittingInterpreter(), 7.5e6);
     }