Changeset 299 for mpdm

Timestamp:

03/19/09 15:38:55 (15 years ago)

Author:

smidl

Message:

merger - cull de sac :-(

Location:

mpdm

Files:

• CMakeLists.txt (modified) (1 diff)
• TR2244/merger_iter_cond.cpp (modified) (4 diffs)

mpdm/CMakeLists.txt

@@ -5 +5 @@
 EXEC(merg_pred)
 EXEC(merg_giw)
-EXEC(merger_iter_cond)
-EXEC(merg_2a)
+EXEC(TR2244/merger_iter_cond)
+EXEC(SYSID09/merg_2a)

mpdm/TR2244/merger_iter_cond.cpp

@@ -33 +33 @@
 
         merger M ( A );
-        enorm<fsqmat> g0; g0.set_rv ( all );
-        g0.set_parameters ( vec ( "1 -1 1" ),3*eye ( 3 ));// +1*ones ( 3,3 ) );
+        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 ) );
 
+        enorm<ldmat>* teste=g0.marginal(concat(u1,u2));
+        mlnorm<ldmat>* testm=(mlnorm<ldmat>*)teste->condition(u2);
+        
         M.set_parameters ( 1.2,1000,1 );
+        
+        Array<vec> YUU(3); 
+        YUU(0)=linspace(-2.9,3.1,20);
+        YUU(1)=linspace(-5,5,20);
+        YUU(2)=linspace(-3,3,20);
 
-        int Ntrials=100;
+        M.set_grid(YUU);
+        
+        int Ntrials=1;
         vec A1s ( Ntrials );
         vec A2s ( Ntrials );
@@ -51 +65 @@
                 MixEF &MM = M._Mix();
                 epdf* MP = MM._Coms ( 0 )->epredictor ( );
+                MP->set_rv(all);
 
                 RV yu1 = y; yu1.add ( u1 );
@@ -66 +81 @@
                 C2s(it) = P2c->_mu_const()(0);
 
+                cout << "mean: " << MM._Coms(0)->_e()->mean() <<endl;
         }
+        
+        
+        
+        cout << "A1s:" <<A1s<<endl;
+        cout << "C2s:" <<C2s<<endl;
         double A1mean = sum(A1s)/Ntrials;
         double A2mean = sum(A2s)/Ntrials;
@@ -73 +94 @@
         double R1mean = sum(R1s)/Ntrials;
         double R2mean = sum(R2s)/Ntrials;
-        cout << "A1: " << A1mean << " +- " << 2*(sum_sqr(A1s)/Ntrials-A1mean*A1mean) <<endl;
-        cout << "A2: " << A2mean << " +- " << 2*(sum_sqr(A2s)/Ntrials-A2mean*A2mean) <<endl;
-        cout << "C1: " << C1mean << " +- " << 2*(sum_sqr(C1s)/Ntrials-C1mean*C1mean) <<endl;
-        cout << "C2: " << C2mean << " +- " << 2*(sum_sqr(C2s)/Ntrials-C2mean*C2mean) <<endl;
-        cout << "R1: " << R1mean << " +- " << 2*(sum_sqr(R1s)/Ntrials-R1mean*R1mean) <<endl;
-        cout << "R2: " << R2mean << " +- " << 2*(sum_sqr(R2s)/Ntrials-R2mean*R2mean) <<endl;
+        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 << "C1: " << C1mean << " +- " << 2*sqrt(sum_sqr(C1s)/Ntrials-C1mean*C1mean) <<endl;
+        cout << "C2: " << C2mean << " +- " << 2*sqrt(sum_sqr(C2s)/Ntrials-C2mean*C2mean) <<endl;
+        cout << "R1: " << R1mean << " +- " << 2*sqrt(sum_sqr(R1s)/Ntrials-R1mean*R1mean) <<endl;
+        cout << "R2: " << R2mean << " +- " << 2*sqrt(sum_sqr(R2s)/Ntrials-R2mean*R2mean) <<endl;
 }