[mlpack-git] master: Use BOOST_REQUIRE_* instead of BOOST_CHECK_* (1e1bc6f)

gitdub at mlpack.org gitdub at mlpack.org
Mon Mar 28 11:23:19 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/66cb285dc7d80068ac9ba6a5f40d239f1a6f672d...fb75f38b6a968c928de229c5f4b8c25736e34e84

>---------------------------------------------------------------

commit 1e1bc6fbf9945136d189d434d58c35c88bd685f0
Author: Mikhail Lozhnikov <lozhnikovma at gmail.com>
Date:   Mon Mar 28 18:23:19 2016 +0300

    Use BOOST_REQUIRE_* instead of BOOST_CHECK_*


>---------------------------------------------------------------

1e1bc6fbf9945136d189d434d58c35c88bd685f0
 src/mlpack/tests/cosine_tree_test.cpp | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/mlpack/tests/cosine_tree_test.cpp b/src/mlpack/tests/cosine_tree_test.cpp
index 92365b2..627a8d2 100644
--- a/src/mlpack/tests/cosine_tree_test.cpp
+++ b/src/mlpack/tests/cosine_tree_test.cpp
@@ -119,14 +119,14 @@ BOOST_AUTO_TEST_CASE(CosineNodeCosineSplit)
       if(std::fabs(cosineMax - cosineMax2) < precision)
       {
         // Check with some precision
-	    for (i = 0; i < leftIndices.size(); i++)
-          BOOST_CHECK_LT(cosineMax - cosines(i), cosines(i) - cosineMin + precision);
+        for (i = 0; i < leftIndices.size(); i++)
+          BOOST_REQUIRE_LT(cosineMax - cosines(i), cosines(i) - cosineMin + precision);
 
         for (j = 0, k = i; j < rightIndices.size(); j++, k++)
-          BOOST_CHECK_GT(cosineMax - cosines(k), cosines(k) - cosineMin - precision);
-	  }
-	  else
-	  {
+          BOOST_REQUIRE_GT(cosineMax - cosines(k), cosines(k) - cosineMin - precision);
+      }
+      else
+      {
         size_t numMax1Errors = 0;
         size_t numMax2Errors = 0;
 
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE(CosineNodeCosineSplit)
           if(cosineMax - cosines(k) <= cosines(k) - cosineMin - precision)
             numMax1Errors++;
 
-        // Find errors for cosineMax
+        // Find errors for cosineMax2
         for (i = 0; i < leftIndices.size(); i++)
           if(cosineMax2 - cosines(i) >= cosines(i) - cosineMin + precision)
             numMax2Errors++;
@@ -148,16 +148,8 @@ BOOST_AUTO_TEST_CASE(CosineNodeCosineSplit)
           if(cosineMax2 - cosines(k) <= cosines(k) - cosineMin - precision)
             numMax2Errors++;
 
-        if(numMax1Errors > 0 && numMax2Errors > 0)
-        {
-          // cosineMax and cosineMax2 do not match
-          // we should report the problem
-	      for (i = 0; i < leftIndices.size(); i++)
-            BOOST_CHECK_LT(cosineMax - cosines(i), cosines(i) - cosineMin);
-
-          for (j = 0, k = i; j < rightIndices.size(); j++, k++)
-            BOOST_CHECK_GT(cosineMax - cosines(k), cosines(k) - cosineMin);
-        }
+        //  One of the maximum cosine values should be correct
+        BOOST_REQUIRE_EQUAL(std::min(numMax1Errors,numMax2Errors),0);
       }
     }
   }




More information about the mlpack-git mailing list