Changeset 2252

Timestamp:

May 16, 2010, 8:34:51 PM (13 years ago)

Author:

Peter

Message:

refs #600. testing merge with archetypes

Location:

trunk

Files:

• test/merge_test.cc (modified) (2 diffs)
• yat/utility/merge.h (modified) (1 diff)

trunk/test/merge_test.cc

@@ -37 +37 @@
 void test2(test::Suite&, const Container&, const std::vector<std::string>&);
 
+void compiler_tests(void);
+
 int main(int argc, char* argv[])
 {  
@@ -57 +59 @@
   test1(suite, xw, in, y, out);
 
+  if (false) // do nut run compiler tests
+    compiler_tests();
+
   return suite.return_value();
+}
+
+
+void compiler_tests(void)
+{
+  test::container2d_archetype<double> in;
+  test::container2d_archetype<utility::DataWeight> win;
+  std::vector<std::string> labels;
+  utility::Matrix out;
+  utility::MatrixWeighted wout;
+  statistics::Average averager;
+  merge(in, labels, out);
+  merge(win, labels, out);
+  merge(in, labels, wout, averager, averager);
+  merge(win, labels, wout, averager, averager);
+
 }
 

trunk/yat/utility/merge.h

@@ -187 +187 @@
     template<typename Iterator, class Functor1, class Functor2>
     void assign(DataWeight& x, Iterator first, Iterator last, Functor1 func1,
-                Functor2 func)
+                Functor2 func2)
     {
       x.data() = func1(first, last);