Changeset 1675:fa89ffb27a6d in lemon-0.x for test/maps_test.cc

Timestamp:

09/08/05 16:34:50 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2193

Message:

Redesign of the map adaptors.
/smart reference handling only used by functions/

Better handling of the function objects and functions.

\todo May we use operators instead of the addMap, subMap...?

File:

• test/maps_test.cc (modified) (3 diffs)

test/maps_test.cc

@@ -10 +10 @@
 struct A {};
 struct B {};
-class F
-{
+
+class F {
 public:
+  typedef A argument_type;
+  typedef B result_type;
+
   B operator()(const A &) const {return B();}
 };
 
 int func(A) {return 3;}
+
+int binc(int, B) {return 4;}
 
 typedef ReadMap<A,double> DoubleMap;
@@ -39 +44 @@
   checkConcept<ReadMap<B,double>, ComposeMap<DoubleMap,ReadMap<B,A> > >();
 
-  checkConcept<ReadMap<A,B>, FunctorMap<A,B,F> >();
+  checkConcept<ReadMap<A,B>, FunctorMap<F, A, B> >();
 
   int a;
@@ -47 +52 @@
 
   B b;
-  b=functorMap<A,B>(F())[A()];
+  b=functorMap(F())[A()];
 
-  a=functorMap<A,int>(&func)[A()];
+  a=functorMap(&func)[A()];
   check(a==3,"Something is wrong with functorMap");
+
+  a=combineMap(constMap<B, int, 1>(), identityMap<B>(), &binc)[B()];
+  check(a==4,"Something is wrong with combineMap");
+  
 
   std::cout << __FILE__ ": All tests passed.\n";