Changeset 604

Timestamp:

09/06/09 22:53:06 (15 years ago)

Author:

smidl

Message:

change of syntax of RV

Location:

library

Files:

• bdm/base/bdmbase.cpp (modified) (2 diffs)
• bdm/base/bdmbase.h (modified) (6 diffs)
• bdm/base/datasources.cpp (modified) (1 diff)
• bdm/base/datasources.h (modified) (3 diffs)
• bdm/stat/exp_family.h (modified) (1 diff)
• tests/datalink_test.cpp (modified) (1 diff)
• tests/rv_test.cpp (modified) (2 diffs)
• tests/testResample.cpp (modified) (1 diff)
• tests/test_particle.cpp (modified) (1 diff)

library/bdm/base/bdmbase.cpp

@@ -18 +18 @@
         NAMES = Array<string> ( BUFFER_STEP );
 }
+
+string RV::show_all(){
+  ostringstream os;
+  for(str2int_map::const_iterator iter=MAP.begin(); iter!=MAP.end(); iter++){
+          os << "key: " << iter->first << " val: " << iter->second <<endl;
+  }
+  return os.str();
+};
 
 int RV::init ( const string &name, int size ) {
@@ -127 +135 @@
 }
 
-void RV::t ( int delta ) {
+void RV::t_plus ( int delta ) {
         times += delta;
 }

library/bdm/base/bdmbase.h

@@ -149 +149 @@
         friend std::ostream &operator<< ( std::ostream &os, const RV &rv );
 
+        string to_string() {ostringstream o; o << this; return o.str();}
+        
+        //! total size of a random variable
         int _dsize() const {
                 return dsize;
@@ -160 +163 @@
         //! Recount size of the corresponding data vector
         int countsize() const;
+        //! Vector of cumulative sizes of RV
         ivec cumsizes() const;
+        //! Number of named parts
         int length() const {
                 return len;
@@ -206 +211 @@
 
         //! Shift \c time by delta.
-        void t ( int delta );
-        //!@}
-
-        //! @{ \name Auxiliary functions
+        void t_plus ( int delta );
+        //!@}
+
+        //! @{ \name Time manipulation functions
         //! returns rvs with time set to 0 and removed duplicates
         RV remove_time() const {
                 return RV ( unique ( ids ), dummy );
+        }
+        //! create new RV from the current one with time shifted by given value
+        RV copy_t(int dt) const {
+                RV tmp=*this;
+                tmp.t_plus(dt);
+                return tmp;
         }
         //! return rvs with expanded delayes and sorted in the order of: \f$ [ rv_{0}, rv_{-1}, rv_{
@@ -220 +231 @@
                 int td = mint();
                 for ( int i = -1; i >= td; i-- ) {
-                        rvt.t ( -1 );
+                        rvt.t_plus ( -1 );
                         tmp.add ( rvt ); //shift u1
                 }
@@ -266 +277 @@
         //! Invalidate all named RVs. Use before initializing any RV instances, with care...
         static void clear_all();
+        //! function for debugging RV related stuff
+        string show_all();
+
 };
 UIREGISTER ( RV );
@@ -497 +511 @@
                 return ep->_rv();
         }
-        const RV& _rvc() {
+        const RV& _rvc() const {
                 return rvc;
         }

library/bdm/base/datasources.cpp

@@ -105 +105 @@
         int mint = rrv0.mint();
         for ( int i = 0; i > mint; i-- ) {
-                pom.t ( -1 );
+                pom.t_plus ( -1 );
                 T.add ( pom );
         }

library/bdm/base/datasources.h

@@ -291 +291 @@
                         U.set_size ( Urv._dsize() );
                         for ( int i = -1; i >= td; i-- ) {
-                                drv.t ( -1 );
+                                drv.t_plus ( -1 );
                                 Drv.add ( drv ); //shift u1
                         }
@@ -308 +308 @@
                         L_ut = L.add ( Urv, "" );
 
-                        mat &A = model._A();
-                        mat R = model._R();
+                        const mat &A = model._A();
+                        const mat R = model._R();
                         if ( opt_L_theta ) {
                                 L_theta = L.add ( RV ( "{th }", vec_1 ( A.rows() * A.cols() ) ), "t" );
@@ -322 +322 @@
                         L.logit ( L_ut, U );
 
-                        mat &A = model._A();
-                        mat R = model._R();
+                        const mat &A = model._A();
+                        const mat R = model._R();
                         if ( opt_L_theta ) {
                                 L.logit ( L_theta, vec ( A._data(), A.rows() *A.cols() ) );

library/bdm/stat/exp_family.h

@@ -569 +569 @@
 
                 //!access function
-                vec& _mu_const() {return mu_const;}
+                const vec& _mu_const() const {return mu_const;}
                 //!access function
-                mat& _A() {return A;}
+                const mat& _A() const {return A;}
                 //!access function
-                mat _R() { return this->iepdf._R().to_mat(); }
+                mat _R() const { return this->iepdf._R().to_mat(); }
 
                 //! Debug stream

library/tests/datalink_test.cpp

@@ -93 +93 @@
         RV ab=concat(a,b);
         RV aa = a;
-        a.t(-1);
+        a.t_plus(-1);
         aa.add(a); 
 

library/tests/rv_test.cpp

@@ -8 +8 @@
 TEST ( test_rv ) {
         RV::clear_all();
-
+        
         RV a = RV ( "{a_in_test_rv }", "3" );
         CHECK ( a.equal ( a ) );
@@ -137 +137 @@
         RV join=a;
         join.add(b);
-        RV tmp=a; tmp.t(1);
+        RV tmp=a; tmp.t_plus(1);
         join.add(tmp);
-        tmp=b; tmp.t(-1);
+        tmp=b; tmp.t_plus(-1);
         join.add(tmp);
         
         CHECK_EQUAL(unique(join._ids()), vec_2(a.id(0), b.id(0))); // find only ids of a and b
         CHECK_EQUAL(unique_complement(join._ids(), vec_1(a.id(0))), vec_1(b.id(0))); // complemnet of a in previous is b
+
+        //test if unique names work
+        RV uniq1("y",1);
+        RV uniq2("y",1);
+        
+        CHECK_EQUAL(uniq1.id(0), uniq2.id(0));
 }

library/tests/testResample.cpp

@@ -14 +14 @@
         RV x ( "1" );
         RV xm = x;
-        xm.t ( -1 );
+        xm.t_plus ( -1 );
         const
         RV y ( "2" );

library/tests/test_particle.cpp

@@ -14 +14 @@
         RV x ( "1" );
         RV xm = x;
-        xm.t ( -1 );
+        xm.t_plus ( -1 );
         const
         RV y ( "2" );