Changeset 565 for library/bdm/math/functions.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/functions.h (modified) (5 diffs)

library/bdm/math/functions.h

@@ -13 +13 @@
 #define FN_H
 
+#include "../bdmerror.h"
 #include "../base/bdmbase.h"
 
@@ -44 +45 @@
 public :
         vec eval ( const vec &cond ) {
-                it_assert_debug ( cond.length() == A.cols(), "linfn::eval Wrong cond." );
-                return A*cond + B;
-        };
+                bdm_assert_debug ( cond.length() == A.cols(), "linfn::eval Wrong cond." );
+                return A * cond + B;
+        }
 
 //              linfn evalsome ( ivec &rvind );
@@ -82 +83 @@
         //! Evaluates \f$f(x0,u0)\f$ (VS: Do we really need common eval? )
         vec eval ( const vec &cond ) {
-                it_assert_debug ( cond.length() == ( dimx + dimu ), "linfn::eval Wrong cond." );
+                bdm_assert_debug ( cond.length() == ( dimx + dimu ), "linfn::eval Wrong cond." );
                 return eval ( cond ( 0, dimx - 1 ), cond ( dimx, dimx + dimu - 1 ) );//-1 = end (in matlab)
-        };
+        }
 
         //! Evaluates \f$f(x0,u0)\f$
@@ -115 +116 @@
         //!@{
 
-        bilinfn () : diffbifn () , A() , B()    {};
-        bilinfn ( const mat A0, const mat B0 ) {
+        bilinfn () : diffbifn (), A(), B() { }
+
+        bilinfn ( const mat &A0, const mat &B0 ) {
                 set_parameters ( A0, B0 );
-        };
-        //! Alternative constructor
-        void set_parameters ( const mat A0, const mat B0 ) {
-                it_assert_debug ( A0.rows() == B0.rows(), "" );
+        }
+
+        //! 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" );
                 A = A0;
                 B = B0;
@@ -133 +136 @@
         //!@{
         inline vec eval ( const  vec &x0, const vec &u0 ) {
-                it_assert_debug ( x0.length() == dimx, "linfn::eval Wrong xcond." );
-                it_assert_debug ( u0.length() == dimu, "linfn::eval Wrong ucond." );
+                bdm_assert_debug ( x0.length() == dimx, "bilinfn::eval Wrong xcond." );
+                bdm_assert_debug ( u0.length() == dimu, "bilinfn::eval Wrong ucond." );
                 return A*x0 + B*u0;
         }
 
         void dfdx_cond ( const vec &x0, const vec &u0, mat &F, bool full ) {
-                it_assert_debug ( ( F.cols() == A.cols() ) & ( F.rows() == A.rows() ), "Allocated F is not compatible." );
+                bdm_assert_debug ( ( F.cols() == A.cols() ) && ( F.rows() == A.rows() ), "Allocated F is not compatible." );
                 if ( full ) F = A;      //else : nothing has changed no need to regenerate
         }
-        //!
+
         void dfdu_cond ( const vec &x0, const vec &u0, mat &F,  bool full = true ) {
-                it_assert_debug ( ( F.cols() == B.cols() ) & ( F.rows() == B.rows() ), "Allocated F is not compatible." );
+                bdm_assert_debug ( ( F.cols() == B.cols() ) && ( F.rows() == B.rows() ), "Allocated F is not compatible." );
                 if ( full ) F = B;      //else : nothing has changed no need to regenerate
         }