Changeset 2262


Ignore:
Timestamp:
May 26, 2010, 6:07:57 PM (12 years ago)
Author:
Peter
Message:

fixes #600

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/yat/utility/merge.h

    r2257 r2262  
    2323*/
    2424
     25#include "concept_check.h"
    2526#include "Matrix.h"
    2627#include "MatrixWeighted.h"
     
    2930#include "yat/statistics/Average.h"
    3031
     32#include <boost/concept_check.hpp>
    3133#include <boost/iterator/permutation_iterator.hpp>
    3234
     
    152154  void merge(const Container2D& x, std::vector<std::string>& labels, Matrix& y)
    153155  {
     156    BOOST_CONCEPT_ASSERT((utility::Container2D<Container2D>));
    154157    merge(x, labels, y, statistics::Average());
    155158  }
     
    159162             Matrix& result, Functor func)
    160163  {
     164    BOOST_CONCEPT_ASSERT((utility::Container2D<Container2D>));
    161165    std::map<std::string, std::vector<size_t> > label2index;
    162166    detail::merge_labels(labels, label2index);
     
    169173             MatrixWeighted& result, Functor1 func1, Functor2 func2)
    170174  {
     175    BOOST_CONCEPT_ASSERT((utility::Container2D<Container2D>));
    171176    std::map<std::string, std::vector<size_t> > label2index;
    172177    detail::merge_labels(labels, label2index);
Note: See TracChangeset for help on using the changeset viewer.