Changeset 1003Tweet

Timestamp:

Oct 3, 2011, 1:36:31 AM (11 years ago)

Author:

sam

Message:

core: implement round() and fmod() for real numbers.

Location:

trunk

Files:

• src/real.cpp (modified) (1 diff)
• src/real.h (modified) (1 diff)
• test/unit/real.cpp (modified) (2 diffs)

trunk/src/real.cpp

@@ -684 +684 @@
     else
         return ret + real::R_1;
+}
+
+real round(real const &x)
+{
+    if (x < real::R_0)
+        return -round(-x);
+
+    return floor(x + (real::R_1 >> 1));
+}
+
+real fmod(real const &x, real const &y)
+{
+    if (!y)
+        return real::R_0; /* FIXME: return NaN */
+
+    if (!x)
+        return x;
+
+    real tmp = round(x / y);
+    return x - tmp * y;
 }
 

trunk/src/real.h

@@ -72 +72 @@
     friend real floor(real const &x);
     friend real ceil(real const &x);
+    friend real round(real const &x);
+    friend real fmod(real const &x, real const &y);
 
     friend real sin(real const &x);

trunk/test/unit/real.cpp

@@ -258 +258 @@
     }
 
-    LOLUNIT_TEST(FloorCeil)
+    LOLUNIT_TEST(FloorCeilEtc)
     {
         double tests[] =
         {
-            -2.0,  -2.0, -2.0,
-            -1.5,  -2.0, -1.0,
-            -1.0,  -1.0, -1.0,
-            -0.0,  -0.0, -0.0,
-             0.0,   0.0,  0.0,
-             0.25,  0.0,  1.0,
-             0.375, 0.0,  1.0,
-             0.5,   0.0,  1.0,
-             1.0,   1.0,  1.0,
-             1.5,   1.0,  2.0,
-             2.0,   2.0,  2.0,
-             2.5,   2.0,  3.0,
-             3.0,   3.0,  3.0,
-            8192.0,     8192.0, 8192.0,
-            8192.03125, 8192.0, 8193.0,
-            8192.5,     8192.0, 8193.0,
-            8193.0,     8193.0, 8193.0,
-            549755813888.0,     549755813888.0, 549755813888.0,
-            549755813888.03125, 549755813888.0, 549755813889.0,
-            549755813888.5,     549755813888.0, 549755813889.0,
-            549755813889.0,     549755813889.0, 549755813889.0,
+            -2.0,  -2.0, -2.0,  -2.0,
+            -1.5,  -2.0, -1.0,  -2.0,
+            -1.0,  -1.0, -1.0,  -1.0,
+            -0.0,  -0.0, -0.0,  -0.0,
+             0.0,   0.0,  0.0,   0.0,
+             0.25,  0.0,  1.0,   0.0,
+             0.375, 0.0,  1.0,   0.0,
+             0.5,   0.0,  1.0,   1.0,
+             1.0,   1.0,  1.0,   1.0,
+             1.5,   1.0,  2.0,   2.0,
+             2.0,   2.0,  2.0,   2.0,
+             2.5,   2.0,  3.0,   3.0,
+             3.0,   3.0,  3.0,   3.0,
+            8192.0,     8192.0, 8192.0, 8192.0,
+            8192.03125, 8192.0, 8193.0, 8192.0,
+            8192.5,     8192.0, 8193.0, 8193.0,
+            8193.0,     8193.0, 8193.0, 8193.0,
+            549755813888.0,     549755813888.0, 549755813888.0, 549755813888.0,
+            549755813888.03125, 549755813888.0, 549755813889.0, 549755813888.0,
+            549755813888.5,     549755813888.0, 549755813889.0, 549755813889.0,
+            549755813889.0,     549755813889.0, 549755813889.0, 549755813889.0,
         };
 
-        for (unsigned int n = 0; n < sizeof(tests) / sizeof(*tests); n += 3)
+        for (unsigned int n = 0; n < sizeof(tests) / sizeof(*tests); n += 4)
         {
             double a0 = floor((real)tests[n]);
@@ -291 +291 @@
             double a1 = ceil((real)tests[n]);
             double b1 = tests[n + 2];
+            double a2 = round((real)tests[n]);
+            double b2 = tests[n + 3];
 
             LOLUNIT_ASSERT_EQUAL(b0, a0);
             LOLUNIT_ASSERT_EQUAL(b1, a1);
+            LOLUNIT_ASSERT_EQUAL(b2, a2);
         }
     }