Changeset 386 for library/tests/merger_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_test.cpp (modified) (4 diffs)

library/tests/merger_test.cpp

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