Changeset 700 for library/bdm/base

Timestamp:

11/04/09 22:54:58 (15 years ago)

Author:

smidl

Message:

Making tutorial/userguide example work again (changes of mpdf and bayes)

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (1 diff)
• bdmbase.h (modified) (5 diffs)
• datasources.h (modified) (2 diffs)

library/bdm/base/bdmbase.cpp

@@ -53 +53 @@
                 id = iter->second;
                 if (size>0){
-                        bdm_assert ( SIZES ( id ) == size, "RV " + name + " of different size already exists" );
+                        bdm_assert ( SIZES ( id ) == size, "RV " + name + " of size " + num2str(SIZES(id)) + " exists, requested size " + num2str(size) + "can not be assigned" );
                 }
         }

library/bdm/base/bdmbase.h

@@ -266 +266 @@
         //! Minimum time-offset
         int mint() const {
-                        return times.length()>0 ? min (times) : 0;
+                return times.length()>0 ? min (times) : 0;
+        }
+        //! Minimum time-offset of ids of given RVs
+        int mint(const RV &rv) const {
+                bvec belong=zeros_b(len);
+                for (int r=0; r<rv.length(); r++){
+                        belong = belong | (ids == rv.id(r));
+                }
+                return times.length()>0 ? min (times(belong)) : 0;
         }
         //!@}
@@ -598 +606 @@
                         logrec->L.logit( logrec->ids(0), mean() );
                 }
-                if (log_level>2) {
+                if (log_level>1) {
                         vec lb; vec ub;
                         qbounds(lb,ub);
@@ -913 +921 @@
                 //establish c2c connection
                 rvc.dataind ( rvc_up, c2c_lo, c2c_up );
-                bdm_assert_debug ( c2c_lo.length() + v2c_lo.length() == condsize, "cond is not fully given" );
+//              bdm_assert_debug ( c2c_lo.length() + v2c_lo.length() == condsize, "cond is not fully given" );
         }
 
@@ -919 +927 @@
         vec get_cond ( const vec &val_up, const vec &cond_up ) {
                 vec tmp ( condsize );
-                set_subvector ( tmp, v2c_lo, val_up ( v2c_up ) );
-                set_subvector ( tmp, c2c_lo, cond_up ( c2c_up ) );
+                fill_cond (val_up, cond_up, tmp );
                 return tmp;
+        }
+        //! fill condition 
+        void fill_cond ( const vec &val_up, const vec &cond_up, vec& cond_out){
+                bdm_assert_debug(cond_out.length()>=condsize,"dl.fill_cond: cond_out is too small");
+                set_subvector ( cond_out, v2c_lo, val_up ( v2c_up ) );
+                set_subvector ( cond_out, c2c_lo, cond_up ( c2c_up ) );
         }
         //! Fill
@@ -1077 +1090 @@
 
         BM() : yrv(),dimy(0),rvc(),dimc(0), ll ( 0 ), evalll ( true ) { };
-        BM ( const BM &B ) :  yrv ( B.yrv ), dimy(B.dimy), rvc ( B.rvc ), ll ( B.ll ), evalll ( B.evalll ) {}
+//      BM ( const BM &B ) :  yrv ( B.yrv ), dimy(B.dimy), rvc ( B.rvc ),dimc(B.dimc), ll ( B.ll ), evalll ( B.evalll ) {}
         //! \brief Copy function required in vectors, Arrays of BM etc. Have to be DELETED manually!
         //! Prototype: \code BM* _copy_() const {return new BM(*this);} \endcode

library/bdm/base/datasources.h

@@ -132 +132 @@
                         dt =  zeros(iepdf->dimension());
                         dtsize=dt.length();
+                        ytsize=dt.length();
                         set_drv(iepdf->_rv(),RV());
                         utsize =0;
@@ -365 +366 @@
                 class = "stateDS";
                 //Internal model
-                IM = { type = "mpdf-offspring"; };
+                IM = { type = "pdf-offspring"; };
                 //Observation model
-                OM = { type = "mpdf-offspring"; }
+                OM = { type = "pdf-offspring"; }
                 //initial state
                 x0 = [...]; //vector of data