Changeset 565 for library/bdm/stat/merger.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/stat/merger.h (modified) (2 diffs)

library/bdm/stat/merger.h

@@ -200 +200 @@
                         eSmp._w() = wtmp / sum ( wtmp );
                 } else {
-                        it_error ( "Sources are not compatible - use merger_mix" );
+                        bdm_error ( "Sources are not compatible - use merger_mix" );
                 }
         };
@@ -277 +277 @@
 
         void validate() {
-                it_assert ( eSmp._w().length() > 0, "Empty support, use set_support()." );
-                it_assert ( dim == eSmp._samples() ( 0 ).length(), "Support points and rv are not compatible!" );
-                it_assert ( isnamed(), "mergers must be named" );
+                bdm_assert ( eSmp._w().length() > 0, "Empty support, use set_support()." );
+                bdm_assert ( dim == eSmp._samples() ( 0 ).length(), "Support points and rv are not compatible!" );
+                bdm_assert ( isnamed(), "mergers must be named" );
         }
         //!@}