Changeset 565 for library/bdm/math/square_mat.cpp

Timestamp:

08/19/09 16:54:24 (15 years ago)

Author:

vbarta

Message:

using own error macros (basically copied from IT++, but never aborting)

Files:

• library/bdm/math/square_mat.cpp (modified) (6 diffs)

library/bdm/math/square_mat.cpp

@@ -35 +35 @@
 };
 fsqmat::fsqmat ( const mat &M0 ) : sqmat ( M0.cols() ) {
-        it_assert_debug ( ( M0.cols() == M0.rows() ), "M0 must be square" );
+        bdm_assert_debug ( ( M0.cols() == M0.rows() ), "M0 must be square" );
         M = M0;
 };
@@ -65 +65 @@
 ldmat::ldmat ( const mat &V ) : sqmat ( V.cols() ) {
 
-        it_assert_debug ( dim == V.rows(), "ldmat::ldmat matrix V is not square!" );
+        bdm_assert_debug ( dim == V.rows(), "ldmat::ldmat matrix V is not square!" );
 
         // L and D will be allocated by ldform()
@@ -81 +81 @@
         double *rraw = r._data();
 
-        it_assert_debug ( v.length() == dim, "LD::ldupdt vector v is not compatible with this ld." );
+        bdm_assert_debug ( v.length() == dim, "LD::ldupdt vector v is not compatible with this ld." );
 
         for ( int i = dim - 1; i >= 0; i-- ) {
@@ -123 +123 @@
         int dim = D.length();
 
-        it_assert_debug ( ld2.D.length() == dim, "LD.add() incompatible sizes of LDs;" );
+        bdm_assert_debug ( ld2.D.length() == dim, "LD.add() incompatible sizes of LDs" );
 
         //Fixme can be done more efficiently either via dydr or ldform
@@ -231 +231 @@
         int mn = ( m < n ) ? m : n ;
 
-//      it_assert_debug( A.cols()==dim,"ldmat::ldform A is not compatible" );
-        it_assert_debug ( D0.length() == A.rows(), "ldmat::ldform Vector D must have the length as row count of A" );
+        bdm_assert_debug ( D0.length() == A.rows(), "ldmat::ldform Vector D must have the length as row count of A" );
 
         L = concat_vertical ( zeros ( n, n ), diag ( sqrt ( D0 ) ) * A );
@@ -389 +388 @@
                 *kr = 0.0;
                 if ( *Df < -threshold ) {
-                        it_warning ( "Problem in dydr: subraction of dyad results in negative definitness. Likely mistake in calling function." );
+                        bdm_warning ( "Problem in dydr: subraction of dyad results in negative definitness. Likely mistake in calling function." );
                 }
                 *Df = 0.0;