[mlpack-svn] r10515 - mlpack/trunk/src/mlpack/tests

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2011-12-02 15:08:42 -0500 (Fri, 02 Dec 2011)
New Revision: 10515

Modified:
   mlpack/trunk/src/mlpack/tests/emst_test.cpp
Log:
Formatting fix, and prune CLI from the internals of DTB.


Modified: mlpack/trunk/src/mlpack/tests/emst_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/emst_test.cpp	2011-12-02 20:03:31 UTC (rev 10514)
+++ mlpack/trunk/src/mlpack/tests/emst_test.cpp	2011-12-02 20:08:42 UTC (rev 10515)
@@ -110,10 +110,8 @@
   dtb.ComputeMST(dual_results);
 
   // Set naive mode.
-  CLI::GetParam<bool>("naive/do_naive") = true;
-
   DualTreeBoruvka dtb_naive;
-  dtb_naive.Init(naive_data);
+  dtb_naive.Init(naive_data, true);
 
   arma::mat naive_results;
   dtb_naive.ComputeMST(naive_results);
@@ -123,9 +121,9 @@
 
   for (size_t i = 0; i < dual_results.n_rows; i++)
   {
-    BOOST_REQUIRE(dual_results(i,0) == naive_results(i,0));
-    BOOST_REQUIRE(dual_results(i,1) == naive_results(i,1));
-    BOOST_REQUIRE_CLOSE(dual_results(i,2), naive_results(i,2), 1e-5);
+    BOOST_REQUIRE(dual_results(i, 0) == naive_results(i, 0));
+    BOOST_REQUIRE(dual_results(i, 1) == naive_results(i, 1));
+    BOOST_REQUIRE_CLOSE(dual_results(i, 2), naive_results(i, 2), 1e-5);
   }
 }