Changeset 1893 for trunk/testTweet

Timestamp:

Sep 9, 2012, 4:55:26 PM (8 years ago)

Author:

sam

Message:

math: refactor real number constant declarations so that they are only
computed on demand with static initialisation.

Location:

trunk/test

Files:

• math/pi.cpp (modified) (1 diff)
• math/poly.cpp (modified) (2 diffs)
• unit/real.cpp (modified) (6 diffs)

trunk/test/math/pi.cpp

@@ -24 +24 @@
 int main(int argc, char **argv)
 {
-    printf("Pi: "); real::R_PI.print();
-    printf("e: "); real::R_E.print();
-    printf("ln(2): "); real::R_LN2.print();
-    printf("sqrt(2): "); real::R_SQRT2.print();
-    printf("sqrt(1/2): "); real::R_SQRT1_2.print();
+    printf("Pi: "); real::R_PI().print();
+    printf("e: "); real::R_E().print();
+    printf("ln(2): "); real::R_LN2().print();
+    printf("sqrt(2): "); real::R_SQRT2().print();
+    printf("sqrt(1/2): "); real::R_SQRT1_2().print();
 
     /* Gauss-Legendre computation of Pi -- doesn't work well at all,

trunk/test/math/poly.cpp

@@ -85 +85 @@
 {
     return lol_sin(f);
-    //static float const k = (float)real::R_2_PI;
+    //static float const k = (float)real::R_2_PI();
 
     //f *= k;
@@ -120 +120 @@
 
 printf("-- START --\n");
-    for (flint u = { (float)real::R_PI_2 }; u.f > 1e-30; u.x -= 1)
+    for (flint u = { (float)real::R_PI_2() }; u.f > 1e-30; u.x -= 1)
     {
         union { float f; uint32_t x; } s1 = { sinf(adjustf(u.f, 0)) };

trunk/test/unit/real.cpp

@@ -25 +25 @@
     LOLUNIT_TEST(Constants)
     {
-        double a0 = real::R_0;
-        double a1 = real::R_1;
-        double a2 = real::R_2;
-        double a10 = real::R_10;
+        double a0 = real::R_0();
+        double a1 = real::R_1();
+        double a2 = real::R_2();
+        double a10 = real::R_10();
 
         LOLUNIT_ASSERT_EQUAL(a0, 0.0);
@@ -35 +35 @@
         LOLUNIT_ASSERT_EQUAL(a10, 10.0);
 
-        double b1 = log(real::R_E);
-        double b2 = log2(real::R_2);
+        double b1 = log(real::R_E());
+        double b2 = log2(real::R_2());
         LOLUNIT_ASSERT_EQUAL(b1, 1.0);
         LOLUNIT_ASSERT_EQUAL(b2, 1.0);
 
-        double c1 = exp(re(real::R_LOG2E));
-        double c2 = log(exp2(real::R_LOG2E));
+        double c1 = exp(re(real::R_LOG2E()));
+        double c2 = log(exp2(real::R_LOG2E()));
         LOLUNIT_ASSERT_EQUAL(c1, 2.0);
         LOLUNIT_ASSERT_EQUAL(c2, 1.0);
 
-        double d1 = exp(re(real::R_LOG10E));
+        double d1 = exp(re(real::R_LOG10E()));
         LOLUNIT_ASSERT_EQUAL(d1, 10.0);
 
-        double e1 = exp(real::R_LN2);
+        double e1 = exp(real::R_LN2());
         LOLUNIT_ASSERT_EQUAL(e1, 2.0);
 
-        double f1 = exp(real::R_LN10);
+        double f1 = exp(real::R_LN10());
         LOLUNIT_ASSERT_EQUAL(f1, 10.0);
 
-        double g1 = sin(real::R_PI);
-        double g2 = cos(real::R_PI);
+        double g1 = sin(real::R_PI());
+        double g2 = cos(real::R_PI());
         LOLUNIT_ASSERT_DOUBLES_EQUAL(g1, 0.0, 1e-100);
         LOLUNIT_ASSERT_EQUAL(g2, -1.0);
 
-        double h1 = sin(real::R_PI_2);
-        double h2 = cos(real::R_PI_2);
+        double h1 = sin(real::R_PI_2());
+        double h2 = cos(real::R_PI_2());
         LOLUNIT_ASSERT_EQUAL(h1, 1.0);
         LOLUNIT_ASSERT_DOUBLES_EQUAL(h2, 0.0, 1e-100);
 
-        double i1 = sin(real::R_PI_4) * sin(real::R_PI_4);
-        double i2 = cos(real::R_PI_4) * cos(real::R_PI_4);
+        double i1 = sin(real::R_PI_4()) * sin(real::R_PI_4());
+        double i2 = cos(real::R_PI_4()) * cos(real::R_PI_4());
         LOLUNIT_ASSERT_EQUAL(i1, 0.5);
         LOLUNIT_ASSERT_EQUAL(i2, 0.5);
@@ -219 +219 @@
     LOLUNIT_TEST(ExactDivision)
     {
-        float m1 = real::R_1 / real::R_1;
-        float m2 = real::R_2 / real::R_1;
-        float m3 = real::R_1 / real::R_2;
-        float m4 = real::R_2 / real::R_2;
-        float m5 = real::R_1 / -real::R_2;
+        float m1 = real::R_1() / real::R_1();
+        float m2 = real::R_2() / real::R_1();
+        float m3 = real::R_1() / real::R_2();
+        float m4 = real::R_2() / real::R_2();
+        float m5 = real::R_1() / -real::R_2();
 
         LOLUNIT_ASSERT_EQUAL(m1, 1.0f);
@@ -236 +236 @@
         /* 1 / 3 * 3 should be close to 1... check that it does not differ
          * by more than 2^-k where k is the number of bits in the mantissa. */
-        real a = real::R_1 / real::R_3 * real::R_3;
-        real b = ldexp(real::R_1 - a, real::BIGITS * real::BIGIT_BITS);
+        real a = real::R_1() / real::R_3() * real::R_3();
+        real b = ldexp(real::R_1() - a, real::BIGITS * real::BIGIT_BITS);
 
         LOLUNIT_ASSERT_LEQUAL((double)fabs(b), 1.0);
@@ -260 +260 @@
     LOLUNIT_TEST(Ulp)
     {
-        real a1 = real::R_PI;
+        real a1 = real::R_PI();
 
         LOLUNIT_ASSERT_NOT_EQUAL((double)(a1 + ulp(a1) - a1), 0.0);
@@ -347 +347 @@
     LOLUNIT_TEST(Pow)
     {
-        double a1 = pow(-real::R_2, real::R_2);
+        double a1 = pow(-real::R_2(), real::R_2());
         double b1 = 4.0;
         LOLUNIT_ASSERT_DOUBLES_EQUAL(a1, b1, 1.0e-13);
 
-        double a2 = pow(-real::R_2, real::R_3);
+        double a2 = pow(-real::R_2(), real::R_3());
         double b2 = -8.0;
         LOLUNIT_ASSERT_DOUBLES_EQUAL(a2, b2, 1.0e-13);