Changeset 1079 for library/tests/testsuite/merger_test.cpp

Timestamp:

06/10/10 21:54:57 (14 years ago)

Author:

smidl

Message:

Changes in merger + change in loading ARX

Files:

• library/tests/testsuite/merger_test.cpp (modified) (3 diffs)

library/tests/testsuite/merger_test.cpp

@@ -47 +47 @@
     lW.set_row ( 1, l_f2 );
 
-    merger_base M ( A );
+    MergerDiscrete M ( A );
     enorm<fsqmat> g0;
     g0.set_rv ( x );
@@ -153 +153 @@
     UIFile in ( "merger.cfg" );
 
-    shared_ptr<merger_base> mb =
-        UI::build<merger_base> ( in, "Merger", UI::compulsory );
+    shared_ptr<MergerDiscrete> mb =
+        UI::build<MergerDiscrete> ( in, "Merger", UI::compulsory );
 
     pdf_array sources;
@@ -165 +165 @@
 
     mb->merge();
-    vec m = mb->mean();
+    vec m = mb->merger().mean();
     CHECK_EQUAL ( 2, m.size() );
 }