Changeset 565 for library/bdm/stat/emix.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/stat/emix.cpp (modified) (6 diffs)

library/bdm/stat/emix.cpp

@@ -12 +12 @@
 
         for ( i = 0; i < w.length(); i++ ) {
-                it_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
-                it_assert_debug ( !isnamed || tmp_rv.equal ( Coms0 ( i )->_rv() ), "Component RVs do not match!" );
+                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!" );
         }
 
@@ -44 +44 @@
 
 void emix::marginal ( const RV &rv, emix &target ) const {
-        it_assert_debug ( isnamed(), "rvs are not assigned" );
+        bdm_assert_debug ( isnamed(), "rvs are not assigned" );
 
         Array<shared_ptr<epdf> > Cn ( Coms.length() );
@@ -55 +55 @@
 
 shared_ptr<mpdf> emix::condition ( const RV &rv ) const {
-        it_assert_debug ( isnamed(), "rvs are not assigned" );
+        bdm_assert_debug ( isnamed(), "rvs are not assigned" );
         mratio *tmp = new mratio ( this, rv );
         return shared_ptr<mpdf>(tmp);
@@ -65 +65 @@
         int i;
         for ( i = 0; i < w.length(); i++ ) {
-                it_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
+                bdm_assert_debug ( dim == ( Coms0 ( i )->dimension() ), "Component sizes do not match!" );
         }
         if ( copy ) {
                 Coms.set_length ( Coms0.length() );
                 for ( i = 0; i < w.length(); i++ ) {
-                        it_error ( "Not imp..." );
-                        *Coms ( i ) = *Coms0 ( i );
+                        bdm_error ( "Not implemented" );
+                        // *Coms ( i ) = *Coms0 ( i );
                 }
                 destroyComs = true;
@@ -124 +124 @@
 
 void egiwmix::marginal ( const RV &rv, emix &target ) const {
-        it_assert_debug ( isnamed(), "rvs are not assigned" );
+        bdm_assert_debug ( isnamed(), "rvs are not assigned" );
 
         Array<shared_ptr<epdf> > Cn ( Coms.length() );
@@ -247 +247 @@
 //                      rvaddok=rv.add ( mpdfs ( i )->_rv() ); //add rv to common rvs.
 //                      // If rvaddok==false, mpdfs overlap => assert error.
-//                      it_assert_debug(rvaddok||overlap,"mprod::mprod() input mpdfs overlap in rv!");
 //                      epdfs ( i ) = & ( mpdfs ( i )->posterior() ); // add pointer to epdf
 //              };