Changeset 2262

Timestamp:

May 26, 2010, 6:07:57 PM (13 years ago)

Author:

Peter

Message:

fixes #600

File:

• trunk/yat/utility/merge.h (modified) (5 diffs)

trunk/yat/utility/merge.h

@@ -23 +23 @@
 */
 
+#include "concept_check.h"
 #include "Matrix.h"
 #include "MatrixWeighted.h"
@@ -29 +30 @@
 #include "yat/statistics/Average.h"
 
+#include <boost/concept_check.hpp>
 #include <boost/iterator/permutation_iterator.hpp>
 
@@ -152 +154 @@
   void merge(const Container2D& x, std::vector<std::string>& labels, Matrix& y)
   {
+    BOOST_CONCEPT_ASSERT((utility::Container2D<Container2D>));
     merge(x, labels, y, statistics::Average());
   }
@@ -159 +162 @@
              Matrix& result, Functor func)
   {
+    BOOST_CONCEPT_ASSERT((utility::Container2D<Container2D>));
     std::map<std::string, std::vector<size_t> > label2index;
     detail::merge_labels(labels, label2index);
@@ -169 +173 @@
              MatrixWeighted& result, Functor1 func1, Functor2 func2)
   {
+    BOOST_CONCEPT_ASSERT((utility::Container2D<Container2D>));
     std::map<std::string, std::vector<size_t> > label2index;
     detail::merge_labels(labels, label2index);