Changeset 702

Timestamp:

11/04/09 22:55:11 (15 years ago)

Author:

smidl

Message:

applications compile - but may be broken!

Location:

applications

Files:

• mpdm/SYSID09/merg_2a.cpp (modified) (1 diff)
• mpdm/TR2244/merger_iter_cond.cpp (modified) (1 diff)
• mpdm/merg_giw.cpp (modified) (1 diff)
• mpdm/merg_pred.cpp (modified) (1 diff)
• pmsm/TR2245/pmsm_wishart.cpp (modified) (1 diff)
• pmsm/TR2245/unitsteps.cpp (modified) (1 diff)

applications/mpdm/SYSID09/merg_2a.cpp

@@ -123 +123 @@
                 
                 // Merge estimates
-                mepdf eG1 ( P1._e() );
-                mepdf eG2 ( P2._e() );
-                Array<mpdf*> A ( 2 ); A ( 0 ) =&eG1;A ( 1 ) =&eG2;
+                Array<pdf*> A ( 2 ); A ( 0 ) =&P1;A ( 1 ) =&P2;
                 merger_mix M ( A );
                 M.set_parameters ( 20 ,0.99); 

applications/mpdm/TR2244/merger_iter_cond.cpp

@@ -28 +28 @@
         f2.set_parameters ( "2", mat ( "0.02" ) );
 
-        mepdf mf2(&f2);
-        
-        Array<mpdf* > A ( 2 );
+        Array<pdf* > A ( 2 );
         A ( 0 ) =&f1;
-        A ( 1 ) =&mf2;
+        A ( 1 ) =&f2;
 
         merger_mix M ( A );

applications/mpdm/merg_giw.cpp

@@ -92 +92 @@
 
                 // Merge estimates
-                mepdf eG1 ( P1._e() );
-                mepdf eG2 ( P2._e() );
-                Array<mpdf*> A ( 2 ); A ( 0 ) =&eG1;A ( 1 ) =&eG2;
+                Array<pdf*> A ( 2 ); A ( 0 ) =&P1;A ( 1 ) =&P2;
                 merger M ( A );
                 M.set_parameters ( 1.5, 100,3 ); //M._Mix().set_method(QB);

applications/mpdm/merg_pred.cpp

@@ -87 +87 @@
                                         mlnorm<ldmat>* Pgp = PG.predictor();// ( y,concat ( ym,uu ) );
 
-                                        Array<mpdf*> A ( 2 ); A ( 0 ) =P1p;A ( 1 ) =P2p;
+                                        Array<pdf*> A ( 2 ); A ( 0 ) =P1p;A ( 1 ) =P2p;
                                         merger M ( A );
                                         enorm<ldmat> g0;g0.set_rv ( concat ( yy,uu ) ); g0.set_parameters ( "0 0 0 0 ",3*eye ( 4 ) );

applications/pmsm/TR2245/pmsm_wishart.cpp

@@ -48 +48 @@
                 
         pmsmDS* DS = UI::build<pmsmDS>(F,"system");
-        //      mpdf* evolQ = UI::build<mpdf>( F, "Qrw" );
 
         // internal model

applications/pmsm/TR2245/unitsteps.cpp

@@ -41 +41 @@
         F.lookupValue ( "ndat", Ndat );
         F.lookupValue ( "Npart",Npart );
-        mpdf* evolQ = UI::build<mpdf>( F, "Qrw" );
+        pdf* evolQ = UI::build<pdf>( F, "Qrw" );
         vec Qdiag;
         vec Rdiag;