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

Timestamp:

05/28/10 22:50:46 (14 years ago)

Author:

smidl

Message:

DEBUG macro for conditional output + new class

Files:

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

library/bdm/base/bdmbase.h

@@ -76 +76 @@
 }
 \enddot
+
+RV name may be empty string! In that case, it is not a valid name but only a size holder. It will fail in comparison.
 */
 
@@ -1023 +1025 @@
         protected:
                 datalink_part dl;
+                int vecfromlen;
         public:
                 void update(const vec &v1){
                         bdm_assert_debug(length()==dl._downsize(),"vec_from_vec incompatible");
-                        bdm_assert_debug(v1.length()>=dl._upsize(),"vec_from_vec incompatible");//does not guarantee anything!
+                        bdm_assert_debug(v1.length()==vecfromlen,"This vec was connected to vec of length "+num2str(vecfromlen)+
+                        ", but vec of length "+num2str(v1.length())+" was obtained"  );
                         dl.filldown(v1,*this);
                 };
-                void connect(const RV &vecrv, const RV & vec1){dl.set_connection(vecrv,vec1);set_length(vecrv._dsize());};
+                void connect(const RV &vecrv, const RV & vec1){
+                        bdm_assert(vecrv._dsize()==length(),"Description of this vector, "+ vecrv.to_string() +" does not math it length: " + num2str(length()));
+                        dl.set_connection(vecrv,vec1);
+                        bdm_assert(dl._downsize()==length(), "Rv of this vector, "+vecrv.to_string() +" was not found in given rv: "+vec1.to_string());
+                };
 };
 
@@ -1252 +1260 @@
 class BM : public root {
         //! \var log_level_enums logfull
-        //! TODO DOPLNIT
+        //! log full description of posterior in descriptive structure
 
         //! \var log_level_enums logevidence
-        //! TODO DOPLNIT
+        //! log value of eveidence in each step
         
         //! \var log_level_enums logbounds
-        //! TODO DOPLNIT        
+        //! log lower and upper bounds of estimates
         LOG_LEVEL(BM,logfull,logevidence,logbounds);