Changeset 379 for applications/mpdm/SYSID09

Timestamp:

06/17/09 23:53:11 (16 years ago)

Author:

smidl

Message:

merger restructured

Files:

• applications/mpdm/SYSID09/merg_2a.cpp (modified) (1 diff)

applications/mpdm/SYSID09/merg_2a.cpp

@@ -126 +126 @@
                 mepdf eG2 ( P2._e() );
                 Array<mpdf*> A ( 2 ); A ( 0 ) =&eG1;A ( 1 ) =&eG2;
-                merger M ( A );
-                M.set_parameters ( 2, 100,20 ,0.99); M._Mix().set_method(QB);
+                merger_mix M ( A );
+                M.set_parameters ( 20 ,0.99); 
+                M.set_method(LOGNORMAL, 1.2);
+                M._Mix().set_method(QB);
                 //M2.set_parameters ( 100.0, 1000,3 ); //M2._Mix().set_method(QB);
 /*              char fnm[100];
                 sprintf(fnm,"m2a_dbg%d.it",t);
                 M.debug_file(fnm);*/
-                M.merge ( proposal );
-
+                M.set_support ( *proposal,100 );
+                M.merge();
                 //proposal = M.proposal();
                 //Likelihood