Changeset 565 for library/bdm/math/chmat.h

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/chmat.h (modified) (4 diffs)

library/bdm/math/chmat.h

@@ -14 +14 @@
 #define CHMAT_H
 
-
+#include "../bdmerror.h"
 #include "square_mat.h"
 
@@ -44 +44 @@
         //! add another chmat \c A2 with weight \c w.
         void add ( const chmat &A2, double w = 1.0 ) {
-                it_assert_debug ( dim == A2.dim, "Matrices of unequal dimension" );
+                bdm_assert_debug ( dim == A2.dim, "Matrices of unequal dimension" );
                 mat pre = concat_vertical ( Ch, sqrt ( w ) * A2.Ch );
                 mat post = zeros ( pre.rows(), pre.cols() );
                 if ( !qr ( pre, post ) ) {
-                        it_warning ( "Unstable QR in chmat add" );
+                        bdm_warning ( "Unstable QR in chmat add" );
                 }
                 Ch = post ( 0, dim - 1, 0, dim - 1 );
@@ -70 +70 @@
         chmat ( const chmat &Ch0 ) : sqmat ( Ch0.dim ), Ch ( Ch0.dim, Ch0.dim ) {
                 Ch = Ch0.Ch;
-        };
+        }
+
         //! Default constructor (m3k:cholform)
         chmat ( const mat &M ) : sqmat ( M.rows() ), Ch ( M.rows(), M.cols() ) {
                 mat Q;
-                it_assert_debug ( M.rows() == M.cols(), "chmat:: input matrix must be square!" );
+                bdm_assert_debug ( M.rows() == M.cols(), "chmat:: input matrix must be square!" );
                 Ch = chol ( M );
-        };
-        //! Constructor
-        chmat ( const chmat &M, const ivec &perm ) : sqmat ( M.rows() ) {
-                it_error ( "not implemneted" );
-        };
+        }
+
+        /*!
+          Some templates require this constructor to compile, but
+          it shouldn't actually be called.
+        */
+        chmat ( const chmat &M, const ivec &perm ) {
+                bdm_error ( "not implemented" );
+        }
+
         //! Access function
         mat & _Ch() {
@@ -95 +101 @@
         //! Access functions
         void setCh ( const vec &chQ ) {
-                it_assert_debug ( chQ.length() == dim*dim, "" );
+                bdm_assert_debug ( chQ.length() == dim * dim, "wrong length" );
                 copy_vector ( dim*dim, chQ._data(), Ch._data() );
         }
+
         //! Access functions
         void setD ( const vec &nD, int i ) {