Changeset 2252


Ignore:
Timestamp:
May 16, 2010, 8:34:51 PM (12 years ago)
Author:
Peter
Message:

refs #600. testing merge with archetypes

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/merge_test.cc

    r2000 r2252  
    3737void test2(test::Suite&, const Container&, const std::vector<std::string>&);
    3838
     39void compiler_tests(void);
     40
    3941int main(int argc, char* argv[])
    4042
     
    5759  test1(suite, xw, in, y, out);
    5860
     61  if (false) // do nut run compiler tests
     62    compiler_tests();
     63
    5964  return suite.return_value();
     65}
     66
     67
     68void compiler_tests(void)
     69{
     70  test::container2d_archetype<double> in;
     71  test::container2d_archetype<utility::DataWeight> win;
     72  std::vector<std::string> labels;
     73  utility::Matrix out;
     74  utility::MatrixWeighted wout;
     75  statistics::Average averager;
     76  merge(in, labels, out);
     77  merge(win, labels, out);
     78  merge(in, labels, wout, averager, averager);
     79  merge(win, labels, wout, averager, averager);
     80
    6081}
    6182
  • trunk/yat/utility/merge.h

    r2015 r2252  
    187187    template<typename Iterator, class Functor1, class Functor2>
    188188    void assign(DataWeight& x, Iterator first, Iterator last, Functor1 func1,
    189                 Functor2 func)
     189                Functor2 func2)
    190190    {
    191191      x.data() = func1(first, last);
Note: See TracChangeset for help on using the changeset viewer.