1.1 --- a/test/maps_test.cc Fri Aug 05 09:33:42 2011 +0200
1.2 +++ b/test/maps_test.cc Mon Aug 08 12:36:16 2011 +0200
1.3 @@ -2,7 +2,7 @@
1.4 *
1.5 * This file is a part of LEMON, a generic C++ optimization library.
1.6 *
1.7 - * Copyright (C) 2003-2009
1.8 + * Copyright (C) 2003-2011
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -70,8 +70,10 @@
1.13 checkConcept<WriteMap<A,C>, WriteMap<A,C> >();
1.14 checkConcept<ReadWriteMap<A,B>, ReadWriteMap<A,B> >();
1.15 checkConcept<ReadWriteMap<A,C>, ReadWriteMap<A,C> >();
1.16 - checkConcept<ReferenceMap<A,B,B&,const B&>, ReferenceMap<A,B,B&,const B&> >();
1.17 - checkConcept<ReferenceMap<A,C,C&,const C&>, ReferenceMap<A,C,C&,const C&> >();
1.18 + checkConcept<ReferenceMap<A,B,B&,const B&>,
1.19 + ReferenceMap<A,B,B&,const B&> >();
1.20 + checkConcept<ReferenceMap<A,C,C&,const C&>,
1.21 + ReferenceMap<A,C,C&,const C&> >();
1.22
1.23 // NullMap
1.24 {
1.25 @@ -200,7 +202,8 @@
1.26 B b = functorToMap(F())[A()];
1.27
1.28 checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
1.29 - MapToFunctor<ReadMap<A,B> > map = MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
1.30 + MapToFunctor<ReadMap<A,B> > map =
1.31 + MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
1.32
1.33 check(functorToMap(&func)[A()] == 3,
1.34 "Something is wrong with FunctorToMap");
1.35 @@ -349,7 +352,7 @@
1.36 it != map2.end(); ++it )
1.37 check(v1[i++] == *it, "Something is wrong with LoggerBoolMap");
1.38 }
1.39 -
1.40 +
1.41 // CrossRefMap
1.42 {
1.43 typedef ListDigraph Graph;
1.44 @@ -357,16 +360,16 @@
1.45
1.46 checkConcept<ReadWriteMap<Node, int>,
1.47 CrossRefMap<Graph, Node, int> >();
1.48 -
1.49 +
1.50 Graph gr;
1.51 typedef CrossRefMap<Graph, Node, char> CRMap;
1.52 typedef CRMap::ValueIterator ValueIt;
1.53 CRMap map(gr);
1.54 -
1.55 +
1.56 Node n0 = gr.addNode();
1.57 Node n1 = gr.addNode();
1.58 Node n2 = gr.addNode();
1.59 -
1.60 +
1.61 map.set(n0, 'A');
1.62 map.set(n1, 'B');
1.63 map.set(n2, 'C');