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

Timestamp:

09/04/09 00:45:40 (15 years ago)

Author:

smidl

Message:

datasources revisited...

Files:

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

library/bdm/base/datasources.h

@@ -103 +103 @@
                 shared_ptr<mpdf> impdf;
                 //! internal storage of data sample
-                vec dt;
+                vec yt;
                 //! input vector
                 vec ut;
-                //! datalink between dt and ut and regressor
-                datalink_2to1_buffered rgrlink;
+                //! datalink between ut and regressor
+                datalink_buffered ut2rgr;
+                //! datalink between yt and regressor
+                datalink_buffered yt2rgr;
                 //! numeric values of regressor
                 vec rgr;
@@ -113 +115 @@
         public:
                 void step() {
-                        rgrlink.filldown ( dt,ut,rgr );
-                        rgrlink.step(dt,ut);//whist history
-                        dt=impdf->samplecond ( rgr );
+                        yt2rgr.step(yt); // y is now history
+                        ut2rgr.filldown ( ut,rgr );
+                        yt2rgr.filldown ( yt,rgr );
+                        yt=impdf->samplecond ( rgr );
+                        ut2rgr.step(ut); //u is now history
                 }
                 void getdata ( vec &dt_out ) {
-                        dt_out = dt;
-                }
-                void getdata ( vec &dt_out, const ivec &ids ) {
-                        dt_out = dt ( ids );
-                }
-                const RV& _drv() const {
-                        return impdf->_rv();
+                        bdm_assert_debug(dt_out.length()>=utsize+ytsize,"Short output vector");
+                        dt_out.set_subvector(0, yt);
+                        dt_out.set_subvector(ytsize, ut);
                 }
                 void write(const vec &ut0){ut=ut0;}
@@ -131 +131 @@
                 \code
                 class = "MpdfDS";
-                mpdf = {class="epdf_offspring", ...}// list of points
+                mpdf = {class="mpdf_offspring", ...}// mpdf to simulate
                 \endcode
 
@@ -138 +138 @@
                         impdf=UI::build<mpdf> ( set,"mpdf",UI::compulsory );
                         
+                        Yrv = impdf->_rv();
                         // get unique rvs form rvc
                         RV rgrv0=impdf->_rvc().remove_time();
-                        // input is what in not in _rv()
-                        RV urv=rgrv0.subt(impdf->_rv()); 
-                        set_drv(impdf->_rv(), urv);
+                        // input is what in not in Yrv
+                        Urv=rgrv0.subt(Yrv); 
+                        set_drv(Yrv, Urv);
                         // connect input and output to rvc
-                        rgrlink.set_connection(impdf->_rvc(), Drv,Urv); 
-
-                        dt = zeros ( impdf->dimension() );
+                        ut2rgr.set_connection(impdf->_rvc(), Urv); 
+                        yt2rgr.set_connection(impdf->_rvc(), Yrv); 
+
+                        yt = zeros ( impdf->dimension() );
                         rgr = zeros ( impdf->dimensionc() );
-                        ut = zeros(urv._dsize());
+                        ut = zeros(Urv._dsize());
+
+                        ytsize=yt.length();
+                        utsize=ut.length();
+                        dtsize = ytsize+utsize;
                 }
 };