Changeset 381

Timestamp:

06/17/09 23:54:06 (15 years ago)

Author:

smidl

Message:

tests of new mergers

Location:

tests

Files:

• merger_2d_test.cpp (modified) (1 diff)
• merger_iter_test.cpp (modified) (1 diff)
• merger_test.cpp (modified) (3 diffs)

tests/merger_2d_test.cpp

@@ -42 +42 @@
         Grid.set_submatrix ( 1,0, kron(ones(1,Npoints), y_grid) );
         
-        merger M ( A );
+        merger_mix M ( A );
         enorm<fsqmat> g0; g0.set_rv(xy);
         g0.set_parameters(vec("1 1"),mat("10 0; 0 10"));
         
-        M.set_parameters(1e8,400,1);
-        M.merge(&g0);
+        M.set_parameters(1);
+        M.set_method(LOGNORMAL,1e8);
+        M.set_support(g0,400);
+        M.merge();
         
         MixEF &MM = M._Mix();

tests/merger_iter_test.cpp

@@ -44 +44 @@
         Grid.set_submatrix ( 1,0, kron(ones(1,Npoints), y_grid) );
         
-        merger M ( A );
+        merger_mix M ( A );
         enorm<fsqmat> g0; g0.set_rv(xy);
         g0.set_parameters(vec("4 4"),mat("1 0; 0 1"));
         
-        M.set_parameters(1.2,400,5);
-        M.merge(&g0);
+        M.set_parameters(5);
+        M.set_method(LOGNORMAL,1.2);
+        M.set_support(g0,400);
+        M.merge();
         
         MixEF &MM = M._Mix();

tests/merger_test.cpp

@@ -34 +34 @@
 
         vec l_f1=f1.evallog_m ( x_grid );
-
         vec l_f2=f2.evallog_m ( x_grid );
         mat lW ( 2,Npoints );
@@ -40 +39 @@
         lW.set_row ( 1, l_f2 );
 
-        merger M ( A );
+        merger_base M ( A );
         enorm<fsqmat> g0; g0.set_rv ( x );
         g0.set_parameters ( vec ( "0.0" ),mat ( "100.0" ) );
 
-        M.set_parameters ( 1.2,200,3 );
-        M.merge ( &g0 );
+        M.set_method (  LOGNORMAL, 1.2 );
+        M.set_support(g0,200);
+        M.merge ();
 
-        vec m2 = M.lognorm_merge ( lW );
-        vec mm2 = M.evallog_m ( x_grid );
+        vec m2 = M.merge_points ( lW );
+//      vec mm2 = M.evallog_m ( x_grid );
 
         it_file it ( "merger_test.it" );
@@ -55 +55 @@
         it << Name ( "lf2" ) << l_f2;
         it << Name ( "m2" ) << m2;
-        it << Name ( "mm2" ) << mm2;
+//      it << Name ( "mm2" ) << mm2;
 }