Unify sources 1.0 r1.0.7
authorAlpar Juttner <alpar@cs.elte.hu>
Fri, 05 Aug 2011 00:17:29 +0200
branch1.0
changeset 427c59bdcc8e33e
parent 426 8276e0ee48b1
child 428 a1d8d1736c68
Unify sources
doc/dirs.dox
doc/groups.dox
doc/lgf.dox
lemon/base.cc
lemon/bits/default_map.h
lemon/bits/map_extender.h
lemon/bits/path_dump.h
lemon/bits/windows.cc
lemon/core.h
lemon/dfs.h
lemon/graph_to_eps.h
lemon/lgf_reader.h
lemon/lgf_writer.h
lemon/list_graph.h
lemon/path.h
lemon/random.h
lemon/smart_graph.h
lemon/time_measure.h
lemon/tolerance.h
lemon/unionfind.h
test/dfs_test.cc
test/graph_copy_test.cc
test/lgf_test.cc
test/maps_test.cc
     1.1 --- a/doc/dirs.dox	Fri Aug 05 00:12:23 2011 +0200
     1.2 +++ b/doc/dirs.dox	Fri Aug 05 00:17:29 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-2008
     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 @@ -71,7 +71,7 @@
    1.13  \dir bits
    1.14  \brief Auxiliary tools for implementation.
    1.15  
    1.16 -This directory contains some auxiliary classes for implementing graphs, 
    1.17 +This directory contains some auxiliary classes for implementing graphs,
    1.18  maps and some other classes.
    1.19  As a user you typically don't have to deal with these files.
    1.20  */
     2.1 --- a/doc/groups.dox	Fri Aug 05 00:12:23 2011 +0200
     2.2 +++ b/doc/groups.dox	Fri Aug 05 00:17:29 2011 +0200
     2.3 @@ -2,7 +2,7 @@
     2.4   *
     2.5   * This file is a part of LEMON, a generic C++ optimization library.
     2.6   *
     2.7 - * Copyright (C) 2003-2008
     2.8 + * Copyright (C) 2003-2011
     2.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    2.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    2.11   *
    2.12 @@ -303,7 +303,7 @@
    2.13  @defgroup map_concepts Map Concepts
    2.14  @ingroup concept
    2.15  \brief Skeleton and concept checking classes for maps
    2.16 - 
    2.17 +
    2.18  This group describes the skeletons and concept checking classes of maps.
    2.19  */
    2.20  
     3.1 --- a/doc/lgf.dox	Fri Aug 05 00:12:23 2011 +0200
     3.2 +++ b/doc/lgf.dox	Fri Aug 05 00:17:29 2011 +0200
     3.3 @@ -2,7 +2,7 @@
     3.4   *
     3.5   * This file is a part of LEMON, a generic C++ optimization library.
     3.6   *
     3.7 - * Copyright (C) 2003-2008
     3.8 + * Copyright (C) 2003-2011
     3.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    3.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    3.11   *
     4.1 --- a/lemon/base.cc	Fri Aug 05 00:12:23 2011 +0200
     4.2 +++ b/lemon/base.cc	Fri Aug 05 00:17:29 2011 +0200
     4.3 @@ -2,7 +2,7 @@
     4.4   *
     4.5   * This file is a part of LEMON, a generic C++ optimization library.
     4.6   *
     4.7 - * Copyright (C) 2003-2008
     4.8 + * Copyright (C) 2003-2011
     4.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    4.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    4.11   *
     5.1 --- a/lemon/bits/default_map.h	Fri Aug 05 00:12:23 2011 +0200
     5.2 +++ b/lemon/bits/default_map.h	Fri Aug 05 00:17:29 2011 +0200
     5.3 @@ -2,7 +2,7 @@
     5.4   *
     5.5   * This file is a part of LEMON, a generic C++ optimization library.
     5.6   *
     5.7 - * Copyright (C) 2003-2008
     5.8 + * Copyright (C) 2003-2011
     5.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    5.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    5.11   *
     6.1 --- a/lemon/bits/map_extender.h	Fri Aug 05 00:12:23 2011 +0200
     6.2 +++ b/lemon/bits/map_extender.h	Fri Aug 05 00:17:29 2011 +0200
     6.3 @@ -2,7 +2,7 @@
     6.4   *
     6.5   * This file is a part of LEMON, a generic C++ optimization library.
     6.6   *
     6.7 - * Copyright (C) 2003-2008
     6.8 + * Copyright (C) 2003-2011
     6.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    6.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    6.11   *
     7.1 --- a/lemon/bits/path_dump.h	Fri Aug 05 00:12:23 2011 +0200
     7.2 +++ b/lemon/bits/path_dump.h	Fri Aug 05 00:17:29 2011 +0200
     7.3 @@ -2,7 +2,7 @@
     7.4   *
     7.5   * This file is a part of LEMON, a generic C++ optimization library.
     7.6   *
     7.7 - * Copyright (C) 2003-2008
     7.8 + * Copyright (C) 2003-2011
     7.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    7.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    7.11   *
     8.1 --- a/lemon/bits/windows.cc	Fri Aug 05 00:12:23 2011 +0200
     8.2 +++ b/lemon/bits/windows.cc	Fri Aug 05 00:17:29 2011 +0200
     8.3 @@ -2,7 +2,7 @@
     8.4   *
     8.5   * This file is a part of LEMON, a generic C++ optimization library.
     8.6   *
     8.7 - * Copyright (C) 2003-2009
     8.8 + * Copyright (C) 2003-2011
     8.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    8.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    8.11   *
    8.12 @@ -96,7 +96,7 @@
    8.13        SYSTEMTIME time;
    8.14        GetSystemTime(&time);
    8.15        char buf1[11], buf2[9], buf3[5];
    8.16 -	  if (GetDateFormat(MY_LOCALE, 0, &time,
    8.17 +          if (GetDateFormat(MY_LOCALE, 0, &time,
    8.18                          ("ddd MMM dd"), buf1, 11) &&
    8.19            GetTimeFormat(MY_LOCALE, 0, &time,
    8.20                          ("HH':'mm':'ss"), buf2, 9) &&
     9.1 --- a/lemon/core.h	Fri Aug 05 00:12:23 2011 +0200
     9.2 +++ b/lemon/core.h	Fri Aug 05 00:17:29 2011 +0200
     9.3 @@ -2,7 +2,7 @@
     9.4   *
     9.5   * This file is a part of LEMON, a generic C++ optimization library.
     9.6   *
     9.7 - * Copyright (C) 2003-2008
     9.8 + * Copyright (C) 2003-2011
     9.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    9.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    9.11   *
    10.1 --- a/lemon/dfs.h	Fri Aug 05 00:12:23 2011 +0200
    10.2 +++ b/lemon/dfs.h	Fri Aug 05 00:17:29 2011 +0200
    10.3 @@ -2,7 +2,7 @@
    10.4   *
    10.5   * This file is a part of LEMON, a generic C++ optimization library.
    10.6   *
    10.7 - * Copyright (C) 2003-2008
    10.8 + * Copyright (C) 2003-2011
    10.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   10.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   10.11   *
    11.1 --- a/lemon/graph_to_eps.h	Fri Aug 05 00:12:23 2011 +0200
    11.2 +++ b/lemon/graph_to_eps.h	Fri Aug 05 00:17:29 2011 +0200
    11.3 @@ -2,7 +2,7 @@
    11.4   *
    11.5   * This file is a part of LEMON, a generic C++ optimization library.
    11.6   *
    11.7 - * Copyright (C) 2003-2008
    11.8 + * Copyright (C) 2003-2011
    11.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   11.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   11.11   *
    12.1 --- a/lemon/lgf_reader.h	Fri Aug 05 00:12:23 2011 +0200
    12.2 +++ b/lemon/lgf_reader.h	Fri Aug 05 00:17:29 2011 +0200
    12.3 @@ -391,7 +391,7 @@
    12.4    class DigraphReader;
    12.5  
    12.6    template <typename Digraph>
    12.7 -  DigraphReader<Digraph> digraphReader(Digraph& digraph, 
    12.8 +  DigraphReader<Digraph> digraphReader(Digraph& digraph,
    12.9                                         std::istream& is = std::cin);
   12.10    template <typename Digraph>
   12.11    DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn);
   12.12 @@ -563,7 +563,7 @@
   12.13      template <typename DGR>
   12.14      friend DigraphReader<DGR> digraphReader(DGR& digraph, std::istream& is);
   12.15      template <typename DGR>
   12.16 -    friend DigraphReader<DGR> digraphReader(DGR& digraph, 
   12.17 +    friend DigraphReader<DGR> digraphReader(DGR& digraph,
   12.18                                              const std::string& fn);
   12.19      template <typename DGR>
   12.20      friend DigraphReader<DGR> digraphReader(DGR& digraph, const char *fn);
   12.21 @@ -1229,9 +1229,9 @@
   12.22  
   12.23    template <typename Graph>
   12.24    class GraphReader;
   12.25 - 
   12.26 +
   12.27    template <typename Graph>
   12.28 -  GraphReader<Graph> graphReader(Graph& graph, 
   12.29 +  GraphReader<Graph> graphReader(Graph& graph,
   12.30                                   std::istream& is = std::cin);
   12.31    template <typename Graph>
   12.32    GraphReader<Graph> graphReader(Graph& graph, const std::string& fn);
   12.33 @@ -1366,7 +1366,7 @@
   12.34      template <typename GR>
   12.35      friend GraphReader<GR> graphReader(GR& graph, std::istream& is);
   12.36      template <typename GR>
   12.37 -    friend GraphReader<GR> graphReader(GR& graph, const std::string& fn); 
   12.38 +    friend GraphReader<GR> graphReader(GR& graph, const std::string& fn);
   12.39      template <typename GR>
   12.40      friend GraphReader<GR> graphReader(GR& graph, const char *fn);
   12.41  
    13.1 --- a/lemon/lgf_writer.h	Fri Aug 05 00:12:23 2011 +0200
    13.2 +++ b/lemon/lgf_writer.h	Fri Aug 05 00:17:29 2011 +0200
    13.3 @@ -2,7 +2,7 @@
    13.4   *
    13.5   * This file is a part of LEMON, a generic C++ optimization library.
    13.6   *
    13.7 - * Copyright (C) 2003-2008
    13.8 + * Copyright (C) 2003-2011
    13.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   13.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   13.11   *
   13.12 @@ -506,7 +506,7 @@
   13.13    private:
   13.14  
   13.15      template <typename DGR>
   13.16 -    friend DigraphWriter<DGR> digraphWriter(const DGR& digraph, 
   13.17 +    friend DigraphWriter<DGR> digraphWriter(const DGR& digraph,
   13.18                                              std::ostream& os);
   13.19      template <typename DGR>
   13.20      friend DigraphWriter<DGR> digraphWriter(const DGR& digraph,
   13.21 @@ -1082,7 +1082,7 @@
   13.22      template <typename GR>
   13.23      friend GraphWriter<GR> graphWriter(const GR& graph,
   13.24                                         const char *fn);
   13.25 -    
   13.26 +
   13.27      GraphWriter(GraphWriter& other)
   13.28        : _os(other._os), local_os(other.local_os), _graph(other._graph),
   13.29          _skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) {
    14.1 --- a/lemon/list_graph.h	Fri Aug 05 00:12:23 2011 +0200
    14.2 +++ b/lemon/list_graph.h	Fri Aug 05 00:17:29 2011 +0200
    14.3 @@ -2,7 +2,7 @@
    14.4   *
    14.5   * This file is a part of LEMON, a generic C++ optimization library.
    14.6   *
    14.7 - * Copyright (C) 2003-2008
    14.8 + * Copyright (C) 2003-2011
    14.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   14.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   14.11   *
   14.12 @@ -840,8 +840,8 @@
   14.13        explicit Arc(int pid) { id = pid;}
   14.14  
   14.15      public:
   14.16 -      operator Edge() const { 
   14.17 -        return id != -1 ? edgeFromId(id / 2) : INVALID; 
   14.18 +      operator Edge() const {
   14.19 +        return id != -1 ? edgeFromId(id / 2) : INVALID;
   14.20        }
   14.21  
   14.22        Arc() {}
    15.1 --- a/lemon/path.h	Fri Aug 05 00:12:23 2011 +0200
    15.2 +++ b/lemon/path.h	Fri Aug 05 00:17:29 2011 +0200
    15.3 @@ -2,7 +2,7 @@
    15.4   *
    15.5   * This file is a part of LEMON, a generic C++ optimization library.
    15.6   *
    15.7 - * Copyright (C) 2003-2008
    15.8 + * Copyright (C) 2003-2011
    15.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   15.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   15.11   *
   15.12 @@ -966,20 +966,20 @@
   15.13        }
   15.14      };
   15.15  
   15.16 -    
   15.17 +
   15.18      template <typename From, typename To,
   15.19                bool revEnable = RevPathTagIndicator<From>::value>
   15.20      struct PathCopySelector {
   15.21        static void copy(const From& from, To& to) {
   15.22          PathCopySelectorForward<From, To>::copy(from, to);
   15.23 -      }      
   15.24 +      }
   15.25      };
   15.26  
   15.27      template <typename From, typename To>
   15.28      struct PathCopySelector<From, To, true> {
   15.29        static void copy(const From& from, To& to) {
   15.30          PathCopySelectorBackward<From, To>::copy(from, to);
   15.31 -      }      
   15.32 +      }
   15.33      };
   15.34  
   15.35    }
    16.1 --- a/lemon/random.h	Fri Aug 05 00:12:23 2011 +0200
    16.2 +++ b/lemon/random.h	Fri Aug 05 00:17:29 2011 +0200
    16.3 @@ -2,7 +2,7 @@
    16.4   *
    16.5   * This file is a part of LEMON, a generic C++ optimization library.
    16.6   *
    16.7 - * Copyright (C) 2003-2008
    16.8 + * Copyright (C) 2003-2011
    16.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   16.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   16.11   *
    17.1 --- a/lemon/smart_graph.h	Fri Aug 05 00:12:23 2011 +0200
    17.2 +++ b/lemon/smart_graph.h	Fri Aug 05 00:17:29 2011 +0200
    17.3 @@ -2,7 +2,7 @@
    17.4   *
    17.5   * This file is a part of LEMON, a generic C++ optimization library.
    17.6   *
    17.7 - * Copyright (C) 2003-2008
    17.8 + * Copyright (C) 2003-2011
    17.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   17.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   17.11   *
   17.12 @@ -466,8 +466,8 @@
   17.13        explicit Arc(int id) { _id = id;}
   17.14  
   17.15      public:
   17.16 -      operator Edge() const { 
   17.17 -        return _id != -1 ? edgeFromId(_id / 2) : INVALID; 
   17.18 +      operator Edge() const {
   17.19 +        return _id != -1 ? edgeFromId(_id / 2) : INVALID;
   17.20        }
   17.21  
   17.22        Arc() {}
    18.1 --- a/lemon/time_measure.h	Fri Aug 05 00:12:23 2011 +0200
    18.2 +++ b/lemon/time_measure.h	Fri Aug 05 00:17:29 2011 +0200
    18.3 @@ -2,7 +2,7 @@
    18.4   *
    18.5   * This file is a part of LEMON, a generic C++ optimization library.
    18.6   *
    18.7 - * Copyright (C) 2003-2008
    18.8 + * Copyright (C) 2003-2011
    18.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   18.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   18.11   *
    19.1 --- a/lemon/tolerance.h	Fri Aug 05 00:12:23 2011 +0200
    19.2 +++ b/lemon/tolerance.h	Fri Aug 05 00:17:29 2011 +0200
    19.3 @@ -2,7 +2,7 @@
    19.4   *
    19.5   * This file is a part of LEMON, a generic C++ optimization library.
    19.6   *
    19.7 - * Copyright (C) 2003-2008
    19.8 + * Copyright (C) 2003-2011
    19.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   19.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   19.11   *
    20.1 --- a/lemon/unionfind.h	Fri Aug 05 00:12:23 2011 +0200
    20.2 +++ b/lemon/unionfind.h	Fri Aug 05 00:17:29 2011 +0200
    20.3 @@ -2,7 +2,7 @@
    20.4   *
    20.5   * This file is a part of LEMON, a generic C++ optimization library.
    20.6   *
    20.7 - * Copyright (C) 2003-2008
    20.8 + * Copyright (C) 2003-2011
    20.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   20.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   20.11   *
   20.12 @@ -1189,7 +1189,7 @@
   20.13                int ld = nodes[nodes[jd].next].left;
   20.14                popLeft(nodes[jd].next);
   20.15                pushRight(jd, ld);
   20.16 -              if (less(ld, nodes[jd].left) || 
   20.17 +              if (less(ld, nodes[jd].left) ||
   20.18                    nodes[ld].item == nodes[pd].item) {
   20.19                  nodes[jd].item = nodes[ld].item;
   20.20                  nodes[jd].prio = nodes[ld].prio;
    21.1 --- a/test/dfs_test.cc	Fri Aug 05 00:12:23 2011 +0200
    21.2 +++ b/test/dfs_test.cc	Fri Aug 05 00:17:29 2011 +0200
    21.3 @@ -2,7 +2,7 @@
    21.4   *
    21.5   * This file is a part of LEMON, a generic C++ optimization library.
    21.6   *
    21.7 - * Copyright (C) 2003-2008
    21.8 + * Copyright (C) 2003-2011
    21.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   21.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   21.11   *
   21.12 @@ -184,7 +184,7 @@
   21.13    Dfs<Digraph> dfs(G);
   21.14    check(dfs.run(s1,t1) && dfs.reached(t1),"Node 3 is reachable from Node 6.");
   21.15    }
   21.16 -  
   21.17 +
   21.18    {
   21.19      NullMap<Node,Arc> myPredMap;
   21.20      dfs(G).predMap(myPredMap).run(s);
    22.1 --- a/test/graph_copy_test.cc	Fri Aug 05 00:12:23 2011 +0200
    22.2 +++ b/test/graph_copy_test.cc	Fri Aug 05 00:17:29 2011 +0200
    22.3 @@ -2,7 +2,7 @@
    22.4   *
    22.5   * This file is a part of LEMON, a generic C++ optimization library.
    22.6   *
    22.7 - * Copyright (C) 2003-2008
    22.8 + * Copyright (C) 2003-2011
    22.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   22.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   22.11   *
   22.12 @@ -70,7 +70,7 @@
   22.13      nodeRef(nr).arcRef(er).
   22.14      nodeCrossRef(ncr).arcCrossRef(ecr).
   22.15      node(fn, tn).arc(fa, ta).run();
   22.16 -  
   22.17 +
   22.18    check(countNodes(from) == countNodes(to), "Wrong copy.");
   22.19    check(countArcs(from) == countArcs(to), "Wrong copy.");
   22.20  
   22.21 @@ -98,7 +98,7 @@
   22.22  
   22.23    // Test repeated copy
   22.24    digraphCopy(from, to).run();
   22.25 -  
   22.26 +
   22.27    check(countNodes(from) == countNodes(to), "Wrong copy.");
   22.28    check(countArcs(from) == countArcs(to), "Wrong copy.");
   22.29  }
   22.30 @@ -200,7 +200,7 @@
   22.31  
   22.32    // Test repeated copy
   22.33    graphCopy(from, to).run();
   22.34 -  
   22.35 +
   22.36    check(countNodes(from) == countNodes(to), "Wrong copy.");
   22.37    check(countEdges(from) == countEdges(to), "Wrong copy.");
   22.38    check(countArcs(from) == countArcs(to), "Wrong copy.");
    23.1 --- a/test/lgf_test.cc	Fri Aug 05 00:12:23 2011 +0200
    23.2 +++ b/test/lgf_test.cc	Fri Aug 05 00:17:29 2011 +0200
    23.3 @@ -63,10 +63,10 @@
    23.4    "0 1\n";
    23.5  
    23.6  
    23.7 -int main() 
    23.8 +int main()
    23.9  {
   23.10    {
   23.11 -    ListDigraph d; 
   23.12 +    ListDigraph d;
   23.13      ListDigraph::Node s,t;
   23.14      ListDigraph::ArcMap<int> label(d);
   23.15      std::istringstream input(test_lgf);
   23.16 @@ -93,7 +93,7 @@
   23.17    }
   23.18  
   23.19    {
   23.20 -    ListDigraph d; 
   23.21 +    ListDigraph d;
   23.22      std::istringstream input(test_lgf_nomap);
   23.23      digraphReader(d, input).
   23.24        run();
   23.25 @@ -110,14 +110,14 @@
   23.26    }
   23.27  
   23.28    {
   23.29 -    ListDigraph d; 
   23.30 +    ListDigraph d;
   23.31      std::istringstream input(test_lgf_bad1);
   23.32      bool ok=false;
   23.33      try {
   23.34        digraphReader(d, input).
   23.35          run();
   23.36      }
   23.37 -    catch (FormatError& error) 
   23.38 +    catch (FormatError& error)
   23.39        {
   23.40          ok = true;
   23.41        }
   23.42 @@ -139,7 +139,7 @@
   23.43    }
   23.44  
   23.45    {
   23.46 -    ListDigraph d; 
   23.47 +    ListDigraph d;
   23.48      std::istringstream input(test_lgf_bad2);
   23.49      bool ok=false;
   23.50      try {
    24.1 --- a/test/maps_test.cc	Fri Aug 05 00:12:23 2011 +0200
    24.2 +++ b/test/maps_test.cc	Fri Aug 05 00:17:29 2011 +0200
    24.3 @@ -2,7 +2,7 @@
    24.4   *
    24.5   * This file is a part of LEMON, a generic C++ optimization library.
    24.6   *
    24.7 - * Copyright (C) 2003-2008
    24.8 + * Copyright (C) 2003-2011
    24.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
   24.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
   24.11   *
   24.12 @@ -69,8 +69,10 @@
   24.13    checkConcept<WriteMap<A,C>, WriteMap<A,C> >();
   24.14    checkConcept<ReadWriteMap<A,B>, ReadWriteMap<A,B> >();
   24.15    checkConcept<ReadWriteMap<A,C>, ReadWriteMap<A,C> >();
   24.16 -  checkConcept<ReferenceMap<A,B,B&,const B&>, ReferenceMap<A,B,B&,const B&> >();
   24.17 -  checkConcept<ReferenceMap<A,C,C&,const C&>, ReferenceMap<A,C,C&,const C&> >();
   24.18 +  checkConcept<ReferenceMap<A,B,B&,const B&>,
   24.19 +               ReferenceMap<A,B,B&,const B&> >();
   24.20 +  checkConcept<ReferenceMap<A,C,C&,const C&>,
   24.21 +               ReferenceMap<A,C,C&,const C&> >();
   24.22  
   24.23    // NullMap
   24.24    {
   24.25 @@ -199,7 +201,8 @@
   24.26      B b = functorToMap(F())[A()];
   24.27  
   24.28      checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
   24.29 -    MapToFunctor<ReadMap<A,B> > map = MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
   24.30 +    MapToFunctor<ReadMap<A,B> > map =
   24.31 +      MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
   24.32  
   24.33      check(functorToMap(&func)[A()] == 3,
   24.34            "Something is wrong with FunctorToMap");