Changeset 620

Timestamp:

09/16/09 14:47:36 (15 years ago)

Author:

smidl

Message:

replace assert_debug by assert in classes interacting with users (from_setting, set_parameters, validate)

Location:

library/bdm

Files:

• base/bdmbase.cpp (modified) (1 diff)
• base/bdmbase.h (modified) (3 diffs)
• base/loggers.h (modified) (1 diff)
• base/user_info.h (modified) (2 diffs)
• design/ctrlbase.cpp (modified) (1 diff)
• estim/kalman.h (modified) (3 diffs)
• math/functions.h (modified) (1 diff)
• stat/discrete.h (modified) (1 diff)
• stat/emix.cpp (modified) (3 diffs)
• stat/exp_family.h (modified) (9 diffs)

library/bdm/base/bdmbase.cpp

@@ -76 +76 @@
 void RV::init ( const Array<std::string> &in_names, const ivec &in_sizes, const ivec &in_times ) {
         len = in_names.length();
-        bdm_assert_debug ( in_names.length() == in_times.length(), "check \"times\" " );
-        bdm_assert_debug ( in_names.length() == in_sizes.length(), "check \"sizes\" " );
+        bdm_assert ( in_names.length() == in_times.length(), "check \"times\" " );
+        bdm_assert ( in_names.length() == in_sizes.length(), "check \"sizes\" " );
 
         times.set_length ( len );

library/bdm/base/bdmbase.h

@@ -35 +35 @@
         //!Default constructor
         str ( ivec ids0, ivec times0 ) : ids ( ids0 ), times ( times0 ) {
-                bdm_assert_debug ( times0.length() == ids0.length(), "Incompatible input" );
+                bdm_assert ( times0.length() == ids0.length(), "Incompatible input" );
         };
 };
