COIN-OR::LEMON - Graph Library

Changeset 1158:8d2e55fac752 in lemon for test/maps_test.cc


Ignore:
Timestamp:
09/13/12 11:52:50 (7 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.1
Parents:
1156:939d747055cd (diff), 1157:761fe0846f49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge #449 to branch 1.1

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • test/maps_test.cc

    r1081 r1158  
    8181    NullMap<A,B> map1;
    8282    NullMap<A,B> map2 = map1;
     83    ignore_unused_variable_warning(map2);
    8384    map1 = nullMap<A,B>();
    8485  }
     
    9192    ConstMap<A,B> map2 = B();
    9293    ConstMap<A,B> map3 = map1;
     94    ignore_unused_variable_warning(map2,map3);
     95
    9396    map1 = constMap<A>(B());
    9497    map1 = constMap<A,B>();
     
    9699    ConstMap<A,C> map4(C(1));
    97100    ConstMap<A,C> map5 = map4;
     101    ignore_unused_variable_warning(map5);
     102
    98103    map4 = constMap<A>(C(2));
    99104    map4.setAll(C(3));
     
    116121    IdentityMap<A> map1;
    117122    IdentityMap<A> map2 = map1;
     123    ignore_unused_variable_warning(map2);
     124
    118125    map1 = identityMap<A>();
    119126
     
    175182    checkConcept<ReadMap<B,double>, CompMap>();
    176183    CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>());
     184    ignore_unused_variable_warning(map1);
    177185    CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
     186    ignore_unused_variable_warning(map2);
    178187
    179188    SparseMap<double, bool> m1(false); m1[3.14] = true;
     
    188197    checkConcept<ReadMap<A,double>, CombMap>();
    189198    CombMap map1 = CombMap(DoubleMap(), DoubleMap());
     199    ignore_unused_variable_warning(map1);
    190200    CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
     201    ignore_unused_variable_warning(map2);
    191202
    192203    check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
     
    200211    FunctorToMap<F> map1;
    201212    FunctorToMap<F> map2 = FunctorToMap<F>(F());
     213    ignore_unused_variable_warning(map2);
     214
    202215    B b = functorToMap(F())[A()];
     216    ignore_unused_variable_warning(b);
    203217
    204218    checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
    205219    MapToFunctor<ReadMap<A,B> > map =
    206220      MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
     221    ignore_unused_variable_warning(map);
    207222
    208223    check(functorToMap(&func)[A()] == 3,
     
    222237      ConvertMap<ReadMap<double, int>, double> >();
    223238    ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true));
     239    ignore_unused_variable_warning(map1);
    224240    ConvertMap<RangeMap<bool>, int> map2 = convertMap<int>(rangeMap(2, false));
     241    ignore_unused_variable_warning(map2);
     242
    225243  }
    226244
  • test/maps_test.cc

    r1157 r1158  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2009
     5 * Copyright (C) 2003-2011
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
     
    7171  checkConcept<ReadWriteMap<A,B>, ReadWriteMap<A,B> >();
    7272  checkConcept<ReadWriteMap<A,C>, ReadWriteMap<A,C> >();
    73   checkConcept<ReferenceMap<A,B,B&,const B&>, ReferenceMap<A,B,B&,const B&> >();
    74   checkConcept<ReferenceMap<A,C,C&,const C&>, ReferenceMap<A,C,C&,const C&> >();
     73  checkConcept<ReferenceMap<A,B,B&,const B&>,
     74               ReferenceMap<A,B,B&,const B&> >();
     75  checkConcept<ReferenceMap<A,C,C&,const C&>,
     76               ReferenceMap<A,C,C&,const C&> >();
    7577
    7678  // NullMap
     
    369371      check(v1[i++] == *it, "Something is wrong with LoggerBoolMap");
    370372  }
    371  
     373
    372374  // CrossRefMap
    373375  {
     
    377379    checkConcept<ReadWriteMap<Node, int>,
    378380                 CrossRefMap<Graph, Node, int> >();
    379    
     381
    380382    Graph gr;
    381383    typedef CrossRefMap<Graph, Node, char> CRMap;
    382384    typedef CRMap::ValueIterator ValueIt;
    383385    CRMap map(gr);
    384    
     386
    385387    Node n0 = gr.addNode();
    386388    Node n1 = gr.addNode();
    387389    Node n2 = gr.addNode();
    388    
     390
    389391    map.set(n0, 'A');
    390392    map.set(n1, 'B');
Note: See TracChangeset for help on using the changeset viewer.