Changeset 916 for trunk/yat/utility/IteratorWeighted.h

Timestamp:

Sep 30, 2007, 2:50:10 AM (16 years ago)

Author:

Peter

Message:

Sorry this commit is a bit to big.

Adding a yat_assert. The yat assert are turned on by providing a
'-DYAT_DEBUG' flag to preprocessor if normal cassert is turned
on. This flag is activated for developers running configure with
--enable-debug. The motivation is that we can use these yat_asserts in
header files and the yat_asserts will be invisible to the normal user
also if he uses C-asserts.

added output operator in DataLookup2D and removed output operator in
MatrixLookup?

Removed template function add_values in Averager and weighted version

Added function to AveragerWeighted? taking iterator to four ranges.

File:

• trunk/yat/utility/IteratorWeighted.h (modified) (2 diffs)

trunk/yat/utility/IteratorWeighted.h

@@ -3 +3 @@
 
 // $Id$
+
+#include "yat_assert.h"
 
 #include <iterator>
@@ -41 +43 @@
        \return element
      */
-    return_type operator*(void) const { return container_->operator()(index_); }
+    return_type operator*(void) const 
+    { 
+      yat_assert(index_<container_->size());
+      return container_->operator()(index_); 
+    }
 
     /**
        \return data
     */
-    return_type data(void) const { return container_->data(index_); }
+    return_type data(void) const 
+    { yat_assert(index_<container_->size()); return container_->data(index_); }
 
     /**
        \return weight
     */
-    return_type weight(void) const { return container_->weight(index_); }
+    return_type weight(void) const 
+    { yat_assert(index_<container_->size());return container_->weight(index_); }