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

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

Author: rcurtin
Date: 2011-12-14 05:53:18 -0500 (Wed, 14 Dec 2011)
New Revision: 10765

Modified:
   mlpack/trunk/src/mlpack/tests/emst_test.cpp
   mlpack/trunk/src/mlpack/tests/union_find_test.cpp
Log:
Refactoring of EMST/UnionFind API.


Modified: mlpack/trunk/src/mlpack/tests/emst_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/emst_test.cpp	2011-12-14 10:53:00 UTC (rev 10764)
+++ mlpack/trunk/src/mlpack/tests/emst_test.cpp	2011-12-14 10:53:18 UTC (rev 10765)
@@ -38,8 +38,7 @@
   // Now perform the actual calculation.
   arma::mat results;
 
-  DualTreeBoruvka dtb;
-  dtb.Init(data);
+  DualTreeBoruvka<> dtb(data);
   dtb.ComputeMST(results);
 
   // Now the exhaustive check for correctness.
@@ -103,15 +102,13 @@
   arma::mat naive_data = arma::trans(input_data);
 
   // Reset parameters from last test.
-  DualTreeBoruvka dtb;
-  dtb.Init(dual_data);
+  DualTreeBoruvka<> dtb(dual_data);
 
   arma::mat dual_results;
   dtb.ComputeMST(dual_results);
 
   // Set naive mode.
-  DualTreeBoruvka dtb_naive;
-  dtb_naive.Init(naive_data, true);
+  DualTreeBoruvka<> dtb_naive(naive_data, true);
 
   arma::mat naive_results;
   dtb_naive.ComputeMST(naive_results);

Modified: mlpack/trunk/src/mlpack/tests/union_find_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/union_find_test.cpp	2011-12-14 10:53:00 UTC (rev 10764)
+++ mlpack/trunk/src/mlpack/tests/union_find_test.cpp	2011-12-14 10:53:18 UTC (rev 10765)
@@ -17,8 +17,7 @@
 BOOST_AUTO_TEST_CASE(TestFind)
 {
   static const size_t test_size_ = 10;
-  UnionFind test_union_find_;
-  test_union_find_.Init(test_size_);
+  UnionFind test_union_find_(test_size_);
 
   for (size_t i = 0; i < test_size_; i++)
     BOOST_REQUIRE(test_union_find_.Find(i) == i);
@@ -32,8 +31,7 @@
 BOOST_AUTO_TEST_CASE(TestUnion)
 {
   static const size_t test_size_ = 10;
-  UnionFind test_union_find_;
-  test_union_find_.Init(test_size_);
+  UnionFind test_union_find_(test_size_);
 
   test_union_find_.Union(0, 1);
   test_union_find_.Union(2, 3);