@@ -183 +183 @@
         //! returns name of a scalar at position scalat, i.e. it can be in the middle of vector name, in that case it adds "_%d" to it
         std::string scalarname ( int scalat ) const {
-                bdm_assert_debug(scalat<dsize,"Wrong input index");
+                bdm_assert(scalat<dsize,"Wrong input index");
                 int id=0;
                 int scalid=0;
@@ -995 +995 @@
         //! Register DS for logging into logger L
         virtual void log_add ( logger &L ) {
-                bdm_assert_debug ( dtsize == Drv._dsize(), "invalid DS: dtsize (" + num2str ( dtsize ) + ") different from Drv " + num2str ( Drv._dsize() ) );
-                bdm_assert_debug ( utsize == Urv._dsize(), "invalid DS: utsize (" + num2str ( utsize ) + ") different from Urv " + num2str ( Urv._dsize() ) );
+                bdm_assert ( dtsize == Drv._dsize(), "invalid DS: dtsize (" + num2str ( dtsize ) + ") different from Drv " + num2str ( Drv._dsize() ) );
+                bdm_assert ( utsize == Urv._dsize(), "invalid DS: utsize (" + num2str ( utsize ) + ") different from Urv " + num2str ( Urv._dsize() ) );
 
                 L_dt = L.add ( Drv, "" );

library/bdm/base/loggers.h

@@ -49 +49 @@
 
         void logit ( int id, const vec &v ) {
-                bdm_assert_debug ( id < vectors.length(), "Logger was not initialized, run init()." );
+                bdm_assert ( id < vectors.length(), "Logger was not initialized, run init()." );
                 if ( id >= 0 ) {
                         vectors ( id ).set_row ( ind, v );

library/bdm/base/user_info.h

@@ -321 +321 @@
 
                 root *typeless_instance = related_UI.new_instance();
-                bdm_assert_debug ( typeless_instance, "UI::new_instance failed" );
+                bdm_assert ( typeless_instance, "UI::new_instance failed" );
 
                 instance = dynamic_cast<T*> ( typeless_instance );
@@ -351 +351 @@
                 T *tmp_inst = 0;
                 from_setting ( tmp_inst, element );
-                bdm_assert_debug ( tmp_inst, "UI::from_setting failed" );
+                bdm_assert ( tmp_inst, "UI::from_setting failed" );
                 instance = tmp_inst;
         }

library/bdm/design/ctrlbase.cpp

@@ -22 +22 @@
 
 void LQG::validate() {
-        bdm_assert_debug ( Qy.cols() == dimy, "LQG: wrong dimensions of Qy " );
-        bdm_assert_debug ( Qu.cols() == dimu, "LQG: wrong dimensions of Qu " );
-        bdm_assert_debug ( y_req.length() == dimy, "LQG: wrong dimensions of y_req " );
+        bdm_assert ( Qy.cols() == dimy, "LQG: wrong dimensions of Qy " );
+        bdm_assert ( Qu.cols() == dimu, "LQG: wrong dimensions of Qu " );
+        bdm_assert ( y_req.length() == dimy, "LQG: wrong dimensions of y_req " );
 }
 

library/bdm/estim/kalman.h

@@ -138 +138 @@
                 void validate() {
                         StateSpace<sq_T>::validate();
-                        bdm_assert_debug(est->dimension(), "Statistics and model parameters mismatch");
+                        bdm_assert(est->dimension(), "Statistics and model parameters mismatch");
                 }
 };
@@ -386 +386 @@
                         
                         //We can do only 1d now... :(
-                        bdm_assert_debug(yrv._dsize()==1, "Only for SISO so far..." );
+                        bdm_assert(yrv._dsize()==1, "Only for SISO so far..." );
 
                         // create names for 
@@ -463 +463 @@
 template<class sq_T>
 void StateSpace<sq_T>::validate(){
-        bdm_assert_debug (A.cols() == dimx, "KalmanFull: A is not square");
-        bdm_assert_debug (B.rows() == dimx, "KalmanFull: B is not compatible");
-        bdm_assert_debug (C.cols() == dimx, "KalmanFull: C is not square");
-        bdm_assert_debug ( (D.rows() == dimy) || (D.cols() == dimu), "KalmanFull: D is not compatible");
-        bdm_assert_debug ( (Q.cols() == dimx) || (Q.rows() == dimx), "KalmanFull: Q is not compatible");
-        bdm_assert_debug ( (R.cols() == dimy) || (R.rows() == dimy), "KalmanFull: R is not compatible");
+        bdm_assert (A.cols() == dimx, "KalmanFull: A is not square");
+        bdm_assert (B.rows() == dimx, "KalmanFull: B is not compatible");
+        bdm_assert (C.cols() == dimx, "KalmanFull: C is not square");
+        bdm_assert ( (D.rows() == dimy) || (D.cols() == dimu), "KalmanFull: D is not compatible");
+        bdm_assert ( (Q.cols() == dimx) || (Q.rows() == dimx), "KalmanFull: Q is not compatible");
+        bdm_assert ( (R.cols() == dimy) || (R.rows() == dimy), "KalmanFull: R is not compatible");
 }
 

library/bdm/math/functions.h

@@ -124 +124 @@
         //! Alternative initialization
         void set_parameters ( const mat &A0, const mat &B0 ) {
-                bdm_assert_debug ( A0.rows() == B0.rows(), "bilinfn matrices must have the same number of rows" );
+                bdm_assert ( A0.rows() == B0.rows(), "bilinfn matrices must have the same number of rows" );
                 A = A0;
                 B = B0;

library/bdm/stat/discrete.h

@@ -55 +55 @@
                         void initialize() {
                                 dim = ranges.length();
-                                bdm_assert_debug(gridsizes.length() == dim, "Incompatible dimensions of input");
+                                bdm_assert(gridsizes.length() == dim, "Incompatible dimensions of input");
                                 Npoints = prod(gridsizes);
-                                bdm_assert_debug(Npoints > 0, "Wrong input parameters");
+                                bdm_assert(Npoints > 0, "Wrong input parameters");
                                 
                                 //precompute steps

library/bdm/stat/emix.cpp

@@ -12 +12 @@
 
         for ( i = 0; i < w.length(); i++ ) {
-                bdm_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
-                bdm_assert_debug ( !isnamed || tmp_rv.equal ( Coms0 ( i )->_rv() ), "Component RVs do not match!" );
+                bdm_assert ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
+                bdm_assert ( !isnamed || tmp_rv.equal ( Coms0 ( i )->_rv() ), "Component RVs do not match!" );
         }
 
@@ -44 +44 @@
 
 void emix::marginal ( const RV &rv, emix &target ) const {
-        bdm_assert_debug ( isnamed(), "rvs are not assigned" );
+        bdm_assert ( isnamed(), "rvs are not assigned" );
 
         Array<shared_ptr<epdf> > Cn ( Coms.length() );
@@ -55 +55 @@
 
 shared_ptr<mpdf> emix::condition ( const RV &rv ) const {
-        bdm_assert_debug ( isnamed(), "rvs are not assigned" );
+        bdm_assert ( isnamed(), "rvs are not assigned" );
         mratio *tmp = new mratio ( this, rv );
         return shared_ptr<mpdf>(tmp);

library/bdm/stat/exp_family.h

@@ -136 +136 @@
                 void from_setting (const Setting &root);
                 void validate() {
-                        bdm_assert_debug (mu.length() == R.rows(), "parameters mismatch");
+                        bdm_assert (mu.length() == R.rows(), "mu and R parameters do not match");
                         dim = mu.length();
                 }
@@ -416 +416 @@
                 }
                 void validate() {
-                        bdm_assert_debug (alpha.length() == beta.length(), "parameters do not match");
+                        bdm_assert (alpha.length() == beta.length(), "parameters do not match");
                         dim = alpha.length();
                 }
@@ -530 +530 @@
                         bdm_assert(high.length()==low.length(), "Incompatible high and low vectors");
                         dim = high.length();
-                        bdm_assert_debug (min (distance) > 0.0, "bad support");
+                        bdm_assert (min (distance) > 0.0, "bad support");
                 }
 };
@@ -558 +558 @@
 
                 //! Set \c A and \c R
-                void set_parameters (const  mat &A0, const vec &mu0, const sq_T &R0) {
-                        bdm_assert_debug (A0.rows() == mu0.length(), "mlnorm: A vs. mu mismatch");
-                        bdm_assert_debug (A0.rows() == R0.rows(), "mlnorm: A vs. R mismatch");
-                        
+                void set_parameters (const  mat &A0, const vec &mu0, const sq_T &R0) {  
                         this->iepdf.set_parameters (zeros (A0.rows()), R0);
                         A = A0;
@@ -593 +590 @@
                         UI::get (R0, set, "R", UI::compulsory);
                         set_parameters (A, mu_const, R0);
+                        validate();
                 };
+                void validate() {
+                        bdm_assert (A.rows() == mu_const.length(), "mlnorm: A vs. mu mismatch");
+                        bdm_assert (A.rows() == _R().rows(), "mlnorm: A vs. R mismatch");
+                        
+                }
 };
 UIREGISTER2 (mlnorm,ldmat);
@@ -704 +707 @@
 
                 void validate() {
-                        bdm_assert_debug (A.rows() == mu_const.length(), "mlstudent: A vs. mu mismatch");
-                        bdm_assert_debug (_R.rows() == A.rows(), "mlstudent: A vs. R mismatch");
+                        bdm_assert (A.rows() == mu_const.length(), "mlstudent: A vs. mu mismatch");
+                        bdm_assert (_R.rows() == A.rows(), "mlstudent: A vs. R mismatch");
                         
                 }
@@ -1156 +1159 @@
                 //! Set samples
                 void set_parameters (const Array<vec> &Av) {
-                        bdm_assert_debug(Av.size()>0,"Empty samples"); 
+                        bdm_assert(Av.size()>0,"Empty samples"); 
                         n = Av.size(); 
                         epdf::set_parameters(Av(0).length());
@@ -1322 +1325 @@
 void enorm<sq_T>::marginal ( const RV &rvn, enorm<sq_T> &target ) const
 {
-        bdm_assert_debug (isnamed(), "rv description is not assigned");
+        bdm_assert (isnamed(), "rv description is not assigned");
         ivec irvn = rvn.dataind (rv);
 
@@ -1345 +1348 @@
         typedef mlnorm<sq_T> TMlnorm;
 
-        bdm_assert_debug (isnamed(), "rvs are not assigned");
+        bdm_assert (isnamed(), "rvs are not assigned");
         TMlnorm &uptarget = dynamic_cast<TMlnorm &>(target);
 
         RV rvc = rv.subt (rvn);
-        bdm_assert_debug ( (rvc._dsize() + rvn._dsize() == rv._dsize()), "wrong rvn");
+        bdm_assert ( (rvc._dsize() + rvn._dsize() == rv._dsize()), "wrong rvn");
         //Permutation vector of the new R
         ivec irvn = rvn.dataind (rv);