Changeset 598 for library/bdm/base/bdmbase.h

Timestamp:

09/03/09 00:27:23 (15 years ago)

Author:

smidl

Message:

new buffered datalink ( #32 ) and new datasources - all with minor trivial tests

Files:

• library/bdm/base/bdmbase.h (modified) (9 diffs)

library/bdm/base/bdmbase.h

@@ -99 +99 @@
 
         private:
+          enum enum_dummy {dummy};
                 //! auxiliary function used in constructor
                 void init (const Array<std::string> &in_names, const ivec &in_sizes, const ivec &in_times);
                 int init (const string &name, int size);
+                //! Private constructor from IDs, potentially dangerous since all ids must be valid!
+                //! dummy is there to prevent confusion with RV(" string");
+                explicit RV (const ivec &ids0, enum_dummy dum): dsize(0), len(ids0.length()), ids(ids0), times(zeros_i(ids0.length())) {
+                  dsize = countsize();
+                }
         public:
                 //! \name Constructors
@@ -171 +177 @@
                 //! Find indices of self in another rv, \return ivec of the same size as self.
                 ivec findself (const RV &rv2) const;
+                //! Find indices of self in another rv, ignore time, \return ivec of the same size as self.
+                ivec findself_ids (const RV &rv2) const;
                 //! Compare if \c rv2 is identical to this \c RV
                 bool equal (const RV &rv2) const;
@@ -192 +200 @@
                 //!@}
 
+                //! @{ \name Auxiliary functions
+                //! returns rvs with time set to 0 and removed duplicates
+                RV remove_time() const {  return RV(unique(ids), dummy);        }
+                //! return rvs with expanded delayes and sorted in the order of: \f$ [ rv_{0}, rv_{-1}, rv_{
+                RV expand_delayes() const {
+                  RV rvt=this->remove_time(); //rv at t=0
+                  RV tmp = rvt;
+                  int td = mint();
+                  for ( int i = -1; i >= td; i-- ) {
+                        rvt.t ( -1 );
+                        tmp.add ( rvt ); //shift u1
+                  }
+                  return tmp;
+                }
+                //!@}
+                
                 //!\name Relation to vectors
                 //!@{
@@ -200 +224 @@
                 //! Then, data can be copied via: data_of_this = cdata(ind);
                 ivec dataind (const RV &crv) const;
+                //! same as dataind but this time crv should not be complete supperset of rv.
+                ivec dataind_part (const RV &crv) const;
                 //! generate mutual indices when copying data between self and crv.
                 //! Data are copied via: data_of_this(selfi) = data_of_rv2(rv2i)
@@ -461 +487 @@
                 //! @{
 
-                RV _rv() const {
+                const RV& _rv() const {
                         return ep->_rv();
                 }
-                RV _rvc() {
+                const RV& _rvc() {
                         return rvc;
                 }
@@ -570 +596 @@
                 //! val-to-val link, indices of the upper val
                 ivec v2v_up;
-
+                
         public:
                 //! Constructor
@@ -588 +614 @@
                 //! Get val for myself from val of "Up"
                 vec pushdown (const vec &val_up) {
+                  vec tmp(downsize);
+                  filldown(val_up, tmp);
+                        return tmp;
+                }
+                //! Get val for vector val_down from val of "Up"
+                void filldown (const vec &val_up, vec &val_down) {
                         bdm_assert_debug (upsize == val_up.length(), "Wrong val_up");
-                        return get_vec (val_up, v2v_up);
+                        val_down=val_up(v2v_up);
                 }
 
@@ -598 +630 @@
                         set_subvector (val_up, v2v_up, val);
                 }
+                //! access functions
+                int _upsize(){return upsize;}
+                //! access functions
+                int _downsize(){return downsize;}
+};
+
+/*! Extension of datalink to fill only part of Down
+*/
+class datalink_part : public datalink{
+  protected:
+        //! indeces of values in vector downsize
+        ivec v2v_down;
+  public:
+        void set_connection(const RV &rv, const RV &rv_up);
+                //! Get val for vector val_down from val of "Up"
+                void filldown (const vec &val_up, vec &val_down) {
+                        set_subvector(val_down, v2v_down, val_up(v2v_up));
+                }
+};
+
+/*! \brief Datalink that buffers delayed values - do not forget to call step()
+
+Up is current data, Down is their subset with possibly delayed values
+*/
+class datalink_buffered: public datalink_part{
+  protected:
+        //! History, ordered as \f$[Up_{t-1},Up_{t-2}, \ldots]\f$
+        vec history;
+        //! rv of the history
+        RV Hrv;
+        //! h2v : indeces in down 
+        ivec h2v_down;
+        //! h2v : indeces in history
+        ivec h2v_hist;
+  public:
+        
+    datalink_buffered():datalink_part(),history(0), h2v_down(0), h2v_hist(0){};
+        //! push current data to history
+        void step(const vec &val_up){
+                if (Hrv._dsize()>0){
+                  history.shift_right ( 0, Hrv._dsize() );
+                  history.set_subvector ( 0, val_up ); // write U after Drv
+                }
+        }
+                //! Get val for myself from val of "Up"
+                vec pushdown (const vec &val_up) {
+                  vec tmp(downsize);
+                  filldown(val_up, tmp);
+                        return tmp;
+                }
+        
+        void filldown(const vec &val_up, vec &val_down){
+          bdm_assert_debug(val_down.length()>=downsize, "short val_down");
+        
+          set_subvector(val_down, v2v_down, val_up(v2v_up)); // copy direct values
+          set_subvector(val_down, h2v_down, history(h2v_hist)); // copy delayed values
+        }
+        
+        void set_connection(const RV &rv, const RV &rv_up){
+          // create link between up and down
+          datalink_part::set_connection(rv, rv_up);
+          
+          // create rvs of history 
+          // we can store only what we get in rv_up - everything else is removed
+          ivec valid_ids=rv.findself_ids(rv_up);
+          RV rv_hist = rv.subselect( find(valid_ids>=0) ); // select only rvs that are in rv_up
+          rv_hist = rv_hist.expand_delayes(); // full regressor - including time 0
+          Hrv=rv_hist.subt(rv.remove_time());   // remove time 0
+          history = zeros(Hrv._dsize());
+          
+          Hrv.dataind(rv,h2v_hist,h2v_down);
+          
+          downsize = v2v_down.length()+h2v_down.length();
+          upsize = v2v_up.length();
+        }
+};
+
+//! buffered datalink from 2 vectors to 1
+class datalink_2to1_buffered{
+  protected:
+        datalink_buffered dl1;
+        datalink_buffered dl2;
+  public:
+        //! set connection between RVs
+        void set_connection(const RV &rv, const RV &rv_up1, const RV &rv_up2){
+          dl1.set_connection(rv,rv_up1);
+          dl2.set_connection(rv,rv_up2);
+        }
+        void filldown(const vec &val1, const vec &val2, vec &val_down){
+          bdm_assert_debug(val_down.length()>=dl1._downsize()+dl2._downsize(), "short val_down");
+          dl1.filldown(val1, val_down);
+          dl2.filldown(val2, val_down);
+        }
+        void step(const vec &dt, const vec &ut) {dl1.step(dt); dl2.step(ut);}
 };
 
@@ -805 +931 @@
                 }
                 //!access function
-                virtual RV _drv() const {
+                virtual const RV& _drv() const {
         //              return concat (Drv, Urv);// why!!!
                         return Drv;// why!!!