1.1 --- a/test/maps_test.cc Fri Nov 13 12:33:33 2009 +0100
1.2 +++ b/test/maps_test.cc Thu Dec 10 17:05:35 2009 +0100
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-2008
1.8 + * Copyright (C) 2003-2009
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -170,7 +170,7 @@
1.13 {
1.14 typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
1.15 checkConcept<ReadMap<B,double>, CompMap>();
1.16 - CompMap map1(DoubleMap(),ReadMap<B,A>());
1.17 + CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>());
1.18 CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
1.19
1.20 SparseMap<double, bool> m1(false); m1[3.14] = true;
1.21 @@ -183,7 +183,7 @@
1.22 {
1.23 typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
1.24 checkConcept<ReadMap<A,double>, CombMap>();
1.25 - CombMap map1(DoubleMap(), DoubleMap());
1.26 + CombMap map1 = CombMap(DoubleMap(), DoubleMap());
1.27 CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
1.28
1.29 check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
1.30 @@ -195,11 +195,11 @@
1.31 checkConcept<ReadMap<A,B>, FunctorToMap<F,A,B> >();
1.32 checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
1.33 FunctorToMap<F> map1;
1.34 - FunctorToMap<F> map2(F());
1.35 + FunctorToMap<F> map2 = FunctorToMap<F>(F());
1.36 B b = functorToMap(F())[A()];
1.37
1.38 checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
1.39 - MapToFunctor<ReadMap<A,B> > map(ReadMap<A,B>());
1.40 + MapToFunctor<ReadMap<A,B> > map = MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
1.41
1.42 check(functorToMap(&func)[A()] == 3,
1.43 "Something is wrong with FunctorToMap");