add callback for tracking analysis progress

[mussa.git] / alg / test / test_nway.cpp

diff --git a/alg/test/test_nway.cpp b/alg/test/test_nway.cpp
index 1c63a4a9681af26cdcc8883f3a377ed75c960b41..4131f83ab3c1ac65a86b71825f586efd97c62927 100644 (file)
--- a/alg/test/test_nway.cpp
+++ b/alg/test/test_nway.cpp
@@ -22,7 +22,9 @@ BOOST_AUTO_TEST_CASE( nway_null )
   analysis.add_a_seq(s0);
   analysis.add_a_seq(s1);
   analysis.add_a_seq(s2);
-  analysis.analyze(4,3);
+  analysis.set_window(4);
+  analysis.set_threshold(3);
+  analysis.analyze();
   NwayPaths npath = analysis.paths();
   // there should be no paths for these sequences
   for (std::list<ConservedPath >::iterator pathz_i = npath.pathz.begin();
@@ -42,7 +44,9 @@ BOOST_AUTO_TEST_CASE( nway_test )
   Mussa analysis;
   analysis.add_a_seq(s0);
   analysis.add_a_seq(s1);
-  analysis.analyze(4,3);
+  analysis.set_window(4);
+  analysis.set_threshold(3);
+  analysis.analyze();
   NwayPaths npath = analysis.paths();
   for (std::list<ConservedPath >::iterator pathz_i = npath.pathz.begin();
        pathz_i != npath.pathz.end();
@@ -63,7 +67,7 @@ BOOST_AUTO_TEST_CASE( nway_refine )
   mupa_path /= "mck3test.mupa";
   Mussa m1;
   m1.load_mupa_file( mupa_path );
-  m1.analyze(0, 0);
+  m1.analyze();
   const NwayPaths& npath = m1.paths();
   BOOST_CHECK_EQUAL (npath.path_size(), npath.refined_path_size());
   size_t first_refined_size = npath.refined_path_size();
@@ -183,7 +187,9 @@ GTTTTAATAAATGCACAATGCTCTCTTCCTGTTCTTC";
   m1.add_a_seq(seq2);
   m1.add_a_seq(seq3);
 
-  m1.analyze(10, 8);
+  m1.set_window(10);
+  m1.set_threshold(8);
+  m1.analyze();
   m1.set_soft_threshold(10);
   m1.nway();
 }