Changeset 9026

Timestamp:

Mar 11, 2012, 9:19:47 PM (12 years ago)

Author:

landauf

Message:

removed obsolete (and wrong for negative values) round() function (exists also in cmath)

Location:

code/branches/testing

Files:

• src/libraries/util/Math.h (modified) (1 diff)
• test/util/MathTest.cc (modified) (2 diffs)

code/branches/testing/src/libraries/util/Math.h

@@ -139 +139 @@
     {
         return x*x*x;
-    }
-
-    /**
-        @brief Rounds the value to the nearest integer.
-    */
-    template <typename T>
-    inline int round(T x)
-    {
-        return static_cast<int>(x + 0.5);
     }
 

code/branches/testing/test/util/MathTest.cc

@@ -148 +148 @@
         EXPECT_DOUBLE_EQ( -3.375, cube(-1.5));
         EXPECT_DOUBLE_EQ( -8.000, cube(-2.0));
-    }
-
-    /////////////
-    // round() //
-    /////////////
-    TEST(round, Positive)
-    {
-        // int
-        EXPECT_EQ( 5, round(5));
-        EXPECT_EQ(10, round(10));
-
-        // double
-        EXPECT_EQ(4, round(4.499));
-        EXPECT_EQ(5, round(4.500));
-        EXPECT_EQ(5, round(4.999));
-        EXPECT_EQ(5, round(5.000));
-        EXPECT_EQ(5, round(5.001));
-        EXPECT_EQ(5, round(5.499));
-        EXPECT_EQ(6, round(5.500));
-    }
-
-    /////////////
-    // round() //
-    /////////////
-    TEST(round, Negative)
-    {
-        // int
-        EXPECT_EQ( -5, round(-5));
-        EXPECT_EQ(-10, round(-10));
-
-        // double
-        EXPECT_EQ(-4, round(-4.499));
-        EXPECT_EQ(-5, round(-4.500));
-        EXPECT_EQ(-5, round(-4.999));
-        EXPECT_EQ(-5, round(-5.000));
-        EXPECT_EQ(-5, round(-5.001));
-        EXPECT_EQ(-5, round(-5.499));
-        EXPECT_EQ(-6, round(-5.500));
     }
 
@@ -240 +202 @@
         EXPECT_DOUBLE_EQ(0.0, zeroise<double>());
         EXPECT_EQ("", zeroise<std::string>());
-//        EXPECT_EQ(Vector3::ZERO, zeroise<Vector3>());
+        EXPECT_EQ(Vector3::ZERO, zeroise<Vector3>());
     }