Changeset 381 for tests/merger_2d_test.cpp

Timestamp:

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

Author:

smidl

Message:

tests of new mergers

Files:

• tests/merger_2d_test.cpp (modified) (1 diff)

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();