Changeset 301

Timestamp:

03/19/09 15:39:00 (15 years ago)

Author:

smidl

Message:

TR merging 2D example

Files:

• bdm/estim/merger.cpp (modified) (1 diff)
• bdm/stat/libBM.h (modified) (1 diff)
• mpdm/TR2244/merger_iter_cond.cpp (modified) (5 diffs)

bdm/estim/merger.cpp

@@ -88 +88 @@
 
                         // This will be active only later in iterations!!!
-                        if ( ( !fix_smp ) & ( 1./sum_sqr ( w ) <0.5*Ns ) )
+                        if ( ( !fix_smp ) & ( 1./sum_sqr ( w ) <0.9*Ns ) )
                         {
                                 // Generate new samples

bdm/stat/libBM.h

@@ -531 +531 @@
 public:
         //!Default constructor
-        mepdf ( const epdf* em ) :mpdf ( ) {ep=const_cast<epdf*> ( em );};
+        mepdf ( epdf* em ) :mpdf ( ) {ep= em ;};
+        mepdf (const epdf* em ) :mpdf ( ) {ep=const_cast<epdf*>( em );};
         void condition ( const vec &cond ) {}
 };

mpdm/TR2244/merger_iter_cond.cpp

@@ -15 +15 @@
         RV y ( "{y }","1" );
         RV u1 ( "{u1 }","1" );
-        RV u2 ( "{u2 }","1" );
+//      RV u2 ( "{u2 }","1" );
 
         RV all = y;
         all.add ( u1 );
-        all.add ( u2 );
+//      all.add ( u2 );
 
         mlnorm<fsqmat> f1; f1.set_rv( y ); f1.set_rvc( u1 );
-        mlnorm<fsqmat> f2; f2.set_rv( y ); f2.set_rvc( u2 );
+        enorm<fsqmat>  f2; f2.set_rv( y );// f2.set_rvc( u2 );
 
         //Differneces in constant term are essential
         f1.set_parameters ( "0.4","1",mat ( "0.04" ) );
-        f2.set_parameters ( "0.2","-1",mat ( "0.08" ) );
+        f2.set_parameters ( "0.2", mat ( "0.08" ) );
 
+        mepdf mf2(&f2);
+        
         Array<mpdf* > A ( 2 );
         A ( 0 ) =&f1;
-        A ( 1 ) =&f2;
+        A ( 1 ) =&mf2;
 
         merger M ( A );
         M.debug_file("iter_cond_debug.it");
         enorm<ldmat> g0; g0.set_rv ( all );
-        mat Cov=0.3*eye ( 3 );
-        Cov(1,2)=0.29;
-        Cov(2,1)=0.29;
-        g0.set_parameters ( vec ( "1 1 1" ),Cov);// +1*ones ( 3,3 ) );
+        mat Cov=10*eye ( 2 );
+/*      Cov(1,2)=0.29;
+        Cov(2,1)=0.29;*/
+        g0.set_parameters ( vec ( "0 0" ),Cov);// +1*ones ( 3,3 ) );
 
-        enorm<ldmat>* teste=g0.marginal(concat(u1,u2));
-        mlnorm<ldmat>* testm=(mlnorm<ldmat>*)teste->condition(u2);
+//      enorm<ldmat>* teste=g0.marginal(concat(u1,u2));
+//      mlnorm<ldmat>* testm=(mlnorm<ldmat>*)teste->condition(u2);
         
-        M.set_parameters ( 1.2,1000,1 );
+        M.set_parameters ( 1.2,1000,1);
         
-        Array<vec> YUU(3); 
+        Array<vec> YUU(2); 
         YUU(0)=linspace(-2.9,3.1,20);
         YUU(1)=linspace(-5,5,20);
-        YUU(2)=linspace(-3,3,20);
+        //YUU(2)=linspace(-3,3,20);
 
         M.set_grid(YUU);
@@ -54 +56 @@
         int Ntrials=1;
         vec A1s ( Ntrials );
-        vec A2s ( Ntrials );
+//      vec A2s ( Ntrials );
         vec R1s ( Ntrials );
         vec R2s ( Ntrials );
@@ -68 +70 @@
 
                 RV yu1 = y; yu1.add ( u1 );
-                RV yu2 = y; yu2.add ( u2 );
+//              RV yu2 = y; yu2.add ( u2 );
                 enorm<ldmat>* P1m= ( enorm<ldmat>* ) MP->marginal ( yu1 );
-                enorm<ldmat>* P2m= ( enorm<ldmat>* ) MP->marginal ( yu2 );
+                enorm<ldmat>* P2m= ( enorm<ldmat>* ) MP->marginal ( y );
                 mlnorm<ldmat>* P1c= ( mlnorm<ldmat>* ) ( P1m->condition ( y ) );
-                mlnorm<ldmat>* P2c= ( mlnorm<ldmat>* ) ( P2m->condition ( y ) );
+//              mlnorm<ldmat>* P2c= ( mlnorm<ldmat>* ) ( P2m->condition ( y ) );
 
                 A1s(it) = P1c->_A()(0,0);
-                A2s(it) = P2c->_A()(0,0);
+//              A2s(it) = P2c->_A()(0,0);
                 R1s(it) = P1c->_R()(0,0);
-                R2s(it) = P2c->_R()(0,0);
+                R2s(it) = P2m->_R().to_mat()(0,0);
                 C1s(it) = P1c->_mu_const()(0);
-                C2s(it) = P2c->_mu_const()(0);
+                C2s(it) = P2m->_mu()(0);
 
                 cout << "mean: " << MM._Coms(0)->_e()->mean() <<endl;
@@ -89 +91 @@
         cout << "C2s:" <<C2s<<endl;
         double A1mean = sum(A1s)/Ntrials;
-        double A2mean = sum(A2s)/Ntrials;
+//      double A2mean = sum(A2s)/Ntrials;
         double C1mean = sum(C1s)/Ntrials;
         double C2mean = sum(C2s)/Ntrials;
@@ -95 +97 @@
         double R2mean = sum(R2s)/Ntrials;
         cout << "A1: " << A1mean << " +- " << 2*sqrt(sum_sqr(A1s)/Ntrials-A1mean*A1mean) <<endl;
-        cout << "A2: " << A2mean << " +- " << 2*sqrt(sum_sqr(A2s)/Ntrials-A2mean*A2mean) <<endl;
+//      cout << "A2: " << A2mean << " +- " << 2*sqrt(sum_sqr(A2s)/Ntrials-A2mean*A2mean) <<endl;
         cout << "C1: " << C1mean << " +- " << 2*sqrt(sum_sqr(C1s)/Ntrials-C1mean*C1mean) <<endl;
         cout << "C2: " << C2mean << " +- " << 2*sqrt(sum_sqr(C2s)/Ntrials-C2mean*C2mean) <<endl;