Changeset 693 for library/bdm/base/datasources.h

Timestamp:

11/02/09 17:27:29 (15 years ago)

Author:

mido

Message:

mpdf renamed to pdf in the whole library

Files:

• library/bdm/base/datasources.h (modified) (10 diffs)

library/bdm/base/datasources.h

@@ -145 +145 @@
 Still having only one density but allowing conditioning on either input or delayed values.
 */
-class MpdfDS :public DS {
+class PdfDS :public DS {
         protected:
                 //! internal pointer to epdf from which we samplecond
-                shared_ptr<mpdf> impdf;
+                shared_ptr<pdf> ipdf;
                 //! internal storage of data sample
                 vec yt;
@@ -165 +165 @@
                         ut2rgr.filldown ( ut,rgr );
                         yt2rgr.filldown ( yt,rgr );
-                        yt=impdf->samplecond ( rgr );
+                        yt=ipdf->samplecond ( rgr );
                         ut2rgr.step(ut); //u is now history
                 }
@@ -177 +177 @@
                 /*!
                 \code
-                class = "MpdfDS";
-                mpdf = {class="mpdf_offspring", ...};  // mpdf to simulate
+                class = "PdfDS";
+                pdf = {class="pdf_offspring", ...};  // pdf to simulate
                 --- optional ---
                 init_rv = {class="RV",names=...};      // define what rv to initialize - typically delayed values!
@@ -187 +187 @@
                 */
                 void from_setting ( const Setting &set ) {
-                        impdf=UI::build<mpdf> ( set,"mpdf",UI::compulsory );
+                        ipdf=UI::build<pdf> ( set,"pdf",UI::compulsory );
                         
-                        Yrv = impdf->_rv();
+                        Yrv = ipdf->_rv();
                         // get unique rvs form rvc
-                        RV rgrv0=impdf->_rvc().remove_time();
+                        RV rgrv0=ipdf->_rvc().remove_time();
                         // input is what in not in Yrv
                         Urv=rgrv0.subt(Yrv); 
                         set_drv(Yrv, Urv);
                         // connect input and output to rvc
-                        ut2rgr.set_connection(impdf->_rvc(), Urv); 
-                        yt2rgr.set_connection(impdf->_rvc(), Yrv); 
+                        ut2rgr.set_connection(ipdf->_rvc(), Urv); 
+                        yt2rgr.set_connection(ipdf->_rvc(), Yrv); 
                         
                         //set history - if given
@@ -212 +212 @@
                         }
 
-                        yt = zeros ( impdf->dimension() );
-                        rgr = zeros ( impdf->dimensionc() );
+                        yt = zeros ( ipdf->dimension() );
+                        rgr = zeros ( ipdf->dimensionc() );
                         ut = zeros(Urv._dsize());
 
@@ -225 +225 @@
                         ut2rgr.filldown ( ut,rgr );
                         yt2rgr.filldown ( yt,rgr );
-                        yt=impdf->samplecond ( rgr );
-                }
-};
-UIREGISTER ( MpdfDS );
+                        yt=ipdf->samplecond ( rgr );
+                }
+};
+UIREGISTER ( PdfDS );
 
 /*! Pseudovirtual class for reading data from files
@@ -307 +307 @@
         private:
                 //!conditional pdf of the state evolution \f$ f(x_t|x_{t-1}) \f$
-                shared_ptr<mpdf> IM;
+                shared_ptr<pdf> IM;
 
                 //!conditional pdf of the observations \f$ f(d_t|x_t) \f$
-                shared_ptr<mpdf> OM;
+                shared_ptr<pdf> OM;
 
         protected:
@@ -331 +331 @@
                 }
                 //! convenience constructor
-                stateDS ( const shared_ptr<mpdf> &IM0, const shared_ptr<mpdf> &OM0, int usize ) : IM ( IM0 ), OM ( OM0 ),
+                stateDS ( const shared_ptr<pdf> &IM0, const shared_ptr<pdf> &OM0, int usize ) : IM ( IM0 ), OM ( OM0 ),
                                 dt ( OM0->dimension() ), xt ( IM0->dimension() ),
                                 ut ( usize ), L_xt ( 0 ) { }
@@ -360 +360 @@
                         type = "stateDS";
                         //Internal model
-                        IM = { type = "mpdf"; //<-- valid offspring! e.g. "mlnorm"
+                        IM = { type = "pdf"; //<-- valid offspring! e.g. "mlnorm"
                                 rv = { //description of x_t
                                         names=["name1",...];
@@ -373 +373 @@
                                 };
                         //Observation model
-                        OM = { type = "mpdf-offspring";
+                        OM = { type = "pdf-offspring";
                                 rv = {}; //description of d_t
                                 rvu = {type="internal", path="system.IM.rvu"}; //description of u_t