Changeset 386 for library/tests/merger_2d_test.cpp

Timestamp:

06/19/09 11:14:47 (15 years ago)

Author:

mido

Message:

possibly broken? 4th part

Location:

library/tests

Files:

• . (copied) (copied from tests)
• merger_2d_test.cpp (modified) (2 diffs)

library/tests/merger_2d_test.cpp

@@ -1 +1 @@
 
-#include <stat/libEF.h>
-#include <estim/merger.h>
+#include "stat/exp_family.h"
+#include "stat/merger.h"
+
+using namespace bdm;
 
 using namespace bdm;
@@ -42 +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("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();