Changeset 379 for applications/mpdm

Timestamp:

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

Author:

smidl

Message:

merger restructured

Location:

applications/mpdm

Files:

• SYSID09/merg_2a.cpp (modified) (1 diff)
• TR2244/merger_iter_cond.cpp (modified) (3 diffs)

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

applications/mpdm/TR2244/merger_iter_cond.cpp

@@ -34 +34 @@
         A ( 1 ) =&mf2;
 
-        merger M ( A );
-        M.debug_file("iter_cond_debug.it");
+        merger_mix M ( A );
+        M.set_debug_file("iter_cond_debug.it");
         enorm<ldmat> g0; g0.set_rv ( all );
         mat Cov=10*eye ( 2 );
@@ -45 +45 @@
 //      mlnorm<ldmat>* testm=(mlnorm<ldmat>*)teste->condition(u2);
         
-        M.set_parameters ( 1.2,1000,1,0.5);
+        M.set_parameters (1,0.5);
+        M.set_method(LOGNORMAL, 1.2);
         
         Array<vec> YUU(2); 
@@ -66 +67 @@
 
         for ( int it=0;it<Ntrials;it++ ) {
-                M.merge ( &g0 );
-
+                M.set_support( g0,1000);
+                M.merge();
+                
                 MixEF &MM = M._Mix();
                 epdf* MP = MM._Coms ( 0 )->epredictor ( );