Changeset 620 for library/bdm/stat/exp_family.h

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)

Files:

• library/bdm/stat/exp_family.h (modified) (9 diffs)

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);