Changeset 209:765619b7cbb2 in lemon-main

Timestamp:

07/13/08 20:51:02 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Apply unify-sources.sh to the source tree

Files:

• demo/arg_parser_demo.cc (modified) (4 diffs)
• demo/graph_to_eps_demo.cc (modified) (8 diffs)
• demo/lgf_demo.cc (modified) (3 diffs)
• doc/coding_style.dox (modified) (5 diffs)
• doc/dirs.dox (modified) (2 diffs)
• doc/groups.dox (modified) (22 diffs)
• doc/lgf.dox (modified) (3 diffs)
• doc/license.dox (modified) (1 diff)
• doc/mainpage.dox (modified) (2 diffs)
• doc/namespaces.dox (modified) (1 diff)
• doc/template.h (modified) (1 diff)
• lemon/arg_parser.cc (modified) (22 diffs)
• lemon/arg_parser.h (modified) (26 diffs)
• lemon/assert.h (modified) (13 diffs)
• lemon/base.cc (modified) (1 diff)
• lemon/bfs.h (modified) (92 diffs)
• lemon/bin_heap.h (modified) (19 diffs)
• lemon/bits/alteration_notifier.h (modified) (28 diffs)
• lemon/bits/array_map.h (modified) (18 diffs)
• lemon/bits/base_extender.h (modified) (18 diffs)
• lemon/bits/bezier.h (modified) (8 diffs)
• lemon/bits/default_map.h (modified) (4 diffs)
• lemon/bits/graph_extender.h (modified) (42 diffs)
• lemon/bits/invalid.h (modified) (3 diffs)
• lemon/bits/map_extender.h (modified) (16 diffs)
• lemon/bits/path_dump.h (modified) (6 diffs)
• lemon/bits/traits.h (modified) (20 diffs)
• lemon/bits/utility.h (modified) (7 diffs)
• lemon/bits/vector_map.h (modified) (12 diffs)
• lemon/color.cc (modified) (3 diffs)
• lemon/color.h (modified) (7 diffs)
• lemon/concept_check.h (modified) (2 diffs)
• lemon/concepts/digraph.h (modified) (23 diffs)
• lemon/concepts/graph.h (modified) (35 diffs)
• lemon/concepts/graph_components.h (modified) (62 diffs)
• lemon/concepts/heap.h (modified) (6 diffs)
• lemon/concepts/maps.h (modified) (9 diffs)
• lemon/concepts/path.h (modified) (9 diffs)
• lemon/counter.h (modified) (14 diffs)
• lemon/dfs.h (modified) (90 diffs)
• lemon/dijkstra.h (modified) (74 diffs)
• lemon/dim2.h (modified) (41 diffs)
• lemon/error.h (modified) (15 diffs)
• lemon/graph_to_eps.h (modified) (47 diffs)
• lemon/graph_utils.h (modified) (150 diffs)
• lemon/kruskal.h (modified) (22 diffs)
• lemon/lgf_reader.h (modified) (120 diffs)
• lemon/lgf_writer.h (modified) (76 diffs)
• lemon/list_graph.h (modified) (78 diffs)
• lemon/maps.h (modified) (10 diffs)
• lemon/math.h (modified) (3 diffs)
• lemon/path.h (modified) (21 diffs)
• lemon/random.cc (modified) (1 diff)
• lemon/random.h (modified) (51 diffs)
• lemon/smart_graph.h (modified) (45 diffs)
• lemon/time_measure.h (modified) (24 diffs)
• lemon/tolerance.h (modified) (4 diffs)
• lemon/unionfind.h (modified) (78 diffs)
• test/bfs_test.cc (modified) (9 diffs)
• test/counter_test.cc (modified) (3 diffs)
• test/dfs_test.cc (modified) (9 diffs)
• test/digraph_test.cc (modified) (2 diffs)
• test/dijkstra_test.cc (modified) (10 diffs)
• test/dim_test.cc (modified) (1 diff)
• test/error_test.cc (modified) (2 diffs)
• test/graph_copy_test.cc (modified) (4 diffs)
• test/graph_maps_test.h (modified) (5 diffs)
• test/graph_test.cc (modified) (5 diffs)
• test/graph_test.h (modified) (3 diffs)
• test/graph_utils_test.cc (modified) (4 diffs)
• test/heap_test.cc (modified) (10 diffs)
• test/kruskal_test.cc (modified) (4 diffs)
• test/maps_test.cc (modified) (3 diffs)
• test/path_test.cc (modified) (2 diffs)
• test/random_test.cc (modified) (2 diffs)
• test/test_tools.h (modified) (1 diff)
• test/test_tools_fail.cc (modified) (2 diffs)
• test/test_tools_pass.cc (modified) (2 diffs)
• test/time_measure_test.cc (modified) (4 diffs)
• test/unionfind_test.cc (modified) (2 diffs)

demo/arg_parser_demo.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -65 +65 @@
   ap.other("infile", "The input file.")
     .other("...");
-  
+
   // Perform the parsing process
   // (in case of any error it terminates the program)
@@ -85 +85 @@
   if(ap.given("grb")) std::cout << "  -grb is given\n";
   if(ap.given("grc")) std::cout << "  -grc is given\n";
-  
+
   switch(ap.files().size()) {
   case 0:
@@ -95 +95 @@
   default:
     std::cout << "  "
-              << ap.files().size() << " file arguments were given. They are:\n";
+              << ap.files().size() << " file arguments were given. They are:\n";
   }
   for(unsigned int i=0;i<ap.files().size();++i)
     std::cout << "    '" << ap.files()[i] << "'\n";
-  
+
   return 0;
 }

demo/graph_to_eps_demo.cc

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -50 +50 @@
   typedef ListDigraph::Arc Arc;
   typedef dim2::Point<int> Point;
-  
+
   Node n1=g.addNode();
   Node n2=g.addNode();
@@ -63 +63 @@
   ListDigraph::ArcMap<int> acolors(g);
   ListDigraph::ArcMap<int> widths(g);
-  
+
   coords[n1]=Point(50,50);  sizes[n1]=1; colors[n1]=1; shapes[n1]=0;
   coords[n2]=Point(50,70);  sizes[n2]=2; colors[n2]=2; shapes[n2]=2;
@@ -69 +69 @@
   coords[n4]=Point(70,50);  sizes[n4]=2; colors[n4]=4; shapes[n4]=1;
   coords[n5]=Point(85,60);  sizes[n5]=3; colors[n5]=5; shapes[n5]=2;
-  
+
   Arc a;
 
@@ -79 +79 @@
   a=g.addArc(n2,n4); acolors[a]=1; widths[a]=2;
   a=g.addArc(n3,n4); acolors[a]=2; widths[a]=1;
-  
+
   IdMap<ListDigraph,Node> id(g);
 
@@ -183 +183 @@
   ListDigraph::NodeMap<int> hcolors(h);
   ListDigraph::NodeMap<Point> hcoords(h);
-  
+
   int cols=int(sqrt(double(palette.size())));
   for(int i=0;i<int(paletteW.size());i++) {
@@ -190 +190 @@
     hcolors[n]=i;
   }
-  
+
   cout << "Create 'graph_to_eps_demo_out_6_colors.eps'" << endl;
   graphToEps(h,"graph_to_eps_demo_out_6_colors.eps").
@@ -203 +203 @@
     nodeColors(composeMap(paletteW,hcolors)).
     run();
-    
+
   return 0;
 }

demo/lgf_demo.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -22 +22 @@
 ///
 /// This program gives an example of how to read and write a digraph
-/// and additional maps from/to a stream or a file using the 
+/// and additional maps from/to a stream or a file using the
 /// \ref lgf-format "LGF" format.
 ///
@@ -43 +43 @@
   SmartDigraph::ArcMap<int> cap(g);
   SmartDigraph::Node s, t;
-  
+
   try {
     digraphReader("digraph.lgf", g). // read the directed graph into g

doc/coding_style.dox

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -19 +19 @@
 /*!
 
-\page coding_style LEMON Coding Style 
+\page coding_style LEMON Coding Style
 
 \section naming_conv Naming Conventions
@@ -69 +69 @@
 
 \code
-AllWordsCapitalizedWithoutUnderscores 
+AllWordsCapitalizedWithoutUnderscores
 \endcode
 
@@ -77 +77 @@
 
 \code
-firstWordLowerCaseRestCapitalizedWithoutUnderscores 
+firstWordLowerCaseRestCapitalizedWithoutUnderscores
 \endcode
 
@@ -85 +85 @@
 
 \code
-ALL_UPPER_CASE_WITH_UNDERSCORES 
+ALL_UPPER_CASE_WITH_UNDERSCORES
 \endcode
 
-\subsection cs-loc-var Class and instance member variables, auto variables 
+\subsection cs-loc-var Class and instance member variables, auto variables
 
 The names of class and instance member variables and auto variables (=variables used locally in methods) should look like the following.
 
 \code
-all_lower_case_with_underscores 
+all_lower_case_with_underscores
 \endcode
 

doc/dirs.dox

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -75 +75 @@
 
 This directory contains some helper classes to implement graphs, maps and
-some other classes. As a user you typically don't have to deal with these 
+some other classes. As a user you typically don't have to deal with these
 files.
 */

doc/groups.dox

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -27 +27 @@
 \brief Graph structures implemented in LEMON.
 
-The implementation of combinatorial algorithms heavily relies on 
-efficient graph implementations. LEMON offers data structures which are 
-planned to be easily used in an experimental phase of implementation studies, 
-and thereafter the program code can be made efficient by small modifications. 
+The implementation of combinatorial algorithms heavily relies on
+efficient graph implementations. LEMON offers data structures which are
+planned to be easily used in an experimental phase of implementation studies,
+and thereafter the program code can be made efficient by small modifications.
 
 The most efficient implementation of diverse applications require the
@@ -41 +41 @@
 some graph features like arc/edge or node deletion.
 
-Alteration of standard containers need a very limited number of 
-operations, these together satisfy the everyday requirements. 
-In the case of graph structures, different operations are needed which do 
-not alter the physical graph, but gives another view. If some nodes or 
+Alteration of standard containers need a very limited number of
+operations, these together satisfy the everyday requirements.
+In the case of graph structures, different operations are needed which do
+not alter the physical graph, but gives another view. If some nodes or
 arcs have to be hidden or the reverse oriented graph have to be used, then
-this is the case. It also may happen that in a flow implementation 
-the residual graph can be accessed by another algorithm, or a node-set 
-is to be shrunk for another algorithm. 
-LEMON also provides a variety of graphs for these requirements called 
-\ref graph_adaptors "graph adaptors". Adaptors cannot be used alone but only 
-in conjunction with other graph representations. 
+this is the case. It also may happen that in a flow implementation
+the residual graph can be accessed by another algorithm, or a node-set
+is to be shrunk for another algorithm.
+LEMON also provides a variety of graphs for these requirements called
+\ref graph_adaptors "graph adaptors". Adaptors cannot be used alone but only
+in conjunction with other graph representations.
 
 You are free to use the graph structure that fit your requirements
 the best, most graph algorithms and auxiliary data structures can be used
-with any graph structures. 
+with any graph structures.
 */
 
@@ -64 +64 @@
 
 This group describes some graph types between real graphs and graph adaptors.
-These classes wrap graphs to give new functionality as the adaptors do it. 
+These classes wrap graphs to give new functionality as the adaptors do it.
 On the other hand they are not light-weight structures as the adaptors.
 */
 
 /**
-@defgroup maps Maps 
+@defgroup maps Maps
 @ingroup datas
 \brief Map structures implemented in LEMON.
@@ -80 +80 @@
 
 /**
-@defgroup graph_maps Graph Maps 
+@defgroup graph_maps Graph Maps
 @ingroup maps
 \brief Special graph-related maps.
@@ -116 +116 @@
     }
   }
-  
+
   Digraph::NodeMap<int> degree_map(graph);
-  
+
   digraphToEps(graph, "graph.eps")
     .coords(coords).scaleToA4().undirected()
     .nodeColors(composeMap(functorToMap(nodeColor), degree_map))
     .run();
-\endcode 
+\endcode
 The \c functorToMap() function makes an \c int to \c Color map from the
 \e nodeColor() function. The \c composeMap() compose the \e degree_map
@@ -141 +141 @@
   typedef DivMap<DoubleArcMap, DoubleArcMap> TimeMap;
   TimeMap time(length, speed);
-  
+
   Dijkstra<Digraph, TimeMap> dijkstra(graph, time);
   dijkstra.run(source, target);
@@ -153 +153 @@
 
 /**
-@defgroup matrices Matrices 
+@defgroup matrices Matrices
 @ingroup datas
 \brief Two dimensional data storages implemented in LEMON.
@@ -201 +201 @@
 \brief Common graph search algorithms.
 
-This group describes the common graph search algorithms like 
+This group describes the common graph search algorithms like
 Breadth-first search (Bfs) and Depth-first search (Dfs).
 */
@@ -213 +213 @@
 */
 
-/** 
-@defgroup max_flow Maximum Flow algorithms 
-@ingroup algs 
+/**
+@defgroup max_flow Maximum Flow algorithms
+@ingroup algs
 \brief Algorithms for finding maximum flows.
 
@@ -232 +232 @@
 
 LEMON contains several algorithms for solving maximum flow problems:
-- \ref lemon::EdmondsKarp "Edmonds-Karp" 
+- \ref lemon::EdmondsKarp "Edmonds-Karp"
 - \ref lemon::Preflow "Goldberg's Preflow algorithm"
 - \ref lemon::DinitzSleatorTarjan "Dinitz's blocking flow algorithm with dynamic trees"
@@ -251 +251 @@
 
 This group describes the algorithms for finding minimum cost flows and
-circulations.  
-*/
-
-/**
-@defgroup min_cut Minimum Cut algorithms 
-@ingroup algs 
+circulations.
+*/
+
+/**
+@defgroup min_cut Minimum Cut algorithms
+@ingroup algs
 
 \brief Algorithms for finding minimum cut in graphs.
@@ -273 +273 @@
 
 - \ref lemon::HaoOrlin "Hao-Orlin algorithm" to calculate minimum cut
-  in directed graphs  
+  in directed graphs
 - \ref lemon::NagamochiIbaraki "Nagamochi-Ibaraki algorithm" to
   calculate minimum cut in undirected graphs
@@ -308 +308 @@
 
 /**
-@defgroup matching Matching algorithms 
+@defgroup matching Matching algorithms
 @ingroup algs
 \brief Algorithms for finding matchings in graphs and bipartite graphs.
@@ -315 +315 @@
 matchings in graphs and bipartite graphs. The general matching problem is
 finding a subset of the arcs which does not shares common endpoints.
- 
+
 There are several different algorithms for calculate matchings in
 graphs.  The matching problems in bipartite graphs are generally
@@ -324 +324 @@
 
 Lemon contains the next algorithms:
-- \ref lemon::MaxBipartiteMatching "MaxBipartiteMatching" Hopcroft-Karp 
-  augmenting path algorithm for calculate maximum cardinality matching in 
+- \ref lemon::MaxBipartiteMatching "MaxBipartiteMatching" Hopcroft-Karp
+  augmenting path algorithm for calculate maximum cardinality matching in
   bipartite graphs
-- \ref lemon::PrBipartiteMatching "PrBipartiteMatching" Push-Relabel 
-  algorithm for calculate maximum cardinality matching in bipartite graphs 
-- \ref lemon::MaxWeightedBipartiteMatching "MaxWeightedBipartiteMatching" 
-  Successive shortest path algorithm for calculate maximum weighted matching 
+- \ref lemon::PrBipartiteMatching "PrBipartiteMatching" Push-Relabel
+  algorithm for calculate maximum cardinality matching in bipartite graphs
+- \ref lemon::MaxWeightedBipartiteMatching "MaxWeightedBipartiteMatching"
+  Successive shortest path algorithm for calculate maximum weighted matching
   and maximum weighted bipartite matching in bipartite graph
-- \ref lemon::MinCostMaxBipartiteMatching "MinCostMaxBipartiteMatching" 
-  Successive shortest path algorithm for calculate minimum cost maximum 
+- \ref lemon::MinCostMaxBipartiteMatching "MinCostMaxBipartiteMatching"
+  Successive shortest path algorithm for calculate minimum cost maximum
   matching in bipartite graph
 - \ref lemon::MaxMatching "MaxMatching" Edmond's blossom shrinking algorithm
@@ -397 +397 @@
 */
 
-/** 
-@defgroup lp_utils Tools for Lp and Mip solvers 
+/**
+@defgroup lp_utils Tools for Lp and Mip solvers
 @ingroup lp_group
 \brief Helper tools to the Lp and Mip solvers.
@@ -415 +415 @@
 
 /**
-@defgroup utils Tools and Utilities 
+@defgroup utils Tools and Utilities
 \brief Tools and utilities for programming in LEMON
 
@@ -468 +468 @@
 \brief Graph Input-Output methods
 
-This group describes the tools for importing and exporting graphs 
+This group describes the tools for importing and exporting graphs
 and graph related data. Now it supports the LEMON format, the
 \c DIMACS format and the encapsulated postscript (EPS) format.
@@ -487 +487 @@
 
 This group describes general \c EPS drawing methods and special
-graph exporting tools. 
+graph exporting tools.
 */
 
@@ -499 +499 @@
 
 The purpose of the classes in this group is fourfold.
- 
+
 - These classes contain the documentations of the concepts. In order
   to avoid document multiplications, an implementation of a concept
@@ -552 +552 @@
 @defgroup tools Standalone utility applications
 
-Some utility applications are listed here. 
+Some utility applications are listed here.
 
 The standard compilation procedure (<tt>./configure;make</tt>) will compile
-them, as well. 
-*/
-
+them, as well.
+*/
+

doc/lgf.dox

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -44 +44 @@
 while a quoted token is a
 character sequence surrounded by double quotes, and it can also
-contain whitespaces and escape sequences. 
+contain whitespaces and escape sequences.
 
 The \c \@nodes section describes a set of nodes and associated
@@ -73 +73 @@
 \code
  @arcs
-              capacity
+               capacity
  1   2   16
  1   3   12

doc/license.dox

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008

doc/mainpage.dox

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -42 +42 @@
 \subsection howtoread How to read the documentation
 
-If you want to get a quick start and see the most important features then 
+If you want to get a quick start and see the most important features then
 take a look at our \ref quicktour
 "Quick Tour to LEMON" which will guide you along.
 
-If you already feel like using our library, see the page that tells you 
+If you already feel like using our library, see the page that tells you
 \ref getstart "How to start using LEMON".
 
-If you 
-want to see how LEMON works, see 
+If you
+want to see how LEMON works, see
 some \ref demoprograms "demo programs"!
 

doc/namespaces.dox

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008

doc/template.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008

lemon/arg_parser.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -39 +39 @@
     for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
       if(i->second.self_delete)
-        switch(i->second.type) {
-        case BOOL:
-          delete i->second.bool_p;
-          break;
-        case STRING:
-          delete i->second.string_p;
-          break;
-        case DOUBLE:
-          delete i->second.double_p;
-          break;
-        case INTEGER:
-          delete i->second.int_p;
-          break;
-        case UNKNOWN:
-          break;
-        case FUNC:
-          break;
-        }
-  }
-  
+        switch(i->second.type) {
+        case BOOL:
+          delete i->second.bool_p;
+          break;
+        case STRING:
+          delete i->second.string_p;
+          break;
+        case DOUBLE:
+          delete i->second.double_p;
+          break;
+        case INTEGER:
+          delete i->second.int_p;
+          break;
+        case UNKNOWN:
+          break;
+        case FUNC:
+          break;
+        }
+  }
+
 
   ArgParser &ArgParser::intOption(const std::string &name,
-                               const std::string &help,
-                               int value, bool obl)
+                               const std::string &help,
+                               int value, bool obl)
   {
     ParData p;
@@ -75 +75 @@
 
   ArgParser &ArgParser::doubleOption(const std::string &name,
-                               const std::string &help,
-                               double value, bool obl)
+                               const std::string &help,
+                               double value, bool obl)
   {
     ParData p;
@@ -89 +89 @@
 
   ArgParser &ArgParser::boolOption(const std::string &name,
-                               const std::string &help,
-                               bool value, bool obl)
+                               const std::string &help,
+                               bool value, bool obl)
   {
     ParData p;
@@ -103 +103 @@
 
   ArgParser &ArgParser::stringOption(const std::string &name,
-                               const std::string &help,
-                               std::string value, bool obl)
+                               const std::string &help,
+                               std::string value, bool obl)
   {
     ParData p;
@@ -117 +117 @@
 
   ArgParser &ArgParser::refOption(const std::string &name,
-                               const std::string &help,
-                               int &ref, bool obl)
+                               const std::string &help,
+                               int &ref, bool obl)
   {
     ParData p;
@@ -162 +162 @@
 
   ArgParser &ArgParser::refOption(const std::string &name,
-                               const std::string &help,
-                               std::string &ref, bool obl)
+                               const std::string &help,
+                               std::string &ref, bool obl)
   {
     ParData p;
@@ -176 +176 @@
 
   ArgParser &ArgParser::funcOption(const std::string &name,
-                               const std::string &help,
-                               void (*func)(void *),void *data)
+                               const std::string &help,
+                               void (*func)(void *),void *data)
   {
     ParData p;
@@ -191 +191 @@
 
   ArgParser &ArgParser::optionGroup(const std::string &group,
-                                    const std::string &opt)
+                                    const std::string &opt)
   {
     Opts::iterator i = _opts.find(opt);
     LEMON_ASSERT(i!=_opts.end(), "Unknown option: '"+opt+"'");
-    LEMON_ASSERT(!(i->second.ingroup), 
+    LEMON_ASSERT(!(i->second.ingroup),
                  "Option already in option group: '"+opt+"'");
     GroupData &g=_groups[group];
@@ -211 +211 @@
 
   ArgParser &ArgParser::synonym(const std::string &syn,
-                                const std::string &opt)
+                                const std::string &opt)
   {
     Opts::iterator o = _opts.find(opt);
@@ -234 +234 @@
 
   ArgParser &ArgParser::other(const std::string &name,
-                              const std::string &help)
+                              const std::string &help)
   {
     _others_help.push_back(OtherArg(name,help));
@@ -245 +245 @@
     if(i->second.has_syn)
       for(Opts::iterator j=_opts.begin();j!=_opts.end();++j)
-        if(j->second.syn&&j->second.help==i->first)
-          os << "|-" << j->first;
+        if(j->second.syn&&j->second.help==i->first)
+          os << "|-" << j->first;
     switch(i->second.type) {
     case STRING:
@@ -271 +271 @@
     }
   }
-    
+
   void ArgParser::showHelp(Opts::iterator i)
   {
@@ -284 +284 @@
     if(i->help.size()==0) return;
     std::cerr << "  " << i->name << std::endl
-              << "     " << i->help << std::endl;
-  }
-    
+              << "     " << i->help << std::endl;
+  }
+
   void ArgParser::shortHelp()
   {
@@ -300 +300 @@
       if(!g->second.mandatory) cstr << ']';
       if(pos+cstr.str().size()>LINE_LEN) {
-        std::cerr << std::endl << indent;
-        pos=indent.size();
+        std::cerr << std::endl << indent;
+        pos=indent.size();
       }
       std::cerr << cstr.str();
@@ -308 +308 @@
     for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
       if(!i->second.ingroup&&!i->second.syn) {
-        std::ostringstream cstr;
-        cstr << ' ';
-        if(!i->second.mandatory) cstr << '[';
-        show(cstr,i);
-        if(!i->second.mandatory) cstr << ']';
-        if(pos+cstr.str().size()>LINE_LEN) {
-          std::cerr << std::endl << indent;
-          pos=indent.size();
-        }
-        std::cerr << cstr.str();
-        pos+=cstr.str().size();
+        std::ostringstream cstr;
+        cstr << ' ';
+        if(!i->second.mandatory) cstr << '[';
+        show(cstr,i);
+        if(!i->second.mandatory) cstr << ']';
+        if(pos+cstr.str().size()>LINE_LEN) {
+          std::cerr << std::endl << indent;
+          pos=indent.size();
+        }
+        std::cerr << cstr.str();
+        pos+=cstr.str().size();
       }
     for(std::vector<OtherArg>::iterator i=_others_help.begin();
-        i!=_others_help.end();++i)
+        i!=_others_help.end();++i)
       {
-        std::ostringstream cstr;
-        cstr << ' ' << i->name;
-      
-        if(pos+cstr.str().size()>LINE_LEN) {
-          std::cerr << std::endl << indent;
-          pos=indent.size();
-        }
-        std::cerr << cstr.str();
-        pos+=cstr.str().size();
+        std::ostringstream cstr;
+        cstr << ' ' << i->name;
+
+        if(pos+cstr.str().size()>LINE_LEN) {
+          std::cerr << std::endl << indent;
+          pos=indent.size();
+        }
+        std::cerr << cstr.str();
+        pos+=cstr.str().size();
       }
     std::cerr << std::endl;
   }
-    
+
   void ArgParser::showHelp()
   {
@@ -341 +341 @@
     std::cerr << "Where:\n";
     for(std::vector<OtherArg>::iterator i=_others_help.begin();
-        i!=_others_help.end();++i) showHelp(i);
+        i!=_others_help.end();++i) showHelp(i);
     for(Opts::iterator i=_opts.begin();i!=_opts.end();++i) showHelp(i);
     exit(1);
   }
-    
-      
-  void ArgParser::unknownOpt(std::string arg) 
+
+
+  void ArgParser::unknownOpt(std::string arg)
   {
     std::cerr << "\nUnknown option: " << arg << "\n";
@@ -354 +354 @@
     exit(1);
   }
-    
-  void ArgParser::requiresValue(std::string arg, OptType t) 
+
+  void ArgParser::requiresValue(std::string arg, OptType t)
   {
     std::cerr << "Argument '" << arg << "' requires a";
@@ -374 +374 @@
     showHelp();
   }
-    
+
 
   void ArgParser::checkMandatories()
@@ -380 +380 @@
     bool ok=true;
     for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
-      if(i->second.mandatory&&!i->second.set) 
-        {
-          if(ok)
-            std::cerr << _command_name 
-                      << ": The following mandatory arguments are missing.\n";
-          ok=false;
-          showHelp(i);
-        }
+      if(i->second.mandatory&&!i->second.set)
+        {
+          if(ok)
+            std::cerr << _command_name
+                      << ": The following mandatory arguments are missing.\n";
+          ok=false;
+          showHelp(i);
+        }
     for(Groups::iterator i=_groups.begin();i!=_groups.end();++i)
       if(i->second.mandatory||i->second.only_one)
-        {
-          int set=0;
-          for(GroupData::Opts::iterator o=i->second.opts.begin();
-              o!=i->second.opts.end();++o)
-            if(_opts.find(*o)->second.set) ++set;
-          if(i->second.mandatory&&!set) {
-            std::cerr << _command_name 
-                      << ": At least one of the following arguments is mandatory.\n";
-            ok=false;
-            for(GroupData::Opts::iterator o=i->second.opts.begin();
-                o!=i->second.opts.end();++o)
-              showHelp(_opts.find(*o));
-          }
-          if(i->second.only_one&&set>1) {
-            std::cerr << _command_name 
-                      << ": At most one of the following arguments can be given.\n";
-            ok=false;
-            for(GroupData::Opts::iterator o=i->second.opts.begin();
-                o!=i->second.opts.end();++o)
-              showHelp(_opts.find(*o));
-          }
-        }
+        {
+          int set=0;
+          for(GroupData::Opts::iterator o=i->second.opts.begin();
+              o!=i->second.opts.end();++o)
+            if(_opts.find(*o)->second.set) ++set;
+          if(i->second.mandatory&&!set) {
+            std::cerr << _command_name
+                      << ": At least one of the following arguments is mandatory.\n";
+            ok=false;
+            for(GroupData::Opts::iterator o=i->second.opts.begin();
+                o!=i->second.opts.end();++o)
+              showHelp(_opts.find(*o));
+          }
+          if(i->second.only_one&&set>1) {
+            std::cerr << _command_name
+                      << ": At most one of the following arguments can be given.\n";
+            ok=false;
+            for(GroupData::Opts::iterator o=i->second.opts.begin();
+                o!=i->second.opts.end();++o)
+              showHelp(_opts.find(*o));
+          }
+        }
     if(!ok) {
       std::cerr << "\nType '" << _command_name <<
-        " --help' to obtain a short summary on the usage.\n\n";
+        " --help' to obtain a short summary on the usage.\n\n";
       exit(1);
     }
@@ -424 +424 @@
       std::string arg(_argv[ar]);
       if (arg[0] != '-' || arg.size() == 1) {
-        _file_args.push_back(arg);
+        _file_args.push_back(arg);
       }
       else {
-        Opts::iterator i = _opts.find(arg.substr(1));
-        if(i==_opts.end()) unknownOpt(arg);
-        else {
-          if(i->second.syn) i=_opts.find(i->second.help);
-          ParData &p(i->second);
-          if (p.type==BOOL) *p.bool_p=true;
-          else if (p.type==FUNC) p.func_p.p(p.func_p.data);
-          else if(++ar==_argc) requiresValue(arg, p.type);
-          else {
-            std::string val(_argv[ar]);
-            std::istringstream vals(val);
-            switch(p.type) {
-            case STRING:
-              *p.string_p=val;
-              break;
-            case INTEGER:
-              vals >> *p.int_p;
-              break;
-            case DOUBLE:
-              vals >> *p.double_p;
-              break;
-            default:
-              break;
-            }
-            if(p.type!=STRING&&(!vals||!vals.eof()))
-              requiresValue(arg, p.type);
-          }
-          p.set = true;
-        }
+        Opts::iterator i = _opts.find(arg.substr(1));
+        if(i==_opts.end()) unknownOpt(arg);
+        else {
+          if(i->second.syn) i=_opts.find(i->second.help);
+          ParData &p(i->second);
+          if (p.type==BOOL) *p.bool_p=true;
+          else if (p.type==FUNC) p.func_p.p(p.func_p.data);
+          else if(++ar==_argc) requiresValue(arg, p.type);
+          else {
+            std::string val(_argv[ar]);
+            std::istringstream vals(val);
+            switch(p.type) {
+            case STRING:
+              *p.string_p=val;
+              break;
+            case INTEGER:
+              vals >> *p.int_p;
+              break;
+            case DOUBLE:
+              vals >> *p.double_p;
+              break;
+            default:
+              break;
+            }
+            if(p.type!=STRING&&(!vals||!vals.eof()))
+              requiresValue(arg, p.type);
+          }
+          p.set = true;
+        }
       }
     }
@@ -461 +461 @@
 
     return *this;
-  }  
+  }
 
 }

lemon/arg_parser.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -42 +42 @@
   ///For a complete example see the \ref arg_parser_demo.cc demo file.
   class ArgParser {
-    
+
     static void _showHelp(void *p);
   protected:
-    
+
     int _argc;
     const char **_argv;
-    
+
     enum OptType { UNKNOWN=0, BOOL=1, STRING=2, DOUBLE=3, INTEGER=4, FUNC=5 };
-    
+
     class ParData {
     public:
       union {
-        bool *bool_p;
-        int *int_p;
-        double *double_p;
-        std::string *string_p;
-        struct {
-          void (*p)(void *);
-          void *data;
-        } func_p;
-          
+        bool *bool_p;
+        int *int_p;
+        double *double_p;
+        std::string *string_p;
+        struct {
+          void (*p)(void *);
+          void *data;
+        } func_p;
+
       };
       std::string help;
@@ -73 +73 @@
       bool self_delete;
       ParData() : mandatory(false), type(UNKNOWN), set(false), ingroup(false),
-                  has_syn(false), syn(false), self_delete(false) {}
+                  has_syn(false), syn(false), self_delete(false) {}
     };
 
@@ -79 +79 @@
     Opts _opts;
 
-    class GroupData 
+    class GroupData
     {
     public:
@@ -88 +88 @@
       GroupData() :only_one(false), mandatory(false) {}
     };
-      
+
     typedef std::map<std::string,GroupData> Groups;
     Groups _groups;
@@ -99 +99 @@
 
     };
-      
+
     std::vector<OtherArg> _others_help;
     std::vector<std::string> _file_args;
     std::string _command_name;
 
-    
+
   private:
     //Bind a function to an option.
@@ -114 +114 @@
     //\param data Data to be passed to \c func
     ArgParser &funcOption(const std::string &name,
-                    const std::string &help,
-                    void (*func)(void *),void *data);
-    
+                    const std::string &help,
+                    void (*func)(void *),void *data);
+
   public:
 
@@ -137 +137 @@
     ///\param obl Indicate if the option is mandatory.
     ArgParser &intOption(const std::string &name,
-                    const std::string &help,
-                    int value=0, bool obl=false);
+                    const std::string &help,
+                    int value=0, bool obl=false);
 
     ///Add a new floating point type option
@@ -148 +148 @@
     ///\param obl Indicate if the option is mandatory.
     ArgParser &doubleOption(const std::string &name,
-                      const std::string &help,
-                      double value=0, bool obl=false);
+                      const std::string &help,
+                      double value=0, bool obl=false);
 
     ///Add a new bool type option
@@ -160 +160 @@
     ///\note A mandatory bool obtion is of very little use.
     ArgParser &boolOption(const std::string &name,
-                      const std::string &help,
-                      bool value=false, bool obl=false);
+                      const std::string &help,
+                      bool value=false, bool obl=false);
 
     ///Add a new string type option
@@ -171 +171 @@
     ///\param obl Indicate if the option is mandatory.
     ArgParser &stringOption(const std::string &name,
-                      const std::string &help,
-                      std::string value="", bool obl=false);
+                      const std::string &help,
+                      std::string value="", bool obl=false);
 
     ///Give help string for non-parsed arguments.
@@ -180 +180 @@
     ///\c help gives a more detailed description.
     ArgParser &other(const std::string &name,
-                     const std::string &help="");
-    
+                     const std::string &help="");
+
     ///@}
 
@@ -198 +198 @@
     ///\retval ref The value of the argument will be written to this variable.
     ArgParser &refOption(const std::string &name,
-                    const std::string &help,
-                    int &ref, bool obl=false);
+                    const std::string &help,
+                    int &ref, bool obl=false);
 
     ///Add a new floating type option with a storage reference
@@ -209 +209 @@
     ///\retval ref The value of the argument will be written to this variable.
     ArgParser &refOption(const std::string &name,
-                      const std::string &help,
-                      double &ref, bool obl=false);
+                      const std::string &help,
+                      double &ref, bool obl=false);
 
     ///Add a new bool type option with a storage reference
@@ -221 +221 @@
     ///\note A mandatory bool obtion is of very little use.
     ArgParser &refOption(const std::string &name,
-                      const std::string &help,
-                      bool &ref, bool obl=false);
+                      const std::string &help,
+                      bool &ref, bool obl=false);
 
     ///Add a new string type option with a storage reference
@@ -232 +232 @@
     ///\retval ref The value of the argument will be written to this variable.
     ArgParser &refOption(const std::string &name,
-                      const std::string &help,
-                      std::string &ref, bool obl=false);
-    
+                      const std::string &help,
+                      std::string &ref, bool obl=false);
+
     ///@}
 
     ///\name Option Groups and Synonyms
     ///
-    
+
     ///@{
 
@@ -249 +249 @@
     ///\param opt The option name.
     ArgParser &optionGroup(const std::string &group,
-                           const std::string &opt);
+                           const std::string &opt);
 
     ///Make the members of a group exclusive
@@ -256 +256 @@
     ///given at the same time.
     ArgParser &onlyOneGroup(const std::string &group);
-  
+
     ///Make a group mandatory
 
@@ -262 +262 @@
     ///must be given.
     ArgParser &mandatoryGroup(const std::string &group);
-    
+
     ///Create synonym to an option
 
@@ -268 +268 @@
     ///option \c opt.
     ArgParser &synonym(const std::string &syn,
-                           const std::string &opt);
-    
+                           const std::string &opt);
+
     ///@}
 
@@ -283 +283 @@
     void requiresValue(std::string arg, OptType t);
     void checkMandatories();
-    
+
     ///Start the parsing process
     ArgParser &parse();
 
     /// Synonym for parse()
-    ArgParser &run() 
+    ArgParser &run()
     {
       return parse();
     }
-    
+
     ///Give back the command name (the 0th argument)
     const std::string &commandName() { return _command_name; }
 
     ///Check if an opion has been given to the command.
-    bool given(std::string op) 
+    bool given(std::string op)
     {
       Opts::iterator i = _opts.find(op);
@@ -305 +305 @@
 
     ///Magic type for operator[]
-    
+
     ///This is the type of the return value of ArgParser::operator[]().
     ///It automatically converts to \c int, \c double, \c bool or
     ///\c std::string if the type of the option matches, otherwise it
     ///throws an exception (i.e. it performs runtime type checking).
-    class RefType 
+    class RefType
     {
       ArgParser &_parser;
@@ -318 +318 @@
       RefType(ArgParser &p,const std::string &n) :_parser(p),_name(n) {}
       ///\e
-      operator bool() 
+      operator bool()
       {
-        Opts::iterator i = _parser._opts.find(_name);
-        LEMON_ASSERT(i!=_parser._opts.end(),
-                     std::string()+"Unkown option: '"+_name+"'");
-        LEMON_ASSERT(i->second.type==ArgParser::BOOL,
-                     std::string()+"'"+_name+"' is a bool option");
-        return *(i->second.bool_p);
+        Opts::iterator i = _parser._opts.find(_name);
+        LEMON_ASSERT(i!=_parser._opts.end(),
+                     std::string()+"Unkown option: '"+_name+"'");
+        LEMON_ASSERT(i->second.type==ArgParser::BOOL,
+                     std::string()+"'"+_name+"' is a bool option");
+        return *(i->second.bool_p);
       }
       ///\e
       operator std::string()
       {
-        Opts::iterator i = _parser._opts.find(_name);
-        LEMON_ASSERT(i!=_parser._opts.end(),
-                     std::string()+"Unkown option: '"+_name+"'");
-        LEMON_ASSERT(i->second.type==ArgParser::STRING,
-                     std::string()+"'"+_name+"' is a string option");
-        return *(i->second.string_p);
+        Opts::iterator i = _parser._opts.find(_name);
+        LEMON_ASSERT(i!=_parser._opts.end(),
+                     std::string()+"Unkown option: '"+_name+"'");
+        LEMON_ASSERT(i->second.type==ArgParser::STRING,
+                     std::string()+"'"+_name+"' is a string option");
+        return *(i->second.string_p);
       }
       ///\e
-      operator double() 
+      operator double()
       {
-        Opts::iterator i = _parser._opts.find(_name);
-        LEMON_ASSERT(i!=_parser._opts.end(),
-                     std::string()+"Unkown option: '"+_name+"'");
-        LEMON_ASSERT(i->second.type==ArgParser::DOUBLE ||
-                     i->second.type==ArgParser::INTEGER,
-                     std::string()+"'"+_name+"' is a floating point option");
-        return i->second.type==ArgParser::DOUBLE ?
-          *(i->second.double_p) : *(i->second.int_p);
+        Opts::iterator i = _parser._opts.find(_name);
+        LEMON_ASSERT(i!=_parser._opts.end(),
+                     std::string()+"Unkown option: '"+_name+"'");
+        LEMON_ASSERT(i->second.type==ArgParser::DOUBLE ||
+                     i->second.type==ArgParser::INTEGER,
+                     std::string()+"'"+_name+"' is a floating point option");
+        return i->second.type==ArgParser::DOUBLE ?
+          *(i->second.double_p) : *(i->second.int_p);
       }
       ///\e
-      operator int() 
+      operator int()
       {
-        Opts::iterator i = _parser._opts.find(_name);
-        LEMON_ASSERT(i!=_parser._opts.end(),
-                     std::string()+"Unkown option: '"+_name+"'");
-        LEMON_ASSERT(i->second.type==ArgParser::INTEGER,
-                     std::string()+"'"+_name+"' is an integer option");
-        return *(i->second.int_p);
+        Opts::iterator i = _parser._opts.find(_name);
+        LEMON_ASSERT(i!=_parser._opts.end(),
+                     std::string()+"Unkown option: '"+_name+"'");
+        LEMON_ASSERT(i->second.type==ArgParser::INTEGER,
+                     std::string()+"'"+_name+"' is an integer option");
+        return *(i->second.int_p);
       }
 
@@ -363 +363 @@
 
     ///Give back the value of an option
-    
+
     ///Give back the value of an option.
     ///\sa RefType
@@ -369 +369 @@
     {
       return RefType(*this, n);
-    }    
+    }
 
     ///Give back the non-option type arguments.
@@ -376 +376 @@
     ///not starting with a '-' character.
     std::vector<std::string> &files() { return _file_args; }
- 
+
   };
 }

lemon/assert.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -29 +29 @@
 
   inline void assert_fail_log(const char *file, int line, const char *function,
-                              const char *message, const char *assertion)
+                              const char *message, const char *assertion)
   {
     std::cerr << file << ":" << line << ": ";
@@ -41 +41 @@
 
   inline void assert_fail_abort(const char *file, int line,
-                                const char *function, const char* message,
-                                const char *assertion)
+                                const char *function, const char* message,
+                                const char *assertion)
   {
     assert_fail_log(file, line, function, message, assertion);
@@ -49 +49 @@
 
   namespace _assert_bits {
-    
-    
+
+
     inline const char* cstringify(const std::string& str) {
       return str.c_str();
@@ -57 +57 @@
     inline const char* cstringify(const char* str) {
       return str;
-    }    
+    }
   }
 }
@@ -67 +67 @@
 #undef LEMON_DEBUG
 
-#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) +               \
-  (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +               \
+#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) +                \
+  (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +                \
   (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) > 1
 #error "LEMON assertion system is not set properly"
 #endif
 
-#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) +              \
-     (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +            \
-     (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 ||     \
-     defined(LEMON_ENABLE_ASSERTS)) &&                  \
-  (defined(LEMON_DISABLE_ASSERTS) ||                    \
+#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) +                \
+     (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +                \
+     (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 ||        \
+     defined(LEMON_ENABLE_ASSERTS)) &&                        \
+  (defined(LEMON_DISABLE_ASSERTS) ||                        \
    defined(NDEBUG))
 #error "LEMON assertion system is not set properly"
@@ -137 +137 @@
 /// \endcode
 /// The checking is also disabled when the standard macro \c NDEBUG is defined.
-/// 
+///
 /// The LEMON assertion system has a wide range of customization
 /// properties. As a default behaviour the failed assertion prints a
 /// short log message to the standard error and aborts the execution.
 ///
-/// The following modes can be used in the assertion system: 
+/// The following modes can be used in the assertion system:
 ///
 /// - \c LEMON_ASSERT_LOG The failed assertion prints a short log
@@ -156 +156 @@
 ///   \endcode
 ///   The name of the function should be defined as the \c
-///   LEMON_CUSTOM_ASSERT_HANDLER macro name. 
+///   LEMON_CUSTOM_ASSERT_HANDLER macro name.
 ///   \code
 ///     #define LEMON_CUSTOM_ASSERT_HANDLER custom_assert_handler
@@ -167 +167 @@
 /// \ref lemon/assert.h "assert.h" file is reincluded, then the
 /// behaviour is changed appropiately to the new settings.
-#  define LEMON_ASSERT(exp, msg)                                        \
-  (static_cast<void> (!!(exp) ? 0 : (                                   \
-    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                            \
-                         LEMON_FUNCTION_NAME,                           \
-                         ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
+#  define LEMON_ASSERT(exp, msg)                                        \
+  (static_cast<void> (!!(exp) ? 0 : (                                        \
+    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                                \
+                         LEMON_FUNCTION_NAME,                                \
+                         ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
 
 /// \ingroup exceptions
@@ -183 +183 @@
 /// \endcode
 ///
-/// \see LEMON_ASSERT 
-#  define LEMON_FIXME(msg)                                              \
-  (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,        \
-                        ::lemon::_assert_bits::cstringify(msg),         \
-                        static_cast<const char*>(0)))
+/// \see LEMON_ASSERT
+#  define LEMON_FIXME(msg)                                                \
+  (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,        \
+                        ::lemon::_assert_bits::cstringify(msg),                \
+                        static_cast<const char*>(0)))
 
 /// \ingroup exceptions
@@ -211 +211 @@
 /// macro.
 ///
-/// \see LEMON_ASSERT 
-#  define LEMON_DEBUG(exp, msg)                                         \
-  (static_cast<void> (!!(exp) ? 0 : (                                   \
+/// \see LEMON_ASSERT
+#  define LEMON_DEBUG(exp, msg)                                                \
+  (static_cast<void> (!!(exp) ? 0 : (                                        \
     LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                            \
-                         LEMON_FUNCTION_NAME,                           \
-                         ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
+                         LEMON_FUNCTION_NAME,                                \
+                         ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
 
 #else
@@ -225 +225 @@
 #    define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
 #  else
-#    define LEMON_ASSERT(exp, msg)                                      \
-       (static_cast<void> (!!(exp) ? 0 : (                              \
+#    define LEMON_ASSERT(exp, msg)                                        \
+       (static_cast<void> (!!(exp) ? 0 : (                                \
         LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                        \
-                             LEMON_FUNCTION_NAME,                       \
-                             ::lemon::_assert_bits::cstringify(msg),    \
-                             #exp), 0)))
-#    define LEMON_FIXME(msg)                                            \
-       (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,   \
-                             ::lemon::_assert_bits::cstringify(msg),    \
-                             static_cast<const char*>(0)))
+                             LEMON_FUNCTION_NAME,                        \
+                             ::lemon::_assert_bits::cstringify(msg),        \
+                             #exp), 0)))
+#    define LEMON_FIXME(msg)                                                \
+       (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,        \
+                             ::lemon::_assert_bits::cstringify(msg),        \
+                             static_cast<const char*>(0)))
 
 #    if LEMON_ENABLE_DEBUG
@@ -241 +241 @@
            LEMON_ASSERT_HANDLER(__FILE__, __LINE__,  \
                                 LEMON_FUNCTION_NAME, \
-                                ::lemon::_assert_bits::cstringify(msg), \
-                                #exp), 0)))
+                                ::lemon::_assert_bits::cstringify(msg),        \
+                                #exp), 0)))
 #    else
 #      define LEMON_DEBUG(exp, msg) (static_cast<void>(0))

lemon/base.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008

lemon/bfs.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -34 +34 @@
 
 
-  
+
   ///Default traits class of Bfs class.
 
@@ -42 +42 @@
   struct BfsDefaultTraits
   {
-    ///The digraph type the algorithm runs on. 
+    ///The digraph type the algorithm runs on.
     typedef GR Digraph;
     ///\brief The type of the map that stores the last
     ///arcs of the shortest paths.
-    /// 
+    ///
     ///The type of the map that stores the last
     ///arcs of the shortest paths.
@@ -53 +53 @@
     typedef typename Digraph::template NodeMap<typename GR::Arc> PredMap;
     ///Instantiates a PredMap.
- 
-    ///This function instantiates a \ref PredMap. 
+
+    ///This function instantiates a \ref PredMap.
     ///\param G is the digraph, to which we would like to define the PredMap.
     ///\todo The digraph alone may be insufficient to initialize
-    static PredMap *createPredMap(const GR &G) 
+    static PredMap *createPredMap(const GR &G)
     {
       return new PredMap(G);
     }
     ///The type of the map that indicates which nodes are processed.
- 
+
     ///The type of the map that indicates which nodes are processed.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -68 +68 @@
     typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
     ///Instantiates a ProcessedMap.
- 
-    ///This function instantiates a \ref ProcessedMap. 
+
+    ///This function instantiates a \ref ProcessedMap.
     ///\param g is the digraph, to which
     ///we would like to define the \ref ProcessedMap
@@ -81 +81 @@
     }
     ///The type of the map that indicates which nodes are reached.
- 
+
     ///The type of the map that indicates which nodes are reached.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -87 +87 @@
     typedef typename Digraph::template NodeMap<bool> ReachedMap;
     ///Instantiates a ReachedMap.
- 
-    ///This function instantiates a \ref ReachedMap. 
+
+    ///This function instantiates a \ref ReachedMap.
     ///\param G is the digraph, to which
     ///we would like to define the \ref ReachedMap.
@@ -96 +96 @@
     }
     ///The type of the map that stores the dists of the nodes.
- 
+
     ///The type of the map that stores the dists of the nodes.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -102 +102 @@
     typedef typename Digraph::template NodeMap<int> DistMap;
     ///Instantiates a DistMap.
- 
-    ///This function instantiates a \ref DistMap. 
+
+    ///This function instantiates a \ref DistMap.
     ///\param G is the digraph, to which we would like to define the \ref DistMap
     static DistMap *createDistMap(const GR &G)
@@ -110 +110 @@
     }
   };
-  
+
   ///%BFS algorithm class.
-  
+
   ///\ingroup search
   ///This class provides an efficient implementation of the %BFS algorithm.
@@ -127 +127 @@
 #ifdef DOXYGEN
   template <typename GR,
-            typename TR>
+            typename TR>
 #else
   template <typename GR=ListDigraph,
-            typename TR=BfsDefaultTraits<GR> >
+            typename TR=BfsDefaultTraits<GR> >
 #endif
   class Bfs {
@@ -143 +143 @@
     public:
       virtual const char* what() const throw() {
-        return "lemon::Bfs::UninitializedParameter";
+        return "lemon::Bfs::UninitializedParameter";
       }
     };
@@ -150 +150 @@
     ///The type of the underlying digraph.
     typedef typename TR::Digraph Digraph;
-    
+
     ///\brief The type of the map that stores the last
     ///arcs of the shortest paths.
@@ -191 +191 @@
 
     ///Creates the maps if necessary.
-    
+
     ///\todo Better memory allocation (instead of new).
-    void create_maps() 
+    void create_maps()
     {
       if(!_pred) {
-        local_pred = true;
-        _pred = Traits::createPredMap(*G);
+        local_pred = true;
+        _pred = Traits::createPredMap(*G);
       }
       if(!_dist) {
-        local_dist = true;
-        _dist = Traits::createDistMap(*G);
+        local_dist = true;
+        _dist = Traits::createDistMap(*G);
       }
       if(!_reached) {
-        local_reached = true;
-        _reached = Traits::createReachedMap(*G);
+        local_reached = true;
+        _reached = Traits::createReachedMap(*G);
       }
       if(!_processed) {
-        local_processed = true;
-        _processed = Traits::createProcessedMap(*G);
+        local_processed = true;
+        _processed = Traits::createProcessedMap(*G);
       }
     }
 
   protected:
-    
+
     Bfs() {}
-    
+
   public:
- 
+
     typedef Bfs Create;
 
@@ -228 +228 @@
     struct DefPredMapTraits : public Traits {
       typedef T PredMap;
-      static PredMap *createPredMap(const Digraph &) 
+      static PredMap *createPredMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -239 +239 @@
     ///
     template <class T>
-    struct DefPredMap : public Bfs< Digraph, DefPredMapTraits<T> > { 
+    struct DefPredMap : public Bfs< Digraph, DefPredMapTraits<T> > {
       typedef Bfs< Digraph, DefPredMapTraits<T> > Create;
     };
-    
+
     template <class T>
     struct DefDistMapTraits : public Traits {
       typedef T DistMap;
-      static DistMap *createDistMap(const Digraph &) 
+      static DistMap *createDistMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -257 +257 @@
     ///
     template <class T>
-    struct DefDistMap : public Bfs< Digraph, DefDistMapTraits<T> > { 
+    struct DefDistMap : public Bfs< Digraph, DefDistMapTraits<T> > {
       typedef Bfs< Digraph, DefDistMapTraits<T> > Create;
     };
-    
+
     template <class T>
     struct DefReachedMapTraits : public Traits {
       typedef T ReachedMap;
-      static ReachedMap *createReachedMap(const Digraph &) 
+      static ReachedMap *createReachedMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -275 +275 @@
     ///
     template <class T>
-    struct DefReachedMap : public Bfs< Digraph, DefReachedMapTraits<T> > { 
+    struct DefReachedMap : public Bfs< Digraph, DefReachedMapTraits<T> > {
       typedef Bfs< Digraph, DefReachedMapTraits<T> > Create;
     };
-    
+
     template <class T>
     struct DefProcessedMapTraits : public Traits {
       typedef T ProcessedMap;
-      static ProcessedMap *createProcessedMap(const Digraph &) 
+      static ProcessedMap *createProcessedMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -296 +296 @@
       typedef Bfs< Digraph, DefProcessedMapTraits<T> > Create;
     };
-    
+
     struct DefDigraphProcessedMapTraits : public Traits {
       typedef typename Digraph::template NodeMap<bool> ProcessedMap;
-      static ProcessedMap *createProcessedMap(const Digraph &G) 
+      static ProcessedMap *createProcessedMap(const Digraph &G)
       {
-        return new ProcessedMap(G);
+        return new ProcessedMap(G);
       }
     };
@@ -312 +312 @@
     template <class T>
     struct DefProcessedMapToBeDefaultMap :
-      public Bfs< Digraph, DefDigraphProcessedMapTraits> { 
+      public Bfs< Digraph, DefDigraphProcessedMapTraits> {
       typedef Bfs< Digraph, DefDigraphProcessedMapTraits> Create;
     };
-    
+
     ///@}
 
-  public:      
-    
+  public:
+
     ///Constructor.
-    
+
     ///\param _G the digraph the algorithm will run on.
     ///
@@ -331 +331 @@
       _processed(NULL), local_processed(false)
     { }
-    
+
     ///Destructor.
-    ~Bfs() 
+    ~Bfs()
     {
       if(local_pred) delete _pred;
@@ -348 +348 @@
     ///automatically allocated map, of course.
     ///\return <tt> (*this) </tt>
-    Bfs &predMap(PredMap &m) 
+    Bfs &predMap(PredMap &m)
     {
       if(local_pred) {
-        delete _pred;
-        local_pred=false;
+        delete _pred;
+        local_pred=false;
       }
       _pred = &m;
@@ -365 +365 @@
     ///automatically allocated map, of course.
     ///\return <tt> (*this) </tt>
-    Bfs &reachedMap(ReachedMap &m) 
+    Bfs &reachedMap(ReachedMap &m)
     {
       if(local_reached) {
-        delete _reached;
-        local_reached=false;
+        delete _reached;
+        local_reached=false;
       }
       _reached = &m;
@@ -382 +382 @@
     ///automatically allocated map, of course.
     ///\return <tt> (*this) </tt>
-    Bfs &processedMap(ProcessedMap &m) 
+    Bfs &processedMap(ProcessedMap &m)
     {
       if(local_processed) {
-        delete _processed;
-        local_processed=false;
+        delete _processed;
+        local_processed=false;
       }
       _processed = &m;
@@ -399 +399 @@
     ///automatically allocated map, of course.
     ///\return <tt> (*this) </tt>
-    Bfs &distMap(DistMap &m) 
+    Bfs &distMap(DistMap &m)
     {
       if(local_dist) {
-        delete _dist;
-        local_dist=false;
+        delete _dist;
+        local_dist=false;
       }
       _dist = &m;
@@ -433 +433 @@
       _curr_dist=1;
       for ( NodeIt u(*G) ; u!=INVALID ; ++u ) {
-        _pred->set(u,INVALID);
-        _reached->set(u,false);
-        _processed->set(u,false);
-      }
-    }
-    
+        _pred->set(u,INVALID);
+        _reached->set(u,false);
+        _processed->set(u,false);
+      }
+    }
+
     ///Adds a new source node.
 
@@ -446 +446 @@
     {
       if(!(*_reached)[s])
-        {
-          _reached->set(s,true);
-          _pred->set(s,INVALID);
-          _dist->set(s,0);
-          _queue[_queue_head++]=s;
-          _queue_next_dist=_queue_head;
-        }
-    }
-    
+        {
+          _reached->set(s,true);
+          _pred->set(s,INVALID);
+          _dist->set(s,0);
+          _queue[_queue_head++]=s;
+          _queue_next_dist=_queue_head;
+        }
+    }
+
     ///Processes the next node.
 
@@ -465 +465 @@
     {
       if(_queue_tail==_queue_next_dist) {
-        _curr_dist++;
-        _queue_next_dist=_queue_head;
+        _curr_dist++;
+        _queue_next_dist=_queue_head;
       }
       Node n=_queue[_queue_tail++];
@@ -472 +472 @@
       Node m;
       for(OutArcIt e(*G,n);e!=INVALID;++e)
-        if(!(*_reached)[m=G->target(e)]) {
-          _queue[_queue_head++]=m;
-          _reached->set(m,true);
-          _pred->set(m,e);
-          _dist->set(m,_curr_dist);
-        }
+        if(!(*_reached)[m=G->target(e)]) {
+          _queue[_queue_head++]=m;
+          _reached->set(m,true);
+          _pred->set(m,e);
+          _dist->set(m,_curr_dist);
+        }
       return n;
     }
@@ -496 +496 @@
     {
       if(_queue_tail==_queue_next_dist) {
-        _curr_dist++;
-        _queue_next_dist=_queue_head;
+        _curr_dist++;
+        _queue_next_dist=_queue_head;
       }
       Node n=_queue[_queue_tail++];
@@ -503 +503 @@
       Node m;
       for(OutArcIt e(*G,n);e!=INVALID;++e)
-        if(!(*_reached)[m=G->target(e)]) {
-          _queue[_queue_head++]=m;
-          _reached->set(m,true);
-          _pred->set(m,e);
-          _dist->set(m,_curr_dist);
+        if(!(*_reached)[m=G->target(e)]) {
+          _queue[_queue_head++]=m;
+          _reached->set(m,true);
+          _pred->set(m,e);
+          _dist->set(m,_curr_dist);
           reach = reach || (target == m);
-        }
+        }
       return n;
     }
@@ -529 +529 @@
     {
       if(_queue_tail==_queue_next_dist) {
-        _curr_dist++;
-        _queue_next_dist=_queue_head;
+        _curr_dist++;
+        _queue_next_dist=_queue_head;
       }
       Node n=_queue[_queue_tail++];
@@ -536 +536 @@
       Node m;
       for(OutArcIt e(*G,n);e!=INVALID;++e)
-        if(!(*_reached)[m=G->target(e)]) {
-          _queue[_queue_head++]=m;
-          _reached->set(m,true);
-          _pred->set(m,e);
-          _dist->set(m,_curr_dist);
-          if (nm[m] && rnode == INVALID) rnode = m;
-        }
+        if(!(*_reached)[m=G->target(e)]) {
+          _queue[_queue_head++]=m;
+          _reached->set(m,true);
+          _pred->set(m,e);
+          _dist->set(m,_curr_dist);
+          if (nm[m] && rnode == INVALID) rnode = m;
+        }
       return n;
     }
-      
+
     ///Next node to be processed.
 
@@ -553 +553 @@
     /// empty.
     Node nextNode()
-    { 
+    {
       return _queue_tail<_queue_head?_queue[_queue_tail]:INVALID;
     }
- 
+
     ///\brief Returns \c false if there are nodes
     ///to be processed in the queue
@@ -564 +564 @@
     bool emptyQueue() { return _queue_tail==_queue_head; }
     ///Returns the number of the nodes to be processed.
-    
+
     ///Returns the number of the nodes to be processed in the queue.
     int queueSize() { return _queue_head-_queue_tail; }
-    
+
     ///Executes the algorithm.
 
@@ -585 +585 @@
       while ( !emptyQueue() ) processNextNode();
     }
-    
+
     ///Executes the algorithm until \c dest is reached.
 
@@ -603 +603 @@
       while ( !emptyQueue() && !reach ) processNextNode(dest, reach);
     }
-    
+
     ///Executes the algorithm until a condition is met.
 
@@ -622 +622 @@
       Node rnode = INVALID;
       while ( !emptyQueue() && rnode == INVALID ) {
-        processNextNode(nm, rnode);
+        processNextNode(nm, rnode);
       }
       return rnode;
     }
-    
+
     ///Runs %BFS algorithm from node \c s.
-    
+
     ///This method runs the %BFS algorithm from a root node \c s
     ///in order to
@@ -647 +647 @@
       start();
     }
-    
+
     ///Finds the shortest path between \c s and \c t.
-    
+
     ///Finds the shortest path between \c s and \c t.
     ///
@@ -667 +667 @@
       return reached(t) ? _curr_dist : 0;
     }
-    
+
     ///@}
 
@@ -675 +675 @@
     ///Before the use of these functions,
     ///either run() or start() must be calleb.
-    
+
     ///@{
 
@@ -681 +681 @@
 
     ///Gives back the shortest path.
-    
+
     ///Gives back the shortest path.
     ///\pre The \c t should be reachable from the source.
-    Path path(Node t) 
+    Path path(Node t)
     {
       return Path(*G, *_pred, t);
@@ -723 +723 @@
     ///using this function.
     Node predNode(Node v) const { return (*_pred)[v]==INVALID ? INVALID:
-                                  G->source((*_pred)[v]); }
-    
+                                  G->source((*_pred)[v]); }
+
     ///Returns a reference to the NodeMap of distances.
 
@@ -731 +731 @@
     ///be called before using this function.
     const DistMap &distMap() const { return *_dist;}
- 
+
     ///Returns a reference to the shortest path tree map.
 
@@ -739 +739 @@
     ///must be called before using this function.
     const PredMap &predMap() const { return *_pred;}
- 
+
     ///Checks if a node is reachable from the root.
 
@@ -748 +748 @@
     ///
     bool reached(Node v) { return (*_reached)[v]; }
-    
+
     ///@}
   };
@@ -759 +759 @@
   struct BfsWizardDefaultTraits
   {
-    ///The digraph type the algorithm runs on. 
+    ///The digraph type the algorithm runs on.
     typedef GR Digraph;
     ///\brief The type of the map that stores the last
     ///arcs of the shortest paths.
-    /// 
+    ///
     ///The type of the map that stores the last
     ///arcs of the shortest paths.
@@ -770 +770 @@
     typedef NullMap<typename Digraph::Node,typename GR::Arc> PredMap;
     ///Instantiates a PredMap.
- 
-    ///This function instantiates a \ref PredMap. 
+
+    ///This function instantiates a \ref PredMap.
     ///\param g is the digraph, to which we would like to define the PredMap.
     ///\todo The digraph alone may be insufficient to initialize
 #ifdef DOXYGEN
-    static PredMap *createPredMap(const GR &g) 
+    static PredMap *createPredMap(const GR &g)
 #else
-    static PredMap *createPredMap(const GR &) 
+    static PredMap *createPredMap(const GR &)
 #endif
     {
@@ -784 +784 @@
 
     ///The type of the map that indicates which nodes are processed.
- 
+
     ///The type of the map that indicates which nodes are processed.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -790 +790 @@
     typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
     ///Instantiates a ProcessedMap.
- 
-    ///This function instantiates a \ref ProcessedMap. 
+
+    ///This function instantiates a \ref ProcessedMap.
     ///\param g is the digraph, to which
     ///we would like to define the \ref ProcessedMap
@@ -803 +803 @@
     }
     ///The type of the map that indicates which nodes are reached.
- 
+
     ///The type of the map that indicates which nodes are reached.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -809 +809 @@
     typedef typename Digraph::template NodeMap<bool> ReachedMap;
     ///Instantiates a ReachedMap.
- 
-    ///This function instantiates a \ref ReachedMap. 
+
+    ///This function instantiates a \ref ReachedMap.
     ///\param G is the digraph, to which
     ///we would like to define the \ref ReachedMap.
@@ -818 +818 @@
     }
     ///The type of the map that stores the dists of the nodes.
- 
+
     ///The type of the map that stores the dists of the nodes.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -824 +824 @@
     typedef NullMap<typename Digraph::Node,int> DistMap;
     ///Instantiates a DistMap.
- 
-    ///This function instantiates a \ref DistMap. 
+
+    ///This function instantiates a \ref DistMap.
     ///\param g is the digraph, to which we would like to define the \ref DistMap
 #ifdef DOXYGEN
@@ -836 +836 @@
     }
   };
-  
+
   /// Default traits used by \ref BfsWizard
 
@@ -866 +866 @@
     ///Pointer to the source node.
     Node _source;
-    
+
     public:
     /// Constructor.
-    
+
     /// This constructor does not require parameters, therefore it initiates
     /// all of the attributes to default values (0, INVALID).
     BfsWizardBase() : _g(0), _reached(0), _processed(0), _pred(0),
-                           _dist(0), _source(INVALID) {}
+                           _dist(0), _source(INVALID) {}
 
     /// Constructor.
-    
+
     /// This constructor requires some parameters,
     /// listed in the parameters list.
@@ -883 +883 @@
     /// \param s is the initial value of  \ref _source
     BfsWizardBase(const GR &g, Node s=INVALID) :
-      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))), 
+      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
       _reached(0), _processed(0), _pred(0), _dist(0), _source(s) {}
 
   };
-  
+
   /// A class to make the usage of Bfs algorithm easier
 
@@ -922 +922 @@
     //\e
     typedef typename Digraph::OutArcIt OutArcIt;
-    
+
     ///\brief The type of the map that stores
     ///the reached nodes
@@ -952 +952 @@
 
     ///Runs Bfs algorithm from a given node.
-    
+
     ///Runs Bfs algorithm from a given node.
     ///The node can be given by the \ref source function.
@@ -960 +960 @@
       Bfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g));
       if(Base::_reached)
-        alg.reachedMap(*reinterpret_cast<ReachedMap*>(Base::_reached));
-      if(Base::_processed) 
+        alg.reachedMap(*reinterpret_cast<ReachedMap*>(Base::_reached));
+      if(Base::_processed)
         alg.processedMap(*reinterpret_cast<ProcessedMap*>(Base::_processed));
-      if(Base::_pred) 
+      if(Base::_pred)
         alg.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
-      if(Base::_dist) 
+      if(Base::_dist)
         alg.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
       alg.run(Base::_source);
@@ -986 +986 @@
       DefPredMapBase(const TR &b) : TR(b) {}
     };
-    
+
     ///\brief \ref named-templ-param "Named parameter"
     ///function for setting PredMap
@@ -994 +994 @@
     ///
     template<class T>
-    BfsWizard<DefPredMapBase<T> > predMap(const T &t) 
+    BfsWizard<DefPredMapBase<T> > predMap(const T &t)
     {
       Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
       return BfsWizard<DefPredMapBase<T> >(*this);
     }
-    
- 
+
+
     template<class T>
     struct DefReachedMapBase : public Base {
@@ -1007 +1007 @@
       DefReachedMapBase(const TR &b) : TR(b) {}
     };
-    
+
     ///\brief \ref named-templ-param "Named parameter"
     ///function for setting ReachedMap
@@ -1015 +1015 @@
     ///
     template<class T>
-    BfsWizard<DefReachedMapBase<T> > reachedMap(const T &t) 
+    BfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
     {
       Base::_reached=reinterpret_cast<void*>(const_cast<T*>(&t));
       return BfsWizard<DefReachedMapBase<T> >(*this);
     }
-    
+
 
     template<class T>
@@ -1028 +1028 @@
       DefProcessedMapBase(const TR &b) : TR(b) {}
     };
-    
+
     ///\brief \ref named-templ-param "Named parameter"
     ///function for setting ProcessedMap
@@ -1036 +1036 @@
     ///
     template<class T>
-    BfsWizard<DefProcessedMapBase<T> > processedMap(const T &t) 
+    BfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
     {
       Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
       return BfsWizard<DefProcessedMapBase<T> >(*this);
     }
-    
-   
+
+
     template<class T>
     struct DefDistMapBase : public Base {
@@ -1049 +1049 @@
       DefDistMapBase(const TR &b) : TR(b) {}
     };
-    
+
     ///\brief \ref named-templ-param "Named parameter"
     ///function for setting DistMap type
@@ -1057 +1057 @@
     ///
     template<class T>
-    BfsWizard<DefDistMapBase<T> > distMap(const T &t) 
+    BfsWizard<DefDistMapBase<T> > distMap(const T &t)
     {
       Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
       return BfsWizard<DefDistMapBase<T> >(*this);
     }
-    
+
     /// Sets the source node, from which the Bfs algorithm runs.
 
     /// Sets the source node, from which the Bfs algorithm runs.
     /// \param s is the source node.
-    BfsWizard<TR> &source(Node s) 
+    BfsWizard<TR> &source(Node s)
     {
       Base::_source=s;
       return *this;
     }
-    
+
   };
-  
+
   ///Function type interface for Bfs algorithm.
 
@@ -1101 +1101 @@
 #ifdef DOXYGEN
   /// \brief Visitor class for bfs.
-  ///  
+  ///
   /// This class defines the interface of the BfsVisit events, and
   /// it could be the base of a real Visitor class.
@@ -1110 +1110 @@
     typedef typename Digraph::Node Node;
     /// \brief Called when the arc reach a node.
-    /// 
+    ///
     /// It is called when the bfs find an arc which target is not
     /// reached yet.
     void discover(const Arc& arc) {}
     /// \brief Called when the node reached first time.
-    /// 
+    ///
     /// It is Called when the node reached first time.
     void reach(const Node& node) {}
-    /// \brief Called when the arc examined but target of the arc 
+    /// \brief Called when the arc examined but target of the arc
     /// already discovered.
-    /// 
-    /// It called when the arc examined but the target of the arc 
+    ///
+    /// It called when the arc examined but the target of the arc
     /// already discovered.
     void examine(const Arc& arc) {}
     /// \brief Called for the source node of the bfs.
-    /// 
+    ///
     /// It is called for the source node of the bfs.
     void start(const Node& node) {}
     /// \brief Called when the node processed.
-    /// 
+    ///
     /// It is Called when the node processed.
     void process(const Node& node) {}
@@ -1148 +1148 @@
     struct Constraints {
       void constraints() {
-        Arc arc;
-        Node node;
-        visitor.discover(arc);
-        visitor.reach(node);
-        visitor.examine(arc);
-        visitor.start(node);
+        Arc arc;
+        Node node;
+        visitor.discover(arc);
+        visitor.reach(node);
+        visitor.examine(arc);
+        visitor.start(node);
         visitor.process(node);
       }
@@ -1168 +1168 @@
   struct BfsVisitDefaultTraits {
 
-    /// \brief The digraph type the algorithm runs on. 
+    /// \brief The digraph type the algorithm runs on.
     typedef _Digraph Digraph;
 
     /// \brief The type of the map that indicates which nodes are reached.
-    /// 
+    ///
     /// The type of the map that indicates which nodes are reached.
     /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -1180 +1180 @@
     /// \brief Instantiates a ReachedMap.
     ///
-    /// This function instantiates a \ref ReachedMap. 
+    /// This function instantiates a \ref ReachedMap.
     /// \param digraph is the digraph, to which
     /// we would like to define the \ref ReachedMap.
@@ -1190 +1190 @@
 
   /// \ingroup search
-  ///  
+  ///
   /// \brief %BFS Visit algorithm class.
-  ///  
+  ///
   /// This class provides an efficient implementation of the %BFS algorithm
   /// with visitor interface.
@@ -1198 +1198 @@
   /// The %BfsVisit class provides an alternative interface to the Bfs
   /// class. It works with callback mechanism, the BfsVisit object calls
-  /// on every bfs event the \c Visitor class member functions. 
+  /// on every bfs event the \c Visitor class member functions.
   ///
   /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
   /// \ref ListDigraph. The value of _Digraph is not used directly by Bfs, it
   /// is only passed to \ref BfsDefaultTraits.
-  /// \tparam _Visitor The Visitor object for the algorithm. The 
+  /// \tparam _Visitor The Visitor object for the algorithm. The
   /// \ref BfsVisitor "BfsVisitor<_Digraph>" is an empty Visitor which
   /// does not observe the Bfs events. If you want to observe the bfs
   /// events you should implement your own Visitor class.
-  /// \tparam _Traits Traits class to set various data types used by the 
+  /// \tparam _Traits Traits class to set various data types used by the
   /// algorithm. The default traits class is
   /// \ref BfsVisitDefaultTraits "BfsVisitDefaultTraits<_Digraph>".
@@ -1216 +1216 @@
 #else
   template <typename _Digraph = ListDigraph,
-            typename _Visitor = BfsVisitor<_Digraph>,
-            typename _Traits = BfsDefaultTraits<_Digraph> >
+            typename _Visitor = BfsVisitor<_Digraph>,
+            typename _Traits = BfsDefaultTraits<_Digraph> >
 #endif
   class BfsVisit {
   public:
-    
+
     /// \brief \ref Exception for uninitialized parameters.
     ///
@@ -1228 +1228 @@
     class UninitializedParameter : public lemon::UninitializedParameter {
     public:
-      virtual const char* what() const throw() 
+      virtual const char* what() const throw()
       {
-        return "lemon::BfsVisit::UninitializedParameter";
+        return "lemon::BfsVisit::UninitializedParameter";
       }
     };
@@ -1267 +1267 @@
     void create_maps() {
       if(!_reached) {
-        local_reached = true;
-        _reached = Traits::createReachedMap(*_digraph);
+        local_reached = true;
+        _reached = Traits::createReachedMap(*_digraph);
       }
     }
@@ -1275 +1275 @@
 
     BfsVisit() {}
-    
+
   public:
 
@@ -1287 +1287 @@
       typedef T ReachedMap;
       static ReachedMap *createReachedMap(const Digraph &digraph) {
-        throw UninitializedParameter();
-      }
-    };
-    /// \brief \ref named-templ-param "Named parameter" for setting 
+        throw UninitializedParameter();
+      }
+    };
+    /// \brief \ref named-templ-param "Named parameter" for setting
     /// ReachedMap type
     ///
@@ -1296 +1296 @@
     template <class T>
     struct DefReachedMap : public BfsVisit< Digraph, Visitor,
-                                            DefReachedMapTraits<T> > {
+                                            DefReachedMapTraits<T> > {
       typedef BfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
     };
     ///@}
 
-  public:      
-    
+  public:
+
     /// \brief Constructor.
     ///
@@ -1310 +1310 @@
     /// \param visitor The visitor of the algorithm.
     ///
-    BfsVisit(const Digraph& digraph, Visitor& visitor) 
+    BfsVisit(const Digraph& digraph, Visitor& visitor)
       : _digraph(&digraph), _visitor(&visitor),
-        _reached(0), local_reached(false) {}
-    
+        _reached(0), local_reached(false) {}
+
     /// \brief Destructor.
     ///
@@ -1330 +1330 @@
     BfsVisit &reachedMap(ReachedMap &m) {
       if(local_reached) {
-        delete _reached;
-        local_reached = false;
+        delete _reached;
+        local_reached = false;
       }
       _reached = &m;
@@ -1358 +1358 @@
       _list_front = _list_back = -1;
       for (NodeIt u(*_digraph) ; u != INVALID ; ++u) {
-        _reached->set(u, false);
-      }
-    }
-    
+        _reached->set(u, false);
+      }
+    }
+
     /// \brief Adds a new source node.
     ///
@@ -1367 +1367 @@
     void addSource(Node s) {
       if(!(*_reached)[s]) {
-          _reached->set(s,true);
-          _visitor->start(s);
-          _visitor->reach(s);
+          _reached->set(s,true);
+          _visitor->start(s);
+          _visitor->reach(s);
           _list[++_list_back] = s;
-        }
-    }
-    
+        }
+    }
+
     /// \brief Processes the next node.
     ///
@@ -1381 +1381 @@
     ///
     /// \pre The queue must not be empty!
-    Node processNextNode() { 
+    Node processNextNode() {
       Node n = _list[++_list_front];
       _visitor->process(n);
@@ -1468 +1468 @@
     /// \return The next node to be processed or INVALID if the stack is
     /// empty.
-    Node nextNode() { 
+    Node nextNode() {
       return _list_front != _list_back ? _list[_list_front + 1] : INVALID;
     }
@@ -1483 +1483 @@
     /// Returns the number of the nodes to be processed in the queue.
     int queueSize() { return _list_back - _list_front; }
-    
+
     /// \brief Executes the algorithm.
     ///
@@ -1493 +1493 @@
       while ( !emptyQueue() ) processNextNode();
     }
-    
+
     /// \brief Executes the algorithm until \c dest is reached.
     ///
@@ -1504 +1504 @@
       while ( !emptyQueue() && !reach ) processNextNode(dest, reach);
     }
-    
+
     /// \brief Executes the algorithm until a condition is met.
     ///
@@ -1522 +1522 @@
       Node rnode = INVALID;
       while ( !emptyQueue() && rnode == INVALID ) {
-        processNextNode(nm, rnode);
+        processNextNode(nm, rnode);
       }
       return rnode;
@@ -1543 +1543 @@
 
     /// \brief Runs %BFSVisit algorithm to visit all nodes in the digraph.
-    ///    
+    ///
     /// This method runs the %BFS algorithm in order to
     /// compute the %BFS path to each node. The algorithm computes

lemon/bin_heap.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -49 +49 @@
   ///\sa Dijkstra
   template <typename _Prio, typename _ItemIntMap,
-            typename _Compare = std::less<_Prio> >
+            typename _Compare = std::less<_Prio> >
   class BinHeap {
 
@@ -91 +91 @@
     /// should be PRE_HEAP (-1) for each element.
     explicit BinHeap(ItemIntMap &_iim) : iim(_iim) {}
-    
+
     /// \brief The constructor.
     ///
@@ -100 +100 @@
     ///
     /// \param _comp The comparator function object.
-    BinHeap(ItemIntMap &_iim, const Compare &_comp) 
+    BinHeap(ItemIntMap &_iim, const Compare &_comp)
       : iim(_iim), comp(_comp) {}
 
@@ -108 +108 @@
     /// \brief Returns the number of items stored in the heap.
     int size() const { return data.size(); }
-    
+
     /// \brief Checks if the heap stores no items.
     ///
@@ -115 +115 @@
 
     /// \brief Make empty this heap.
-    /// 
+    ///
     /// Make empty this heap. It does not change the cross reference map.
     /// If you want to reuse what is not surely empty you should first clear
     /// the heap and after that you should set the cross reference map for
     /// each item to \c PRE_HEAP.
-    void clear() { 
-      data.clear(); 
+    void clear() {
+      data.clear();
     }
 
@@ -135 +135 @@
       int par = parent(hole);
       while( hole>0 && less(p,data[par]) ) {
-        move(data[par],hole);
-        hole = par;
-        par = parent(hole);
+        move(data[par],hole);
+        hole = par;
+        par = parent(hole);
       }
       move(p, hole);
@@ -146 +146 @@
       int child = second_child(hole);
       while(child < length) {
-        if( less(data[child-1], data[child]) ) {
-          --child;
-        }
-        if( !less(data[child], p) )
-          goto ok;
-        move(data[child], hole);
-        hole = child;
-        child = second_child(hole);
+        if( less(data[child-1], data[child]) ) {
+          --child;
+        }
+        if( !less(data[child], p) )
+          goto ok;
+        move(data[child], hole);
+        hole = child;
+        child = second_child(hole);
       }
       child--;
       if( child<length && less(data[child], p) ) {
-        move(data[child], hole);
-        hole=child;
+        move(data[child], hole);
+        hole=child;
       }
     ok:
@@ -182 +182 @@
 
     /// \brief Insert an item into the heap with the given heap.
-    ///    
-    /// Adds \c i to the heap with priority \c p. 
+    ///
+    /// Adds \c i to the heap with priority \c p.
     /// \param i The item to insert.
     /// \param p The priority of the item.
@@ -191 +191 @@
     ///
     /// This method returns the item with minimum priority relative to \c
-    /// Compare.  
-    /// \pre The heap must be nonempty.  
+    /// Compare.
+    /// \pre The heap must be nonempty.
     Item top() const {
       return data[0].first;
@@ -208 +208 @@
     ///
     /// This method deletes the item with minimum priority relative to \c
-    /// Compare from the heap.  
-    /// \pre The heap must be non-empty.  
+    /// Compare from the heap.
+    /// \pre The heap must be non-empty.
     void pop() {
       int n = data.size()-1;
       iim.set(data[0].first, POST_HEAP);
       if (n > 0) {
-        bubble_down(0, data[n], n);
+        bubble_down(0, data[n], n);
       }
       data.pop_back();
@@ -229 +229 @@
       iim.set(data[h].first, POST_HEAP);
       if( h < n ) {
-        if ( bubble_up(h, data[n]) == h) {
-          bubble_down(h, data[n], n);
-        }
+        if ( bubble_up(h, data[n]) == h) {
+          bubble_down(h, data[n], n);
+        }
       }
       data.pop_back();
     }
 
-    
+
     /// \brief Returns the priority of \c i.
     ///
-    /// This function returns the priority of item \c i.  
+    /// This function returns the priority of item \c i.
     /// \pre \c i must be in the heap.
     /// \param i The item.
@@ -247 +247 @@
     }
 
-    /// \brief \c i gets to the heap with priority \c p independently 
+    /// \brief \c i gets to the heap with priority \c p independently
     /// if \c i was already there.
     ///
@@ -257 +257 @@
       int idx = iim[i];
       if( idx < 0 ) {
-        push(i,p);
+        push(i,p);
       }
       else if( comp(p, data[idx].second) ) {
-        bubble_up(idx, Pair(i,p));
+        bubble_up(idx, Pair(i,p));
       }
       else {
-        bubble_down(idx, Pair(i,p), data.size());
+        bubble_down(idx, Pair(i,p), data.size());
       }
     }
@@ -278 +278 @@
       bubble_up(idx, Pair(i,p));
     }
-    
+
     /// \brief Increases the priority of \c i to \c p.
     ///
-    /// This method sets the priority of item \c i to \c p. 
+    /// This method sets the priority of item \c i to \c p.
     /// \pre \c i must be stored in the heap with priority at most \c
     /// p relative to \c Compare.
@@ -291 +291 @@
     }
 
-    /// \brief Returns if \c item is in, has already been in, or has 
+    /// \brief Returns if \c item is in, has already been in, or has
     /// never been in the heap.
     ///
@@ -302 +302 @@
       int s = iim[i];
       if( s>=0 )
-        s=0;
+        s=0;
       return State(s);
     }
@@ -312 +312 @@
     /// better time complexity.
     /// \param i The item.
-    /// \param st The state. It should not be \c IN_HEAP. 
+    /// \param st The state. It should not be \c IN_HEAP.
     void state(const Item& i, State st) {
       switch (st) {
@@ -341 +341 @@
 
   }; // class BinHeap
-  
+
 } // namespace lemon
 

lemon/bits/alteration_notifier.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -33 +33 @@
   /// \ingroup graphbits
   ///
-  /// \brief Notifier class to notify observes about alterations in 
+  /// \brief Notifier class to notify observes about alterations in
   /// a container.
   ///
@@ -50 +50 @@
   /// alteration of the graph.
   ///
-  /// This class provides an interface to the container. The \e first() and \e 
+  /// This class provides an interface to the container. The \e first() and \e
   /// next() member functions make possible to iterate on the keys of the
   /// container. The \e id() function returns an integer id for each key.
@@ -61 +61 @@
   /// from the graph. If all items are erased from the graph or from an empty
   /// graph a new graph is builded then it can be signaled with the
-  /// clear() and build() members. Important rule that if we erase items 
+  /// clear() and build() members. Important rule that if we erase items
   /// from graph we should first signal the alteration and after that erase
   /// them from the container, on the other way on item addition we should
@@ -69 +69 @@
   /// \e ObserverBase nested class. The signals can be handled with
   /// overriding the virtual functions defined in the base class.  The
-  /// observer base can be attached to the notifier with the 
+  /// observer base can be attached to the notifier with the
   /// \e attach() member and can be detached with detach() function. The
   /// alteration handlers should not call any function which signals
@@ -80 +80 @@
   /// be rolled back by calling the \e erase() or \e clear()
   /// functions. Thence the \e erase() and \e clear() should not throw
-  /// exception. Actullay, it can be throw only 
+  /// exception. Actullay, it can be throw only
   /// \ref AlterationObserver::ImmediateDetach ImmediateDetach
   /// exception which detach the observer from the notifier.
@@ -86 +86 @@
   /// There are some place when the alteration observing is not completly
   /// reliable. If we want to carry out the node degree in the graph
-  /// as in the \ref InDegMap and we use the reverseEdge that cause 
+  /// as in the \ref InDegMap and we use the reverseEdge that cause
   /// unreliable functionality. Because the alteration observing signals
   /// only erasing and adding but not the reversing it will stores bad
@@ -105 +105 @@
     typedef _Item Item;
 
-    /// \brief Exception which can be called from \e clear() and 
+    /// \brief Exception which can be called from \e clear() and
     /// \e erase().
     ///
@@ -128 +128 @@
     /// The build() and clear() members are to notify the observer
     /// about the container is built from an empty container or
-    /// is cleared to an empty container. 
+    /// is cleared to an empty container.
 
     class ObserverBase {
@@ -139 +139 @@
       ///
       /// Default constructor for ObserverBase.
-      /// 
+      ///
       ObserverBase() : _notifier(0) {}
 
@@ -152 +152 @@
       ///
       /// Constructor which attach the obserever to the same notifier as
-      /// the other observer is attached to. 
+      /// the other observer is attached to.
       ObserverBase(const ObserverBase& copy) {
-        if (copy.attached()) {
+        if (copy.attached()) {
           attach(*copy.notifier());
-        }
-      }
-        
+        }
+      }
+
       /// \brief Destructor
       virtual ~ObserverBase() {
@@ -171 +171 @@
       ///
       void attach(AlterationNotifier& nf) {
-        nf.attach(*this);
-      }
-      
+        nf.attach(*this);
+      }
+
       /// \brief Detaches the observer into an AlterationNotifier.
       ///
@@ -181 +181 @@
         _notifier->detach(*this);
       }
-      
-      /// \brief Gives back a pointer to the notifier which the map 
+
+      /// \brief Gives back a pointer to the notifier which the map
       /// attached into.
       ///
@@ -189 +189 @@
       ///
       Notifier* notifier() const { return const_cast<Notifier*>(_notifier); }
-      
+
       /// Gives back true when the observer is attached into a notifier.
       bool attached() const { return _notifier != 0; }
@@ -198 +198 @@
 
     protected:
-      
+
       Notifier* _notifier;
       typename std::list<ObserverBase*>::iterator _index;
@@ -210 +210 @@
       virtual void add(const Item&) = 0;
 
-      /// \brief The member function to notificate the observer about 
+      /// \brief The member function to notificate the observer about
       /// more item is added to the container.
       ///
@@ -223 +223 @@
       /// The erase() member function notificates the observer about an
       /// item is erased from the container. It have to be overrided in
-      /// the subclasses.       
+      /// the subclasses.
       virtual void erase(const Item&) = 0;
 
-      /// \brief The member function to notificate the observer about 
+      /// \brief The member function to notificate the observer about
       /// more item is erased from the container.
       ///
@@ -248 +248 @@
       /// The clear() member function notificates the observer about all
       /// items are erased from the container. It have to be overrided in
-      /// the subclasses.      
+      /// the subclasses.
       virtual void clear() = 0;
 
     };
-        
+
   protected:
 
     const Container* container;
 
-    typedef std::list<ObserverBase*> Observers; 
+    typedef std::list<ObserverBase*> Observers;
     Observers _observers;
 
-                
+
   public:
 
     /// \brief Default constructor.
     ///
-    /// The default constructor of the AlterationNotifier. 
+    /// The default constructor of the AlterationNotifier.
     /// It creates an empty notifier.
-    AlterationNotifier() 
+    AlterationNotifier()
       : container(0) {}
 
@@ -273 +273 @@
     ///
     /// Constructor with the observed container parameter.
-    AlterationNotifier(const Container& _container) 
+    AlterationNotifier(const Container& _container)
       : container(&_container) {}
 
-    /// \brief Copy Constructor of the AlterationNotifier. 
-    ///
-    /// Copy constructor of the AlterationNotifier. 
+    /// \brief Copy Constructor of the AlterationNotifier.
+    ///
+    /// Copy constructor of the AlterationNotifier.
     /// It creates only an empty notifier because the copiable
     /// notifier's observers have to be registered still into that notifier.
-    AlterationNotifier(const AlterationNotifier& _notifier) 
+    AlterationNotifier(const AlterationNotifier& _notifier)
       : container(_notifier.container) {}
 
     /// \brief Destructor.
-    ///         
+    ///
     /// Destructor of the AlterationNotifier.
     ///
@@ -291 +291 @@
       typename Observers::iterator it;
       for (it = _observers.begin(); it != _observers.end(); ++it) {
-        (*it)->_notifier = 0;
+        (*it)->_notifier = 0;
       }
     }
@@ -339 +339 @@
       return container->maxId(Item());
     }
-                
+
   protected:
 
@@ -345 +345 @@
       observer._index = _observers.insert(_observers.begin(), &observer);
       observer._notifier = this;
-    } 
+    }
 
     void detach(ObserverBase& observer) {
@@ -354 +354 @@
 
   public:
-        
-    /// \brief Notifies all the registed observers about an item added to 
-    /// the container.
-    ///
-    /// It notifies all the registed observers about an item added to 
-    /// the container.
-    /// 
+
+    /// \brief Notifies all the registed observers about an item added to
+    /// the container.
+    ///
+    /// It notifies all the registed observers about an item added to
+    /// the container.
+    ///
     void add(const Item& item) {
       typename Observers::reverse_iterator it;
@@ -374 +374 @@
         throw;
       }
-    }   
-
-    /// \brief Notifies all the registed observers about more item added to 
-    /// the container.
-    ///
-    /// It notifies all the registed observers about more item added to 
-    /// the container.
-    /// 
+    }
+
+    /// \brief Notifies all the registed observers about more item added to
+    /// the container.
+    ///
+    /// It notifies all the registed observers about more item added to
+    /// the container.
+    ///
     void add(const std::vector<Item>& items) {
       typename Observers::reverse_iterator it;
@@ -395 +395 @@
         throw;
       }
-    }   
-
-    /// \brief Notifies all the registed observers about an item erased from 
-    /// the container.
-    /// 
-    /// It notifies all the registed observers about an item erased from 
-    /// the container.
-    /// 
+    }
+
+    /// \brief Notifies all the registed observers about an item erased from
+    /// the container.
+    ///
+    /// It notifies all the registed observers about an item erased from
+    /// the container.
+    ///
     void erase(const Item& item) throw() {
       typename Observers::iterator it = _observers.begin();
@@ -417 +417 @@
     }
 
-    /// \brief Notifies all the registed observers about more item erased  
+    /// \brief Notifies all the registed observers about more item erased
     /// from the container.
-    /// 
-    /// It notifies all the registed observers about more item erased from 
-    /// the container.
-    /// 
+    ///
+    /// It notifies all the registed observers about more item erased from
+    /// the container.
+    ///
     void erase(const std::vector<Item>& items) {
       typename Observers::iterator it = _observers.begin();
@@ -437 +437 @@
     }
 
-    /// \brief Notifies all the registed observers about the container is 
+    /// \brief Notifies all the registed observers about the container is
     /// built.
-    ///         
+    ///
     /// Notifies all the registed observers about the container is built
     /// from an empty container.
@@ -457 +457 @@
     }
 
-    /// \brief Notifies all the registed observers about all items are 
+    /// \brief Notifies all the registed observers about all items are
     /// erased.
     ///

lemon/bits/array_map.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -39 +39 @@
   /// The ArrayMap template class is graph map structure what
   /// automatically updates the map when a key is added to or erased from
-  /// the map. This map uses the allocators to implement 
+  /// the map. This map uses the allocators to implement
   /// the container functionality.
   ///
@@ -45 +45 @@
   /// the Value type of the map.
   template <typename _Graph, typename _Item, typename _Value>
-  class ArrayMap 
+  class ArrayMap
     : public ItemSetTraits<_Graph, _Item>::ItemNotifier::ObserverBase {
   public:
-    /// The graph type of the maps. 
+    /// The graph type of the maps.
     typedef _Graph Graph;
     /// The item type of the map.
@@ -70 +70 @@
     /// The MapBase of the Map which imlements the core regisitry function.
     typedef typename Notifier::ObserverBase Parent;
-                
+
   private:
     typedef std::allocator<Value> Allocator;
@@ -85 +85 @@
       Item it;
       for (nf->first(it); it != INVALID; nf->next(it)) {
-        int id = nf->id(it);;
-        allocator.construct(&(values[id]), Value());
-      }                                                         
-    }
-
-    /// \brief Constructor to use default value to initialize the map. 
-    ///
-    /// It constructs a map and initialize all of the the map. 
+        int id = nf->id(it);;
+        allocator.construct(&(values[id]), Value());
+      }
+    }
+
+    /// \brief Constructor to use default value to initialize the map.
+    ///
+    /// It constructs a map and initialize all of the the map.
     ArrayMap(const Graph& graph, const Value& value) {
       Parent::attach(graph.notifier(Item()));
@@ -99 +99 @@
       Item it;
       for (nf->first(it); it != INVALID; nf->next(it)) {
-        int id = nf->id(it);;
-        allocator.construct(&(values[id]), value);
-      }                                                         
+        int id = nf->id(it);;
+        allocator.construct(&(values[id]), value);
+      }
     }
 
     /// \brief Constructor to copy a map of the same map type.
     ///
-    /// Constructor to copy a map of the same map type.     
+    /// Constructor to copy a map of the same map type.
     ArrayMap(const ArrayMap& copy) : Parent() {
       if (copy.attached()) {
-        attach(*copy.notifier());
+        attach(*copy.notifier());
       }
       capacity = copy.capacity;
@@ -117 +117 @@
       Item it;
       for (nf->first(it); it != INVALID; nf->next(it)) {
-        int id = nf->id(it);;
-        allocator.construct(&(values[id]), copy.values[id]);
+        int id = nf->id(it);;
+        allocator.construct(&(values[id]), copy.values[id]);
       }
     }
@@ -125 +125 @@
     ///
     /// This operator assigns for each item in the map the
-    /// value mapped to the same item in the copied map.  
+    /// value mapped to the same item in the copied map.
     /// The parameter map should be indiced with the same
     /// itemset because this assign operator does not change
-    /// the container of the map. 
+    /// the container of the map.
     ArrayMap& operator=(const ArrayMap& cmap) {
       return operator=<ArrayMap>(cmap);
@@ -139 +139 @@
     /// concecpt and could be indiced by the current item set of
     /// the NodeMap. In this case the value for each item
-    /// is assigned by the value of the given ReadMap. 
+    /// is assigned by the value of the given ReadMap.
     template <typename CMap>
     ArrayMap& operator=(const CMap& cmap) {
@@ -152 +152 @@
 
     /// \brief The destructor of the map.
-    ///     
+    ///
     /// The destructor of the map.
-    virtual ~ArrayMap() {      
+    virtual ~ArrayMap() {
       if (attached()) {
-        clear();
-        detach();
-      }
-    }
-                
+        clear();
+        detach();
+      }
+    }
+
   protected:
 
@@ -169 +169 @@
   public:
 
-    /// \brief The subscript operator. 
+    /// \brief The subscript operator.
     ///
     /// The subscript operator. The map can be subscripted by the
-    /// actual keys of the graph. 
+    /// actual keys of the graph.
     Value& operator[](const Key& key) {
       int id = Parent::notifier()->id(key);
       return values[id];
-    } 
-                
+    }
+
     /// \brief The const subscript operator.
     ///
     /// The const subscript operator. The map can be subscripted by the
-    /// actual keys of the graph. 
+    /// actual keys of the graph.
     const Value& operator[](const Key& key) const {
       int id = Parent::notifier()->id(key);
@@ -188 +188 @@
 
     /// \brief Setter function of the map.
-    /// 
+    ///
     /// Setter function of the map. Equivalent with map[key] = val.
     /// This is a compatibility feature with the not dereferable maps.
@@ -198 +198 @@
 
     /// \brief Adds a new key to the map.
-    ///         
+    ///
     /// It adds a new key to the map. It called by the observer notifier
-    /// and it overrides the add() member function of the observer base.     
+    /// and it overrides the add() member function of the observer base.
     virtual void add(const Key& key) {
       Notifier* nf = Parent::notifier();
       int id = nf->id(key);
       if (id >= capacity) {
-        int new_capacity = (capacity == 0 ? 1 : capacity);
-        while (new_capacity <= id) {
-          new_capacity <<= 1;
-        }
-        Value* new_values = allocator.allocate(new_capacity);
-        Item it;
-        for (nf->first(it); it != INVALID; nf->next(it)) {
-          int jd = nf->id(it);;
-          if (id != jd) {
-            allocator.construct(&(new_values[jd]), values[jd]);
-            allocator.destroy(&(values[jd]));
-          }
-        }
-        if (capacity != 0) allocator.deallocate(values, capacity);
-        values = new_values;
-        capacity = new_capacity;
+        int new_capacity = (capacity == 0 ? 1 : capacity);
+        while (new_capacity <= id) {
+          new_capacity <<= 1;
+        }
+        Value* new_values = allocator.allocate(new_capacity);
+        Item it;
+        for (nf->first(it); it != INVALID; nf->next(it)) {
+          int jd = nf->id(it);;
+          if (id != jd) {
+            allocator.construct(&(new_values[jd]), values[jd]);
+            allocator.destroy(&(values[jd]));
+          }
+        }
+        if (capacity != 0) allocator.deallocate(values, capacity);
+        values = new_values;
+        capacity = new_capacity;
       }
       allocator.construct(&(values[id]), Value());
@@ -226 +226 @@
 
     /// \brief Adds more new keys to the map.
-    ///         
+    ///
     /// It adds more new keys to the map. It called by the observer notifier
-    /// and it overrides the add() member function of the observer base.     
+    /// and it overrides the add() member function of the observer base.
     virtual void add(const std::vector<Key>& keys) {
       Notifier* nf = Parent::notifier();
       int max_id = -1;
       for (int i = 0; i < int(keys.size()); ++i) {
-        int id = nf->id(keys[i]);
-        if (id > max_id) {
-          max_id = id;
-        }
+        int id = nf->id(keys[i]);
+        if (id > max_id) {
+          max_id = id;
+        }
       }
       if (max_id >= capacity) {
-        int new_capacity = (capacity == 0 ? 1 : capacity);
-        while (new_capacity <= max_id) {
-          new_capacity <<= 1;
-        }
-        Value* new_values = allocator.allocate(new_capacity);
-        Item it;
-        for (nf->first(it); it != INVALID; nf->next(it)) {
-          int id = nf->id(it);
-          bool found = false;
-          for (int i = 0; i < int(keys.size()); ++i) {
-            int jd = nf->id(keys[i]);
-            if (id == jd) {
-              found = true;
-              break;
-            }
-          }
-          if (found) continue;
-          allocator.construct(&(new_values[id]), values[id]);
-          allocator.destroy(&(values[id]));
-        }
-        if (capacity != 0) allocator.deallocate(values, capacity);
-        values = new_values;
-        capacity = new_capacity;
+        int new_capacity = (capacity == 0 ? 1 : capacity);
+        while (new_capacity <= max_id) {
+          new_capacity <<= 1;
+        }
+        Value* new_values = allocator.allocate(new_capacity);
+        Item it;
+        for (nf->first(it); it != INVALID; nf->next(it)) {
+          int id = nf->id(it);
+          bool found = false;
+          for (int i = 0; i < int(keys.size()); ++i) {
+            int jd = nf->id(keys[i]);
+            if (id == jd) {
+              found = true;
+              break;
+            }
+          }
+          if (found) continue;
+          allocator.construct(&(new_values[id]), values[id]);
+          allocator.destroy(&(values[id]));
+        }
+        if (capacity != 0) allocator.deallocate(values, capacity);
+        values = new_values;
+        capacity = new_capacity;
       }
       for (int i = 0; i < int(keys.size()); ++i) {
-        int id = nf->id(keys[i]);
-        allocator.construct(&(values[id]), Value());
-      }
-    }
-                
+        int id = nf->id(keys[i]);
+        allocator.construct(&(values[id]), Value());
+      }
+    }
+
     /// \brief Erase a key from the map.
     ///
     /// Erase a key from the map. It called by the observer notifier
-    /// and it overrides the erase() member function of the observer base.     
+    /// and it overrides the erase() member function of the observer base.
     virtual void erase(const Key& key) {
       int id = Parent::notifier()->id(key);
@@ -281 +281 @@
     ///
     /// Erase more keys from the map. It called by the observer notifier
-    /// and it overrides the erase() member function of the observer base.     
+    /// and it overrides the erase() member function of the observer base.
     virtual void erase(const std::vector<Key>& keys) {
       for (int i = 0; i < int(keys.size()); ++i) {
-        int id = Parent::notifier()->id(keys[i]);
-        allocator.destroy(&(values[id]));
+        int id = Parent::notifier()->id(keys[i]);
+        allocator.destroy(&(values[id]));
       }
     }
 
     /// \brief Buildes the map.
-    /// 
+    ///
     /// It buildes the map. It called by the observer notifier
-    /// and it overrides the build() member function of the observer base. 
+    /// and it overrides the build() member function of the observer base.
     virtual void build() {
       Notifier* nf = Parent::notifier();
@@ -298 +298 @@
       Item it;
       for (nf->first(it); it != INVALID; nf->next(it)) {
-        int id = nf->id(it);;
-        allocator.construct(&(values[id]), Value());
-      }                                                         
+        int id = nf->id(it);;
+        allocator.construct(&(values[id]), Value());
+      }
     }
 
@@ -306 +306 @@
     ///
     /// It erase all items from the map. It called by the observer notifier
-    /// and it overrides the clear() member function of the observer base.     
-    virtual void clear() {      
+    /// and it overrides the clear() member function of the observer base.
+    virtual void clear() {
       Notifier* nf = Parent::notifier();
       if (capacity != 0) {
-        Item it;
-        for (nf->first(it); it != INVALID; nf->next(it)) {
-          int id = nf->id(it);
-          allocator.destroy(&(values[id]));
-        }                                                               
-        allocator.deallocate(values, capacity);
-        capacity = 0;
+        Item it;
+        for (nf->first(it); it != INVALID; nf->next(it)) {
+          int id = nf->id(it);
+          allocator.destroy(&(values[id]));
+        }
+        allocator.deallocate(values, capacity);
+        capacity = 0;
       }
     }
 
   private:
-      
+
     void allocate_memory() {
       int max_id = Parent::notifier()->maxId();
       if (max_id == -1) {
-        capacity = 0;
-        values = 0;
-        return;
+        capacity = 0;
+        values = 0;
+        return;
       }
       capacity = 1;
       while (capacity <= max_id) {
-        capacity <<= 1;
-      }
-      values = allocator.allocate(capacity);    
-    }      
+        capacity <<= 1;
+      }
+      values = allocator.allocate(capacity);
+    }
 
     int capacity;
@@ -340 +340 @@
     Allocator allocator;
 
-  };            
+  };
 
 }
 
-#endif 
+#endif

lemon/bits/base_extender.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -64 +64 @@
 
       bool operator==(const Arc &that) const {
-        return forward==that.forward && Edge(*this)==Edge(that);
+        return forward==that.forward && Edge(*this)==Edge(that);
       }
       bool operator!=(const Arc &that) const {
-        return forward!=that.forward || Edge(*this)!=Edge(that);
+        return forward!=that.forward || Edge(*this)!=Edge(that);
       }
       bool operator<(const Arc &that) const {
-        return forward<that.forward ||
-          (!(that.forward<forward) && Edge(*this)<Edge(that));
+        return forward<that.forward ||
+          (!(that.forward<forward) && Edge(*this)<Edge(that));
       }
     };
@@ -118 +118 @@
     void next(Arc &e) const {
       if( e.forward ) {
-        e.forward = false;
+        e.forward = false;
       }
       else {
-        Parent::next(e);
-        e.forward = true;
+        Parent::next(e);
+        e.forward = true;
       }
     }
@@ -129 +129 @@
       Parent::firstIn(e,n);
       if( Edge(e) != INVALID ) {
-        e.forward = false;
+        e.forward = false;
       }
       else {
-        Parent::firstOut(e,n);
-        e.forward = true;
+        Parent::firstOut(e,n);
+        e.forward = true;
       }
     }
     void nextOut(Arc &e) const {
       if( ! e.forward ) {
-        Node n = Parent::target(e);
-        Parent::nextIn(e);
-        if( Edge(e) == INVALID ) {
-          Parent::firstOut(e, n);
-          e.forward = true;
-        }
+        Node n = Parent::target(e);
+        Parent::nextIn(e);
+        if( Edge(e) == INVALID ) {
+          Parent::firstOut(e, n);
+          e.forward = true;
+        }
       }
       else {
-        Parent::nextOut(e);
+        Parent::nextOut(e);
       }
     }
@@ -153 +153 @@
       Parent::firstOut(e,n);
       if( Edge(e) != INVALID ) {
-        e.forward = false;
+        e.forward = false;
       }
       else {
-        Parent::firstIn(e,n);
-        e.forward = true;
+        Parent::firstIn(e,n);
+        e.forward = true;
       }
     }
     void nextIn(Arc &e) const {
       if( ! e.forward ) {
-        Node n = Parent::source(e);
-        Parent::nextOut(e);
-        if( Edge(e) == INVALID ) {
-          Parent::firstIn(e, n);
-          e.forward = true;
-        }
+        Node n = Parent::source(e);
+        Parent::nextOut(e);
+        if( Edge(e) == INVALID ) {
+          Parent::firstIn(e, n);
+          e.forward = true;
+        }
       }
       else {
-        Parent::nextIn(e);
+        Parent::nextIn(e);
       }
     }
@@ -184 +184 @@
     void nextInc(Edge &e, bool &d) const {
       if (d) {
-        Node s = Parent::source(e);
-        Parent::nextOut(e);
-        if (e != INVALID) return;
-        d = false;
-        Parent::firstIn(e, s);
-      } else {
-        Parent::nextIn(e);
+        Node s = Parent::source(e);
+        Parent::nextOut(e);
+        if (e != INVALID) return;
+        d = false;
+        Parent::firstIn(e, s);
+      } else {
+        Parent::nextIn(e);
       }
     }
@@ -241 +241 @@
     Arc findArc(Node s, Node t, Arc p = INVALID) const {
       if (p == INVALID) {
-        Edge arc = Parent::findArc(s, t);
-        if (arc != INVALID) return direct(arc, true);
-        arc = Parent::findArc(t, s);
-        if (arc != INVALID) return direct(arc, false);
+        Edge arc = Parent::findArc(s, t);
+        if (arc != INVALID) return direct(arc, true);
+        arc = Parent::findArc(t, s);
+        if (arc != INVALID) return direct(arc, false);
       } else if (direction(p)) {
-        Edge arc = Parent::findArc(s, t, p);
-        if (arc != INVALID) return direct(arc, true);
-        arc = Parent::findArc(t, s);
-        if (arc != INVALID) return direct(arc, false);  
-      } else {
-        Edge arc = Parent::findArc(t, s, p);
-        if (arc != INVALID) return direct(arc, false);        
+        Edge arc = Parent::findArc(s, t, p);
+        if (arc != INVALID) return direct(arc, true);
+        arc = Parent::findArc(t, s);
+        if (arc != INVALID) return direct(arc, false);
+      } else {
+        Edge arc = Parent::findArc(t, s, p);
+        if (arc != INVALID) return direct(arc, false);
       }
       return INVALID;
@@ -268 +268 @@
           if (arc != INVALID) return arc;
           arc = Parent::findArc(t, s);
-          if (arc != INVALID) return arc;       
+          if (arc != INVALID) return arc;
         } else {
           Edge arc = Parent::findArc(t, s, p);
-          if (arc != INVALID) return arc;             
+          if (arc != INVALID) return arc;
         }
       } else {
@@ -300 +300 @@
       Red() {}
       Red(const Node& node) : Node(node) {
-        LEMON_ASSERT(Parent::red(node) || node == INVALID, 
-                     typename Parent::NodeSetError());
+        LEMON_ASSERT(Parent::red(node) || node == INVALID,
+                     typename Parent::NodeSetError());
       }
       Red& operator=(const Node& node) {
-        LEMON_ASSERT(Parent::red(node) || node == INVALID, 
-                     typename Parent::NodeSetError());
+        LEMON_ASSERT(Parent::red(node) || node == INVALID,
+                     typename Parent::NodeSetError());
         Node::operator=(node);
         return *this;
@@ -332 +332 @@
       Blue() {}
       Blue(const Node& node) : Node(node) {
-        LEMON_ASSERT(Parent::blue(node) || node == INVALID,
-                     typename Parent::NodeSetError());
+        LEMON_ASSERT(Parent::blue(node) || node == INVALID,
+                     typename Parent::NodeSetError());
       }
       Blue& operator=(const Node& node) {
-        LEMON_ASSERT(Parent::blue(node) || node == INVALID, 
-                     typename Parent::NodeSetError());
+        LEMON_ASSERT(Parent::blue(node) || node == INVALID,
+                     typename Parent::NodeSetError());
         Node::operator=(node);
         return *this;
@@ -354 +354 @@
       Parent::nextBlue(static_cast<Node&>(node));
     }
-  
+
     int id(const Blue& node) const {
       return Parent::redId(node);
@@ -368 +368 @@
     void firstInc(Edge& arc, bool& dir, const Node& node) const {
       if (Parent::red(node)) {
-        Parent::firstFromRed(arc, node);
-        dir = true;
-      } else {
-        Parent::firstFromBlue(arc, node);
-        dir = static_cast<Edge&>(arc) == INVALID;
+        Parent::firstFromRed(arc, node);
+        dir = true;
+      } else {
+        Parent::firstFromBlue(arc, node);
+        dir = static_cast<Edge&>(arc) == INVALID;
       }
     }
     void nextInc(Edge& arc, bool& dir) const {
       if (dir) {
-        Parent::nextFromRed(arc);
-      } else {
-        Parent::nextFromBlue(arc);
-        if (arc == INVALID) dir = true;
+        Parent::nextFromRed(arc);
+      } else {
+        Parent::nextFromBlue(arc);
+        if (arc == INVALID) dir = true;
       }
     }
@@ -390 +390 @@
 
       Arc(const Edge& arc, bool _forward)
-        : Edge(arc), forward(_forward) {}
+        : Edge(arc), forward(_forward) {}
 
     public:
@@ -396 +396 @@
       Arc (Invalid) : Edge(INVALID), forward(true) {}
       bool operator==(const Arc& i) const {
-        return Edge::operator==(i) && forward == i.forward;
+        return Edge::operator==(i) && forward == i.forward;
       }
       bool operator!=(const Arc& i) const {
-        return Edge::operator!=(i) || forward != i.forward;
+        return Edge::operator!=(i) || forward != i.forward;
       }
       bool operator<(const Arc& i) const {
-        return Edge::operator<(i) || 
-          (!(i.forward<forward) && Edge(*this)<Edge(i));
+        return Edge::operator<(i) ||
+          (!(i.forward<forward) && Edge(*this)<Edge(i));
       }
     };
@@ -414 +414 @@
     void next(Arc& arc) const {
       if (!arc.forward) {
-        Parent::next(static_cast<Edge&>(arc));
+        Parent::next(static_cast<Edge&>(arc));
       }
       arc.forward = !arc.forward;
@@ -421 +421 @@
     void firstOut(Arc& arc, const Node& node) const {
       if (Parent::red(node)) {
-        Parent::firstFromRed(arc, node);
-        arc.forward = true;
-      } else {
-        Parent::firstFromBlue(arc, node);
-        arc.forward = static_cast<Edge&>(arc) == INVALID;
+        Parent::firstFromRed(arc, node);
+        arc.forward = true;
+      } else {
+        Parent::firstFromBlue(arc, node);
+        arc.forward = static_cast<Edge&>(arc) == INVALID;
       }
     }
     void nextOut(Arc& arc) const {
       if (arc.forward) {
-        Parent::nextFromRed(arc);
-      } else {
-        Parent::nextFromBlue(arc);
+        Parent::nextFromRed(arc);
+      } else {
+        Parent::nextFromBlue(arc);
         arc.forward = static_cast<Edge&>(arc) == INVALID;
       }
@@ -439 +439 @@
     void firstIn(Arc& arc, const Node& node) const {
       if (Parent::blue(node)) {
-        Parent::firstFromBlue(arc, node);
-        arc.forward = true;     
-      } else {
-        Parent::firstFromRed(arc, node);
-        arc.forward = static_cast<Edge&>(arc) == INVALID;
+        Parent::firstFromBlue(arc, node);
+        arc.forward = true;
+      } else {
+        Parent::firstFromRed(arc, node);
+        arc.forward = static_cast<Edge&>(arc) == INVALID;
       }
     }
     void nextIn(Arc& arc) const {
       if (arc.forward) {
-        Parent::nextFromBlue(arc);
-      } else {
-        Parent::nextFromRed(arc);
-        arc.forward = static_cast<Edge&>(arc) == INVALID;
+        Parent::nextFromBlue(arc);
+      } else {
+        Parent::nextFromRed(arc);
+        arc.forward = static_cast<Edge&>(arc) == INVALID;
       }
     }
@@ -463 +463 @@
 
     int id(const Arc& arc) const {
-      return (Parent::id(static_cast<const Edge&>(arc)) << 1) + 
+      return (Parent::id(static_cast<const Edge&>(arc)) << 1) +
         (arc.forward ? 0 : 1);
     }

lemon/bits/bezier.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -45 +45 @@
   Bezier1() {}
   Bezier1(Point _p1, Point _p2) :p1(_p1), p2(_p2) {}
-  
+
   Point operator()(double t) const
   {
@@ -55 +55 @@
     return Bezier1(p1,conv(p1,p2,t));
   }
-  
+
   Bezier1 after(double t) const
   {
@@ -88 +88 @@
     return Bezier2(p1,q,conv(q,r,t));
   }
-  
+
   Bezier2 after(double t) const
   {
@@ -111 +111 @@
   Bezier3(Point _p1, Point _p2, Point _p3, Point _p4)
     : p1(_p1), p2(_p2), p3(_p3), p4(_p4) {}
-  Bezier3(const Bezier1 &b) : p1(b.p1), p2(conv(b.p1,b.p2,1.0/3.0)), 
-                              p3(conv(b.p1,b.p2,2.0/3.0)), p4(b.p2) {}
+  Bezier3(const Bezier1 &b) : p1(b.p1), p2(conv(b.p1,b.p2,1.0/3.0)),
+                              p3(conv(b.p1,b.p2,2.0/3.0)), p4(b.p2) {}
   Bezier3(const Bezier2 &b) : p1(b.p1), p2(conv(b.p1,b.p2,2.0/3.0)),
-                              p3(conv(b.p2,b.p3,1.0/3.0)), p4(b.p3) {}
-  
-  Point operator()(double t) const 
+                              p3(conv(b.p2,b.p3,1.0/3.0)), p4(b.p3) {}
+
+  Point operator()(double t) const
     {
       //    return Bezier2(conv(p1,p2,t),conv(p2,p3,t),conv(p3,p4,t))(t);
       return ((1-t)*(1-t)*(1-t))*p1+(3*t*(1-t)*(1-t))*p2+
-        (3*t*t*(1-t))*p3+(t*t*t)*p4;
+        (3*t*t*(1-t))*p3+(t*t*t)*p4;
     }
   Bezier3 before(double t) const
@@ -132 +132 @@
       return Bezier3(p1,p,a,c);
     }
-  
+
   Bezier3 after(double t) const
     {
@@ -147 +147 @@
   Bezier2 grad() const { return Bezier2(3.0*(p2-p1),3.0*(p3-p2),3.0*(p4-p3)); }
   Bezier2 norm() const { return Bezier2(3.0*rot90(p2-p1),
-                                  3.0*rot90(p3-p2),
-                                  3.0*rot90(p4-p3)); }
+                                  3.0*rot90(p3-p2),
+                                  3.0*rot90(p4-p3)); }
   Point grad(double t) const { return grad()(t); }
   Point norm(double t) const { return rot90(grad(t)); }
 
   template<class R,class F,class S,class D>
-  R recSplit(F &_f,const S &_s,D _d) const 
+  R recSplit(F &_f,const S &_s,D _d) const
   {
     const Point a=(p1+p2)/2;
@@ -165 +165 @@
     return _s(f1,f2);
   }
-  
+
 };
 

lemon/bits/default_map.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -30 +30 @@
 
 namespace lemon {
-  
-  
+
+
   //#ifndef LEMON_USE_DEBUG_MAP
 
@@ -141 +141 @@
   };
 
-// #else 
+// #else
 
 //   template <typename _Graph, typename _Item, typename _Value>
@@ -148 +148 @@
 //   };
 
-// #endif  
+// #endif
 
   /// \e
   template <typename _Graph, typename _Item, typename _Value>
-  class DefaultMap 
+  class DefaultMap
     : public DefaultMapSelector<_Graph, _Item, _Value>::Map {
   public:
     typedef typename DefaultMapSelector<_Graph, _Item, _Value>::Map Parent;
     typedef DefaultMap<_Graph, _Item, _Value> Map;
-    
+
     typedef typename Parent::Graph Graph;
     typedef typename Parent::Value Value;
 
     explicit DefaultMap(const Graph& graph) : Parent(graph) {}
-    DefaultMap(const Graph& graph, const Value& value) 
+    DefaultMap(const Graph& graph, const Value& value)
       : Parent(graph, value) {}
 

lemon/bits/graph_extender.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -67 +67 @@
     Node oppositeNode(const Node &node, const Arc &arc) const {
       if (node == Parent::source(arc))
-        return Parent::target(arc);
+        return Parent::target(arc);
       else if(node == Parent::target(arc))
-        return Parent::source(arc);
+        return Parent::source(arc);
       else
-        return INVALID;
+        return INVALID;
     }
 
@@ -90 +90 @@
       return node_notifier;
     }
-    
+
     ArcNotifier& notifier(Arc) const {
       return arc_notifier;
     }
 
-    class NodeIt : public Node { 
+    class NodeIt : public Node {
       const Digraph* _digraph;
     public:
@@ -104 +104 @@
 
       explicit NodeIt(const Digraph& digraph) : _digraph(&digraph) {
-        _digraph->first(static_cast<Node&>(*this));
-      }
-
-      NodeIt(const Digraph& digraph, const Node& node) 
-        : Node(node), _digraph(&digraph) {}
-
-      NodeIt& operator++() { 
-        _digraph->next(*this);
-        return *this; 
-      }
-
-    };
-
-
-    class ArcIt : public Arc { 
+        _digraph->first(static_cast<Node&>(*this));
+      }
+
+      NodeIt(const Digraph& digraph, const Node& node)
+        : Node(node), _digraph(&digraph) {}
+
+      NodeIt& operator++() {
+        _digraph->next(*this);
+        return *this;
+      }
+
+    };
+
+
+    class ArcIt : public Arc {
       const Digraph* _digraph;
     public:
@@ -127 +127 @@
 
       explicit ArcIt(const Digraph& digraph) : _digraph(&digraph) {
-        _digraph->first(static_cast<Arc&>(*this));
-      }
-
-      ArcIt(const Digraph& digraph, const Arc& arc) : 
-        Arc(arc), _digraph(&digraph) { }
-
-      ArcIt& operator++() { 
-        _digraph->next(*this);
-        return *this; 
-      }
-
-    };
-
-
-    class OutArcIt : public Arc { 
+        _digraph->first(static_cast<Arc&>(*this));
+      }
+
+      ArcIt(const Digraph& digraph, const Arc& arc) :
+        Arc(arc), _digraph(&digraph) { }
+
+      ArcIt& operator++() {
+        _digraph->next(*this);
+        return *this;
+      }
+
+    };
+
+
+    class OutArcIt : public Arc {
       const Digraph* _digraph;
     public:
@@ -149 +149 @@
       OutArcIt(Invalid i) : Arc(i) { }
 
-      OutArcIt(const Digraph& digraph, const Node& node) 
-        : _digraph(&digraph) {
-        _digraph->firstOut(*this, node);
-      }
-
-      OutArcIt(const Digraph& digraph, const Arc& arc) 
-        : Arc(arc), _digraph(&digraph) {}
-
-      OutArcIt& operator++() { 
-        _digraph->nextOut(*this);
-        return *this; 
-      }
-
-    };
-
-
-    class InArcIt : public Arc { 
+      OutArcIt(const Digraph& digraph, const Node& node)
+        : _digraph(&digraph) {
+        _digraph->firstOut(*this, node);
+      }
+
+      OutArcIt(const Digraph& digraph, const Arc& arc)
+        : Arc(arc), _digraph(&digraph) {}
+
+      OutArcIt& operator++() {
+        _digraph->nextOut(*this);
+        return *this;
+      }
+
+    };
+
+
+    class InArcIt : public Arc {
       const Digraph* _digraph;
     public:
@@ -173 +173 @@
       InArcIt(Invalid i) : Arc(i) { }
 
-      InArcIt(const Digraph& digraph, const Node& node) 
-        : _digraph(&digraph) {
-        _digraph->firstIn(*this, node);
-      }
-
-      InArcIt(const Digraph& digraph, const Arc& arc) : 
-        Arc(arc), _digraph(&digraph) {}
-
-      InArcIt& operator++() { 
-        _digraph->nextIn(*this);
-        return *this; 
+      InArcIt(const Digraph& digraph, const Node& node)
+        : _digraph(&digraph) {
+        _digraph->firstIn(*this, node);
+      }
+
+      InArcIt(const Digraph& digraph, const Arc& arc) :
+        Arc(arc), _digraph(&digraph) {}
+
+      InArcIt& operator++() {
+        _digraph->nextIn(*this);
+        return *this;
       }
 
@@ -216 +216 @@
     }
 
-    
+
     template <typename _Value>
-    class NodeMap 
+    class NodeMap
       : public MapExtender<DefaultMap<Digraph, Node, _Value> > {
     public:
@@ -224 +224 @@
       typedef MapExtender<DefaultMap<Digraph, Node, _Value> > Parent;
 
-      explicit NodeMap(const Digraph& digraph) 
-        : Parent(digraph) {}
-      NodeMap(const Digraph& digraph, const _Value& value) 
-        : Parent(digraph, value) {}
+      explicit NodeMap(const Digraph& digraph)
+        : Parent(digraph) {}
+      NodeMap(const Digraph& digraph, const _Value& value)
+        : Parent(digraph, value) {}
 
       NodeMap& operator=(const NodeMap& cmap) {
-        return operator=<NodeMap>(cmap);
+        return operator=<NodeMap>(cmap);
       }
 
@@ -236 +236 @@
       NodeMap& operator=(const CMap& cmap) {
         Parent::operator=(cmap);
-        return *this;
+        return *this;
       }
 
@@ -242 +242 @@
 
     template <typename _Value>
-    class ArcMap 
+    class ArcMap
       : public MapExtender<DefaultMap<Digraph, Arc, _Value> > {
     public:
@@ -248 +248 @@
       typedef MapExtender<DefaultMap<Digraph, Arc, _Value> > Parent;
 
-      explicit ArcMap(const Digraph& digraph) 
-        : Parent(digraph) {}
-      ArcMap(const Digraph& digraph, const _Value& value) 
-        : Parent(digraph, value) {}
+      explicit ArcMap(const Digraph& digraph)
+        : Parent(digraph) {}
+      ArcMap(const Digraph& digraph, const _Value& value)
+        : Parent(digraph, value) {}
 
       ArcMap& operator=(const ArcMap& cmap) {
-        return operator=<ArcMap>(cmap);
+        return operator=<ArcMap>(cmap);
       }
 
@@ -260 +260 @@
       ArcMap& operator=(const CMap& cmap) {
         Parent::operator=(cmap);
-        return *this;
+        return *this;
       }
     };
@@ -270 +270 @@
       return node;
     }
-    
+
     Arc addArc(const Node& from, const Node& to) {
       Arc arc = Parent::addArc(from, to);
@@ -294 +294 @@
       Parent::firstOut(arc, node);
       while (arc != INVALID ) {
-        erase(arc);
-        Parent::firstOut(arc, node);
-      } 
+        erase(arc);
+        Parent::firstOut(arc, node);
+      }
 
       Parent::firstIn(arc, node);
       while (arc != INVALID ) {
-        erase(arc);
-        Parent::firstIn(arc, node);
+        erase(arc);
+        Parent::firstIn(arc, node);
       }
 
@@ -307 +307 @@
       Parent::erase(node);
     }
-    
+
     void erase(const Arc& arc) {
       notifier(Arc()).erase(arc);
@@ -316 +316 @@
       node_notifier.setContainer(*this);
       arc_notifier.setContainer(*this);
-    } 
-    
+    }
+
 
     ~DigraphExtender() {
@@ -328 +328 @@
   ///
   /// \brief Extender for the Graphs
-  template <typename Base> 
+  template <typename Base>
   class GraphExtender : public Base {
   public:
-    
+
     typedef Base Parent;
     typedef GraphExtender Graph;
@@ -341 +341 @@
     typedef typename Parent::Edge Edge;
 
-    // Graph extension    
+    // Graph extension
 
     int maxId(Node) const {
@@ -369 +369 @@
     Node oppositeNode(const Node &n, const Edge &e) const {
       if( n == Parent::u(e))
-        return Parent::v(e);
+        return Parent::v(e);
       else if( n == Parent::v(e))
-        return Parent::u(e);
+        return Parent::u(e);
       else
-        return INVALID;
+        return INVALID;
     }
 
@@ -403 +403 @@
       return node_notifier;
     }
-    
+
     ArcNotifier& notifier(Arc) const {
       return arc_notifier;
@@ -414 +414 @@
 
 
-    class NodeIt : public Node { 
+    class NodeIt : public Node {
       const Graph* _graph;
     public:
@@ -423 +423 @@
 
       explicit NodeIt(const Graph& graph) : _graph(&graph) {
-        _graph->first(static_cast<Node&>(*this));
-      }
-
-      NodeIt(const Graph& graph, const Node& node) 
-        : Node(node), _graph(&graph) {}
-
-      NodeIt& operator++() { 
-        _graph->next(*this);
-        return *this; 
-      }
-
-    };
-
-
-    class ArcIt : public Arc { 
+        _graph->first(static_cast<Node&>(*this));
+      }
+
+      NodeIt(const Graph& graph, const Node& node)
+        : Node(node), _graph(&graph) {}
+
+      NodeIt& operator++() {
+        _graph->next(*this);
+        return *this;
+      }
+
+    };
+
+
+    class ArcIt : public Arc {
       const Graph* _graph;
     public:
@@ -446 +446 @@
 
       explicit ArcIt(const Graph& graph) : _graph(&graph) {
-        _graph->first(static_cast<Arc&>(*this));
-      }
-
-      ArcIt(const Graph& graph, const Arc& arc) : 
-        Arc(arc), _graph(&graph) { }
-
-      ArcIt& operator++() { 
-        _graph->next(*this);
-        return *this; 
-      }
-
-    };
-
-
-    class OutArcIt : public Arc { 
+        _graph->first(static_cast<Arc&>(*this));
+      }
+
+      ArcIt(const Graph& graph, const Arc& arc) :
+        Arc(arc), _graph(&graph) { }
+
+      ArcIt& operator++() {
+        _graph->next(*this);
+        return *this;
+      }
+
+    };
+
+
+    class OutArcIt : public Arc {
       const Graph* _graph;
     public:
@@ -468 +468 @@
       OutArcIt(Invalid i) : Arc(i) { }
 
-      OutArcIt(const Graph& graph, const Node& node) 
-        : _graph(&graph) {
-        _graph->firstOut(*this, node);
-      }
-
-      OutArcIt(const Graph& graph, const Arc& arc) 
-        : Arc(arc), _graph(&graph) {}
-
-      OutArcIt& operator++() { 
-        _graph->nextOut(*this);
-        return *this; 
-      }
-
-    };
-
-
-    class InArcIt : public Arc { 
+      OutArcIt(const Graph& graph, const Node& node)
+        : _graph(&graph) {
+        _graph->firstOut(*this, node);
+      }
+
+      OutArcIt(const Graph& graph, const Arc& arc)
+        : Arc(arc), _graph(&graph) {}
+
+      OutArcIt& operator++() {
+        _graph->nextOut(*this);
+        return *this;
+      }
+
+    };
+
+
+    class InArcIt : public Arc {
       const Graph* _graph;
     public:
@@ -492 +492 @@
       InArcIt(Invalid i) : Arc(i) { }
 
-      InArcIt(const Graph& graph, const Node& node) 
-        : _graph(&graph) {
-        _graph->firstIn(*this, node);
-      }
-
-      InArcIt(const Graph& graph, const Arc& arc) : 
-        Arc(arc), _graph(&graph) {}
-
-      InArcIt& operator++() { 
-        _graph->nextIn(*this);
-        return *this; 
-      }
-
-    };
-
-
-    class EdgeIt : public Parent::Edge { 
+      InArcIt(const Graph& graph, const Node& node)
+        : _graph(&graph) {
+        _graph->firstIn(*this, node);
+      }
+
+      InArcIt(const Graph& graph, const Arc& arc) :
+        Arc(arc), _graph(&graph) {}
+
+      InArcIt& operator++() {
+        _graph->nextIn(*this);
+        return *this;
+      }
+
+    };
+
+
+    class EdgeIt : public Parent::Edge {
       const Graph* _graph;
     public:
@@ -517 +517 @@
 
       explicit EdgeIt(const Graph& graph) : _graph(&graph) {
-        _graph->first(static_cast<Edge&>(*this));
-      }
-
-      EdgeIt(const Graph& graph, const Edge& edge) : 
-        Edge(edge), _graph(&graph) { }
-
-      EdgeIt& operator++() { 
-        _graph->next(*this);
-        return *this; 
+        _graph->first(static_cast<Edge&>(*this));
+      }
+
+      EdgeIt(const Graph& graph, const Edge& edge) :
+        Edge(edge), _graph(&graph) { }
+
+      EdgeIt& operator++() {
+        _graph->next(*this);
+        return *this;
       }
 
@@ -541 +541 @@
 
       IncEdgeIt(const Graph& graph, const Node &node) : _graph(&graph) {
-        _graph->firstInc(*this, _direction, node);
+        _graph->firstInc(*this, _direction, node);
       }
 
       IncEdgeIt(const Graph& graph, const Edge &edge, const Node &node)
-        : _graph(&graph), Edge(edge) {
-        _direction = (_graph->source(edge) == node);
+        : _graph(&graph), Edge(edge) {
+        _direction = (_graph->source(edge) == node);
       }
 
       IncEdgeIt& operator++() {
-        _graph->nextInc(*this, _direction);
-        return *this; 
+        _graph->nextInc(*this, _direction);
+        return *this;
       }
     };
@@ -599 +599 @@
 
     template <typename _Value>
-    class NodeMap 
+    class NodeMap
       : public MapExtender<DefaultMap<Graph, Node, _Value> > {
     public:
@@ -605 +605 @@
       typedef MapExtender<DefaultMap<Graph, Node, _Value> > Parent;
 
-      NodeMap(const Graph& graph) 
-        : Parent(graph) {}
-      NodeMap(const Graph& graph, const _Value& value) 
-        : Parent(graph, value) {}
+      NodeMap(const Graph& graph)
+        : Parent(graph) {}
+      NodeMap(const Graph& graph, const _Value& value)
+        : Parent(graph, value) {}
 
       NodeMap& operator=(const NodeMap& cmap) {
-        return operator=<NodeMap>(cmap);
+        return operator=<NodeMap>(cmap);
       }
 
@@ -617 +617 @@
       NodeMap& operator=(const CMap& cmap) {
         Parent::operator=(cmap);
-        return *this;
+        return *this;
       }
 
@@ -623 +623 @@
 
     template <typename _Value>
-    class ArcMap 
+    class ArcMap
       : public MapExtender<DefaultMap<Graph, Arc, _Value> > {
     public:
@@ -629 +629 @@
       typedef MapExtender<DefaultMap<Graph, Arc, _Value> > Parent;
 
-      ArcMap(const Graph& graph) 
-        : Parent(graph) {}
-      ArcMap(const Graph& graph, const _Value& value) 
-        : Parent(graph, value) {}
+      ArcMap(const Graph& graph)
+        : Parent(graph) {}
+      ArcMap(const Graph& graph, const _Value& value)
+        : Parent(graph, value) {}
 
       ArcMap& operator=(const ArcMap& cmap) {
-        return operator=<ArcMap>(cmap);
+        return operator=<ArcMap>(cmap);
       }
 
@@ -641 +641 @@
       ArcMap& operator=(const CMap& cmap) {
         Parent::operator=(cmap);
-        return *this;
+        return *this;
       }
     };
@@ -647 +647 @@
 
     template <typename _Value>
-    class EdgeMap 
+    class EdgeMap
       : public MapExtender<DefaultMap<Graph, Edge, _Value> > {
     public:
@@ -653 +653 @@
       typedef MapExtender<DefaultMap<Graph, Edge, _Value> > Parent;
 
-      EdgeMap(const Graph& graph) 
-        : Parent(graph) {}
-
-      EdgeMap(const Graph& graph, const _Value& value) 
-        : Parent(graph, value) {}
+      EdgeMap(const Graph& graph)
+        : Parent(graph) {}
+
+      EdgeMap(const Graph& graph, const _Value& value)
+        : Parent(graph, value) {}
 
       EdgeMap& operator=(const EdgeMap& cmap) {
-        return operator=<EdgeMap>(cmap);
+        return operator=<EdgeMap>(cmap);
       }
 
@@ -666 +666 @@
       EdgeMap& operator=(const CMap& cmap) {
         Parent::operator=(cmap);
-        return *this;
+        return *this;
       }
 
@@ -684 +684 @@
       std::vector<Arc> ev;
       ev.push_back(Parent::direct(edge, true));
-      ev.push_back(Parent::direct(edge, false));      
+      ev.push_back(Parent::direct(edge, false));
       notifier(Arc()).add(ev);
       return edge;
     }
-    
+
     void clear() {
       notifier(Arc()).clear();
@@ -697 +697 @@
 
     template <typename Graph, typename NodeRefMap, typename EdgeRefMap>
-    void build(const Graph& graph, NodeRefMap& nodeRef, 
+    void build(const Graph& graph, NodeRefMap& nodeRef,
                EdgeRefMap& edgeRef) {
       Parent::build(graph, nodeRef, edgeRef);
@@ -709 +709 @@
       Parent::firstOut(arc, node);
       while (arc != INVALID ) {
-        erase(arc);
-        Parent::firstOut(arc, node);
-      } 
+        erase(arc);
+        Parent::firstOut(arc, node);
+      }
 
       Parent::firstIn(arc, node);
       while (arc != INVALID ) {
-        erase(arc);
-        Parent::firstIn(arc, node);
+        erase(arc);
+        Parent::firstIn(arc, node);
       }
 
@@ -726 +726 @@
       std::vector<Arc> av;
       av.push_back(Parent::direct(edge, true));
-      av.push_back(Parent::direct(edge, false));      
+      av.push_back(Parent::direct(edge, false));
       notifier(Arc()).erase(av);
       notifier(Edge()).erase(edge);
@@ -733 +733 @@
 
     GraphExtender() {
-      node_notifier.setContainer(*this); 
+      node_notifier.setContainer(*this);
       arc_notifier.setContainer(*this);
       edge_notifier.setContainer(*this);
-    } 
+    }
 
     ~GraphExtender() {
       edge_notifier.clear();
       arc_notifier.clear();
-      node_notifier.clear(); 
-    } 
+      node_notifier.clear();
+    }
 
   };

lemon/bits/invalid.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -35 +35 @@
     bool operator< (Invalid) { return false; }
   };
-  
+
   /// \brief Invalid iterators.
   ///
@@ -53 +53 @@
 
 #endif
-  
+

lemon/bits/map_extender.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -33 +33 @@
 
   /// \ingroup graphbits
-  /// 
+  ///
   /// \brief Extender for maps
   template <typename _Map>
@@ -57 +57 @@
   public:
 
-    MapExtender(const Graph& graph) 
+    MapExtender(const Graph& graph)
       : Parent(graph) {}
 
-    MapExtender(const Graph& graph, const Value& value) 
+    MapExtender(const Graph& graph, const Value& value)
       : Parent(graph, value) {}
 
@@ -71 +71 @@
       Parent::operator=(cmap);
       return *this;
-    } 
+    }
 
     class MapIt : public Item {
     public:
-      
+
       typedef Item Parent;
       typedef typename Map::Value Value;
-      
+
       MapIt() {}
 
@@ -87 +87 @@
       }
 
-      MapIt(const Map& _map, const Item& item) 
-        : Parent(item), map(_map) {}
-
-      MapIt& operator++() { 
-        map.notifier()->next(*this);
-        return *this; 
-      }
-      
+      MapIt(const Map& _map, const Item& item)
+        : Parent(item), map(_map) {}
+
+      MapIt& operator++() {
+        map.notifier()->next(*this);
+        return *this;
+      }
+
       typename MapTraits<Map>::ConstReturnValue operator*() const {
-        return map[*this];
+        return map[*this];
       }
 
       typename MapTraits<Map>::ReturnValue operator*() {
-        return map[*this];
-      }
-      
+        return map[*this];
+      }
+
       void set(const Value& value) {
-        map.set(*this, value);
-      }
-      
+        map.set(*this, value);
+      }
+
     protected:
       Map& map;
-      
+
     };
 
@@ -118 +118 @@
 
       typedef typename Map::Value Value;
-      
+
       ConstMapIt() {}
 
@@ -127 +127 @@
       }
 
-      ConstMapIt(const Map& _map, const Item& item) 
-        : Parent(item), map(_map) {}
-
-      ConstMapIt& operator++() { 
-        map.notifier()->next(*this);
-        return *this; 
+      ConstMapIt(const Map& _map, const Item& item)
+        : Parent(item), map(_map) {}
+
+      ConstMapIt& operator++() {
+        map.notifier()->next(*this);
+        return *this;
       }
 
       typename MapTraits<Map>::ConstReturnValue operator*() const {
-        return map[*this];
+        return map[*this];
       }
 
@@ -145 +145 @@
     class ItemIt : public Item {
     public:
-      
-      typedef Item Parent;
-      
+
+      typedef Item Parent;
+
       ItemIt() {}
 
@@ -156 +156 @@
       }
 
-      ItemIt(const Map& _map, const Item& item) 
-        : Parent(item), map(_map) {}
-
-      ItemIt& operator++() { 
-        map.notifier()->next(*this);
-        return *this; 
+      ItemIt(const Map& _map, const Item& item)
+        : Parent(item), map(_map) {}
+
+      ItemIt& operator++() {
+        map.notifier()->next(*this);
+        return *this;
       }
 
     protected:
       const Map& map;
-      
+
     };
   };
 
   /// \ingroup graphbits
-  /// 
+  ///
   /// \brief Extender for maps which use a subset of the items.
   template <typename _Graph, typename _Map>
@@ -195 +195 @@
   public:
 
-    SubMapExtender(const Graph& _graph) 
+    SubMapExtender(const Graph& _graph)
       : Parent(_graph), graph(_graph) {}
 
-    SubMapExtender(const Graph& _graph, const Value& _value) 
+    SubMapExtender(const Graph& _graph, const Value& _value)
       : Parent(_graph, _value), graph(_graph) {}
 
@@ -213 +213 @@
       }
       return *this;
-    } 
+    }
 
     class MapIt : public Item {
     public:
-      
+
       typedef Item Parent;
       typedef typename Map::Value Value;
-      
+
       MapIt() {}
 
@@ -229 +229 @@
       }
 
-      MapIt(const Map& _map, const Item& item) 
-        : Parent(item), map(_map) {}
-
-      MapIt& operator++() { 
-        map.graph.next(*this);
-        return *this; 
-      }
-      
+      MapIt(const Map& _map, const Item& item)
+        : Parent(item), map(_map) {}
+
+      MapIt& operator++() {
+        map.graph.next(*this);
+        return *this;
+      }
+
       typename MapTraits<Map>::ConstReturnValue operator*() const {
-        return map[*this];
+        return map[*this];
       }
 
       typename MapTraits<Map>::ReturnValue operator*() {
-        return map[*this];
-      }
-      
+        return map[*this];
+      }
+
       void set(const Value& value) {
-        map.set(*this, value);
-      }
-      
+        map.set(*this, value);
+      }
+
     protected:
       Map& map;
-      
+
     };
 
@@ -260 +260 @@
 
       typedef typename Map::Value Value;
-      
+
       ConstMapIt() {}
 
@@ -269 +269 @@
       }
 
-      ConstMapIt(const Map& _map, const Item& item) 
-        : Parent(item), map(_map) {}
-
-      ConstMapIt& operator++() { 
-        map.graph.next(*this);
-        return *this; 
+      ConstMapIt(const Map& _map, const Item& item)
+        : Parent(item), map(_map) {}
+
+      ConstMapIt& operator++() {
+        map.graph.next(*this);
+        return *this;
       }
 
       typename MapTraits<Map>::ConstReturnValue operator*() const {
-        return map[*this];
+        return map[*this];
       }
 
@@ -287 +287 @@
     class ItemIt : public Item {
     public:
-      
-      typedef Item Parent;
-      
+
+      typedef Item Parent;
+
       ItemIt() {}
 
@@ -298 +298 @@
       }
 
-      ItemIt(const Map& _map, const Item& item) 
-        : Parent(item), map(_map) {}
-
-      ItemIt& operator++() { 
-        map.graph.next(*this);
-        return *this; 
+      ItemIt(const Map& _map, const Item& item)
+        : Parent(item), map(_map) {}
+
+      ItemIt& operator++() {
+        map.graph.next(*this);
+        return *this;
       }
 
     protected:
       const Map& map;
-      
-    };
-    
+
+    };
+
   private:
 
     const Graph& graph;
-    
+
   };
 

lemon/bits/path_dump.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -54 +54 @@
       RevArcIt() {}
       RevArcIt(Invalid) : path(0), current(INVALID) {}
-      RevArcIt(const PredMapPath& _path) 
+      RevArcIt(const PredMapPath& _path)
         : path(&_path), current(_path.target) {
         if (path->predMap[current] == INVALID) current = INVALID;
@@ -69 +69 @@
       }
 
-      bool operator==(const RevArcIt& e) const { 
-        return current == e.current; 
+      bool operator==(const RevArcIt& e) const {
+        return current == e.current;
       }
 
       bool operator!=(const RevArcIt& e) const {
-        return current != e.current; 
+        return current != e.current;
       }
 
-      bool operator<(const RevArcIt& e) const { 
-        return current < e.current; 
+      bool operator<(const RevArcIt& e) const {
+        return current < e.current;
       }
-      
+
     private:
       const PredMapPath* path;
@@ -102 +102 @@
     typedef _PredMatrixMap PredMatrixMap;
 
-    PredMatrixMapPath(const Digraph& _digraph, 
+    PredMatrixMapPath(const Digraph& _digraph,
                       const PredMatrixMap& _predMatrixMap,
-                      typename Digraph::Node _source, 
+                      typename Digraph::Node _source,
                       typename Digraph::Node _target)
-      : digraph(_digraph), predMatrixMap(_predMatrixMap), 
+      : digraph(_digraph), predMatrixMap(_predMatrixMap),
         source(_source), target(_target) {}
 
@@ -128 +128 @@
       RevArcIt() {}
       RevArcIt(Invalid) : path(0), current(INVALID) {}
-      RevArcIt(const PredMatrixMapPath& _path) 
+      RevArcIt(const PredMatrixMapPath& _path)
         : path(&_path), current(_path.target) {
-        if (path->predMatrixMap(path->source, current) == INVALID) 
+        if (path->predMatrixMap(path->source, current) == INVALID)
           current = INVALID;
       }
@@ -139 +139 @@
 
       RevArcIt& operator++() {
-        current = 
+        current =
           path->digraph.source(path->predMatrixMap(path->source, current));
-        if (path->predMatrixMap(path->source, current) == INVALID) 
+        if (path->predMatrixMap(path->source, current) == INVALID)
           current = INVALID;
         return *this;
       }
 
-      bool operator==(const RevArcIt& e) const { 
-        return current == e.current; 
+      bool operator==(const RevArcIt& e) const {
+        return current == e.current;
       }
 
       bool operator!=(const RevArcIt& e) const {
-        return current != e.current; 
+        return current != e.current;
       }
 
-      bool operator<(const RevArcIt& e) const { 
-        return current < e.current; 
+      bool operator<(const RevArcIt& e) const {
+        return current < e.current;
       }
-      
+
     private:
       const PredMatrixMapPath* path;

lemon/bits/traits.h

@@ -1 @@
-
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -30 +29 @@
   template <typename _Graph, typename _Item>
   class ItemSetTraits {};
-  
+
 
   template <typename Graph, typename Enable = void>
@@ -38 +37 @@
   template <typename Graph>
   struct NodeNotifierIndicator<
-    Graph, 
+    Graph,
     typename enable_if<typename Graph::NodeNotifier::Notifier, void>::type
-  > { 
+  > {
     typedef typename Graph::NodeNotifier Type;
   };
@@ -47 +46 @@
   class ItemSetTraits<_Graph, typename _Graph::Node> {
   public:
-    
+
     typedef _Graph Graph;
 
@@ -58 +57 @@
     class Map : public Graph::template NodeMap<_Value> {
     public:
-      typedef typename Graph::template NodeMap<_Value> Parent; 
-      typedef typename Graph::template NodeMap<_Value> Type; 
+      typedef typename Graph::template NodeMap<_Value> Parent;
+      typedef typename Graph::template NodeMap<_Value> Type;
       typedef typename Parent::Value Value;
 
       Map(const Graph& _digraph) : Parent(_digraph) {}
-      Map(const Graph& _digraph, const Value& _value) 
-        : Parent(_digraph, _value) {}
+      Map(const Graph& _digraph, const Value& _value)
+        : Parent(_digraph, _value) {}
 
      };
@@ -76 +75 @@
   template <typename Graph>
   struct ArcNotifierIndicator<
-    Graph, 
+    Graph,
     typename enable_if<typename Graph::ArcNotifier::Notifier, void>::type
-  > { 
+  > {
     typedef typename Graph::ArcNotifier Type;
   };
@@ -85 +84 @@
   class ItemSetTraits<_Graph, typename _Graph::Arc> {
   public:
-    
+
     typedef _Graph Graph;
 
@@ -96 +95 @@
     class Map : public Graph::template ArcMap<_Value> {
     public:
-      typedef typename Graph::template ArcMap<_Value> Parent; 
-      typedef typename Graph::template ArcMap<_Value> Type; 
+      typedef typename Graph::template ArcMap<_Value> Parent;
+      typedef typename Graph::template ArcMap<_Value> Type;
       typedef typename Parent::Value Value;
 
       Map(const Graph& _digraph) : Parent(_digraph) {}
-      Map(const Graph& _digraph, const Value& _value) 
-        : Parent(_digraph, _value) {}
+      Map(const Graph& _digraph, const Value& _value)
+        : Parent(_digraph, _value) {}
     };
 
@@ -113 +112 @@
   template <typename Graph>
   struct EdgeNotifierIndicator<
-    Graph, 
+    Graph,
     typename enable_if<typename Graph::EdgeNotifier::Notifier, void>::type
-  > { 
+  > {
     typedef typename Graph::EdgeNotifier Type;
   };
@@ -122 +121 @@
   class ItemSetTraits<_Graph, typename _Graph::Edge> {
   public:
-    
+
     typedef _Graph Graph;
 
@@ -133 +132 @@
     class Map : public Graph::template EdgeMap<_Value> {
     public:
-      typedef typename Graph::template EdgeMap<_Value> Parent; 
-      typedef typename Graph::template EdgeMap<_Value> Type; 
+      typedef typename Graph::template EdgeMap<_Value> Parent;
+      typedef typename Graph::template EdgeMap<_Value> Type;
       typedef typename Parent::Value Value;
 
       Map(const Graph& _digraph) : Parent(_digraph) {}
-      Map(const Graph& _digraph, const Value& _value) 
-        : Parent(_digraph, _value) {}
+      Map(const Graph& _digraph, const Value& _value)
+        : Parent(_digraph, _value) {}
     };
 
@@ -157 +156 @@
   template <typename Map>
   struct MapTraits<
-    Map, typename enable_if<typename Map::ReferenceMapTag, void>::type > 
+    Map, typename enable_if<typename Map::ReferenceMapTag, void>::type >
   {
     typedef True ReferenceMapTag;
-    
+
     typedef typename Map::Key Key;
     typedef typename Map::Value Value;
@@ -167 +166 @@
     typedef typename Map::Reference ReturnValue;
 
-    typedef typename Map::ConstReference ConstReference; 
+    typedef typename Map::ConstReference ConstReference;
     typedef typename Map::Reference Reference;
  };
@@ -185 +184 @@
   template <typename MatrixMap>
   struct MatrixMapTraits<
-    MatrixMap, typename enable_if<typename MatrixMap::ReferenceMapTag, 
-                                  void>::type > 
+    MatrixMap, typename enable_if<typename MatrixMap::ReferenceMapTag,
+                                  void>::type >
   {
     typedef True ReferenceMapTag;
-    
+
     typedef typename MatrixMap::FirstKey FirstKey;
     typedef typename MatrixMap::SecondKey SecondKey;
@@ -197 +196 @@
     typedef typename MatrixMap::Reference ReturnValue;
 
-    typedef typename MatrixMap::ConstReference ConstReference; 
+    typedef typename MatrixMap::ConstReference ConstReference;
     typedef typename MatrixMap::Reference Reference;
  };
@@ -210 +209 @@
   template <typename Graph>
   struct NodeNumTagIndicator<
-    Graph, 
+    Graph,
     typename enable_if<typename Graph::NodeNumTag, void>::type
   > {
@@ -223 +222 @@
   template <typename Graph>
   struct EdgeNumTagIndicator<
-    Graph, 
+    Graph,
     typename enable_if<typename Graph::EdgeNumTag, void>::type
   > {
@@ -236 +235 @@
   template <typename Graph>
   struct FindEdgeTagIndicator<
-    Graph, 
+    Graph,
     typename enable_if<typename Graph::FindEdgeTag, void>::type
   > {
@@ -249 +248 @@
   template <typename Graph>
   struct UndirectedTagIndicator<
-    Graph, 
+    Graph,
     typename enable_if<typename Graph::UndirectedTag, void>::type
   > {
@@ -262 +261 @@
   template <typename Graph>
   struct BuildTagIndicator<
-    Graph, 
+    Graph,
     typename enable_if<typename Graph::BuildTag, void>::type
   > {

lemon/bits/utility.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -84 +84 @@
 
   /**************** enable_if from BOOST ****************/
-  
+
   template <typename Type, typename T = void>
   struct exists {
@@ -90 +90 @@
   };
 
- 
+
   template <bool B, class T = void>
   struct enable_if_c {
@@ -99 +99 @@
   struct enable_if_c<false, T> {};
 
-  template <class Cond, class T = void> 
+  template <class Cond, class T = void>
   struct enable_if : public enable_if_c<Cond::value, T> {};
 
@@ -110 +110 @@
   struct lazy_enable_if_c<false, T> {};
 
-  template <class Cond, class T> 
+  template <class Cond, class T>
   struct lazy_enable_if : public lazy_enable_if_c<Cond::value, T> {};
 
@@ -122 +122 @@
   struct disable_if_c<true, T> {};
 
-  template <class Cond, class T = void> 
+  template <class Cond, class T = void>
   struct disable_if : public disable_if_c<Cond::value, T> {};
 
@@ -133 +133 @@
   struct lazy_disable_if_c<true, T> {};
 
-  template <class Cond, class T> 
+  template <class Cond, class T>
   struct lazy_disable_if : public lazy_disable_if_c<Cond::value, T> {};
 

lemon/bits/vector_map.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -50 +50 @@
   /// \todo Fix the doc: there is _Graph parameter instead of _Notifier.
   template <typename _Graph, typename _Item, typename _Value>
-  class VectorMap 
+  class VectorMap
     : public ItemSetTraits<_Graph, _Item>::ItemNotifier::ObserverBase {
   private:
-                
+
     /// The container type of the map.
-    typedef std::vector<_Value> Container;      
+    typedef std::vector<_Value> Container;
 
   public:
 
-    /// The graph type of the map. 
+    /// The graph type of the map.
     typedef _Graph Graph;
     /// The item type of the map.
@@ -94 +94 @@
     }
 
-    /// \brief Constructor uses given value to initialize the map. 
-    ///
-    /// It constructs a map uses a given value to initialize the map. 
+    /// \brief Constructor uses given value to initialize the map.
+    ///
+    /// It constructs a map uses a given value to initialize the map.
     /// It adds all the items of the graph to the map.
     VectorMap(const Graph& graph, const Value& value) {
@@ -108 +108 @@
     VectorMap(const VectorMap& _copy) : Parent() {
       if (_copy.attached()) {
-        Parent::attach(*_copy.notifier());
-        container = _copy.container;
+        Parent::attach(*_copy.notifier());
+        container = _copy.container;
       }
     }
@@ -116 +116 @@
     ///
     /// This operator assigns for each item in the map the
-    /// value mapped to the same item in the copied map.  
+    /// value mapped to the same item in the copied map.
     /// The parameter map should be indiced with the same
     /// itemset because this assign operator does not change
-    /// the container of the map. 
+    /// the container of the map.
     VectorMap& operator=(const VectorMap& cmap) {
       return operator=<VectorMap>(cmap);
@@ -130 +130 @@
     /// concecpt and could be indiced by the current item set of
     /// the NodeMap. In this case the value for each item
-    /// is assigned by the value of the given ReadMap. 
+    /// is assigned by the value of the given ReadMap.
     template <typename CMap>
     VectorMap& operator=(const CMap& cmap) {
@@ -141 +141 @@
       return *this;
     }
-    
+
   public:
 
@@ -147 +147 @@
     ///
     /// The subscript operator. The map can be subscripted by the
-    /// actual items of the graph.      
+    /// actual items of the graph.
     Reference operator[](const Key& key) {
       return container[Parent::notifier()->id(key)];
-    } 
-                
+    }
+
     /// \brief The const subcript operator.
     ///
     /// The const subscript operator. The map can be subscripted by the
-    /// actual items of the graph. 
+    /// actual items of the graph.
     ConstReference operator[](const Key& key) const {
       return container[Parent::notifier()->id(key)];
@@ -171 +171 @@
 
     /// \brief Adds a new key to the map.
-    ///         
+    ///
     /// It adds a new key to the map. It called by the observer notifier
-    /// and it overrides the add() member function of the observer base.     
+    /// and it overrides the add() member function of the observer base.
     virtual void add(const Key& key) {
       int id = Parent::notifier()->id(key);
       if (id >= int(container.size())) {
-        container.resize(id + 1);
+        container.resize(id + 1);
       }
     }
 
     /// \brief Adds more new keys to the map.
-    ///         
+    ///
     /// It adds more new keys to the map. It called by the observer notifier
-    /// and it overrides the add() member function of the observer base.     
+    /// and it overrides the add() member function of the observer base.
     virtual void add(const std::vector<Key>& keys) {
       int max = container.size() - 1;
@@ -199 +199 @@
     ///
     /// Erase a key from the map. It called by the observer notifier
-    /// and it overrides the erase() member function of the observer base.     
+    /// and it overrides the erase() member function of the observer base.
     virtual void erase(const Key& key) {
       container[Parent::notifier()->id(key)] = Value();
@@ -207 +207 @@
     ///
     /// Erase more keys from the map. It called by the observer notifier
-    /// and it overrides the erase() member function of the observer base.     
+    /// and it overrides the erase() member function of the observer base.
     virtual void erase(const std::vector<Key>& keys) {
       for (int i = 0; i < int(keys.size()); ++i) {
-        container[Parent::notifier()->id(keys[i])] = Value();
-      }
-    }
-    
+        container[Parent::notifier()->id(keys[i])] = Value();
+      }
+    }
+
     /// \brief Buildes the map.
-    /// 
+    ///
     /// It buildes the map. It called by the observer notifier
     /// and it overrides the build() member function of the observer base.
-    virtual void build() { 
+    virtual void build() {
       int size = Parent::notifier()->maxId() + 1;
       container.reserve(size);
@@ -227 +227 @@
     ///
     /// It erase all items from the map. It called by the observer notifier
-    /// and it overrides the clear() member function of the observer base.     
-    virtual void clear() { 
+    /// and it overrides the clear() member function of the observer base.
+    virtual void clear() {
       container.clear();
     }
-    
+
   private:
-                
+
     Container container;
 

lemon/color.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -25 +25 @@
 
   const Color WHITE(1,1,1);
-  
+
   const Color BLACK(0,0,0);
   const Color RED(1,0,0);
@@ -41 +41 @@
   const Color DARK_MAGENTA(.5,0,.5);
   const Color DARK_CYAN(0,.5,.5);
-    
+
 } //namespace lemon

lemon/color.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -63 +63 @@
 
   /// White color constant
-  extern const Color WHITE;  
+  extern const Color WHITE;
   /// Black color constant
   extern const Color BLACK;
@@ -131 +131 @@
         colors.push_back(Color(1,0,1));
         colors.push_back(Color(0,1,1));
-      
+
         colors.push_back(Color(.5,0,0));
         colors.push_back(Color(0,.5,0));
@@ -138 +138 @@
         colors.push_back(Color(.5,0,.5));
         colors.push_back(Color(0,.5,.5));
-      
+
         colors.push_back(Color(.5,.5,.5));
         colors.push_back(Color(1,.5,.5));
@@ -146 +146 @@
         colors.push_back(Color(1,.5,1));
         colors.push_back(Color(.5,1,1));
-      
+
         colors.push_back(Color(1,.5,0));
         colors.push_back(Color(.5,1,0));
@@ -172 +172 @@
     }
     ///Adds a new color to the end of the color list.
-    void add(const Color &c) 
+    void add(const Color &c)
     {
       colors.push_back(c);
@@ -187 +187 @@
   ///Returns a \ref Color which is as different from the given parameter
   ///as it is possible.
-  inline Color distantColor(const Color &c) 
+  inline Color distantColor(const Color &c)
   {
     return Color(c.red()<.5?1:0,c.green()<.5?1:0,c.blue()<.5?1:0);

lemon/concept_check.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -37 +37 @@
 ///\brief Basic utilities for concept checking.
 ///
-///\todo Are we still using BOOST concept checking utility? 
+///\todo Are we still using BOOST concept checking utility?
 ///Is the BOOST copyright notice necessary?
 

lemon/concepts/digraph.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -47 +47 @@
     private:
       ///Digraphs are \e not copy constructible. Use DigraphCopy() instead.
-      
+
       ///Digraphs are \e not copy constructible. Use DigraphCopy() instead.
       ///
@@ -53 +53 @@
       ///\brief Assignment of \ref Digraph "Digraph"s to another ones are
       ///\e not allowed. Use DigraphCopy() instead.
-      
+
       ///Assignment of \ref Digraph "Digraph"s to another ones are
       ///\e not allowed.  Use DigraphCopy() instead.
@@ -96 +96 @@
 
         /// Inequality operator
-        
+
         /// \sa operator==(Node n)
         ///
         bool operator!=(Node) const { return true; }
 
-        /// Artificial ordering operator.
-        
-        /// To allow the use of digraph descriptors as key type in std::map or
-        /// similar associative container we require this.
-        ///
-        /// \note This operator only have to define some strict ordering of
-        /// the items; this order has nothing to do with the iteration
-        /// ordering of the items.
-        bool operator<(Node) const { return false; }
-
-      };
-    
+        /// Artificial ordering operator.
+
+        /// To allow the use of digraph descriptors as key type in std::map or
+        /// similar associative container we require this.
+        ///
+        /// \note This operator only have to define some strict ordering of
+        /// the items; this order has nothing to do with the iteration
+        /// ordering of the items.
+        bool operator<(Node) const { return false; }
+
+      };
+
       /// This iterator goes through each node.
 
@@ -130 +130 @@
         NodeIt() { }
         /// Copy constructor.
-        
+
         /// Copy constructor.
         ///
@@ -146 +146 @@
         /// Node -> NodeIt conversion.
 
-        /// Sets the iterator to the node of \c the digraph pointed by 
-        /// the trivial iterator.
-        /// This feature necessitates that each time we 
+        /// Sets the iterator to the node of \c the digraph pointed by
+        /// the trivial iterator.
+        /// This feature necessitates that each time we
         /// iterate the arc-set, the iteration order is the same.
         NodeIt(const Digraph&, const Node&) { }
@@ -157 +157 @@
         NodeIt& operator++() { return *this; }
       };
-    
-    
+
+
       /// Class for identifying an arc of the digraph
 
@@ -192 +192 @@
         bool operator!=(Arc) const { return true; }
 
-        /// Artificial ordering operator.
-        
-        /// To allow the use of digraph descriptors as key type in std::map or
-        /// similar associative container we require this.
-        ///
-        /// \note This operator only have to define some strict ordering of
-        /// the items; this order has nothing to do with the iteration
-        /// ordering of the items.
-        bool operator<(Arc) const { return false; }
-      };
-    
+        /// Artificial ordering operator.
+
+        /// To allow the use of digraph descriptors as key type in std::map or
+        /// similar associative container we require this.
+        ///
+        /// \note This operator only have to define some strict ordering of
+        /// the items; this order has nothing to do with the iteration
+        /// ordering of the items.
+        bool operator<(Arc) const { return false; }
+      };
+
       /// This iterator goes trough the outgoing arcs of a node.
 
@@ -214 +214 @@
       /// for (Digraph::OutArcIt e(g, n); e!=INVALID; ++e) ++count;
       ///\endcode
-    
+
       class OutArcIt : public Arc {
       public:
@@ -233 +233 @@
         OutArcIt(Invalid) { }
         /// This constructor sets the iterator to the first outgoing arc.
-    
+
         /// This constructor sets the iterator to the first outgoing arc of
         /// the node.
@@ -240 +240 @@
 
         /// Sets the iterator to the value of the trivial iterator.
-        /// This feature necessitates that each time we 
+        /// This feature necessitates that each time we
         /// iterate the arc-set, the iteration order is the same.
         OutArcIt(const Digraph&, const Arc&) { }
         ///Next outgoing arc
-        
-        /// Assign the iterator to the next 
+
+        /// Assign the iterator to the next
         /// outgoing arc of the corresponding node.
         OutArcIt& operator++() { return *this; }
@@ -280 +280 @@
         InArcIt(Invalid) { }
         /// This constructor sets the iterator to first incoming arc.
-    
+
         /// This constructor set the iterator to the first incoming arc of
         /// the node.
@@ -287 +287 @@
 
         /// Sets the iterator to the value of the trivial iterator \c e.
-        /// This feature necessitates that each time we 
+        /// This feature necessitates that each time we
         /// iterate the arc-set, the iteration order is the same.
         InArcIt(const Digraph&, const Arc&) { }
@@ -323 +323 @@
         ArcIt(Invalid) { }
         /// This constructor sets the iterator to the first arc.
-    
+
         /// This constructor sets the iterator to the first arc of \c g.
         ///@param g the digraph
@@ -330 +330 @@
 
         /// Sets the iterator to the value of the trivial iterator \c e.
-        /// This feature necessitates that each time we 
+        /// This feature necessitates that each time we
         /// iterate the arc-set, the iteration order is the same.
-        ArcIt(const Digraph&, const Arc&) { } 
+        ArcIt(const Digraph&, const Arc&) { }
         ///Next arc
-        
+
         /// Assign the iterator to the next arc.
         ArcIt& operator++() { return *this; }
@@ -350 +350 @@
 
       /// \brief Returns the ID of the node.
-      int id(Node) const { return -1; } 
+      int id(Node) const { return -1; }
 
       /// \brief Returns the ID of the arc.
-      int id(Arc) const { return -1; } 
+      int id(Arc) const { return -1; }
 
       /// \brief Returns the node with the given ID.
       ///
       /// \pre The argument should be a valid node ID in the graph.
-      Node nodeFromId(int) const { return INVALID; } 
+      Node nodeFromId(int) const { return INVALID; }
 
       /// \brief Returns the arc with the given ID.
       ///
       /// \pre The argument should be a valid arc ID in the graph.
-      Arc arcFromId(int) const { return INVALID; } 
+      Arc arcFromId(int) const { return INVALID; }
 
       /// \brief Returns an upper bound on the node IDs.
-      int maxNodeId() const { return -1; } 
+      int maxNodeId() const { return -1; }
 
       /// \brief Returns an upper bound on the arc IDs.
-      int maxArcId() const { return -1; } 
+      int maxArcId() const { return -1; }
 
       void first(Node&) const {}
@@ -390 +390 @@
 
       // Dummy parameter.
-      int maxId(Node) const { return -1; } 
+      int maxId(Node) const { return -1; }
       // Dummy parameter.
-      int maxId(Arc) const { return -1; } 
+      int maxId(Arc) const { return -1; }
 
       /// \brief The base node of the iterator.
@@ -424 +424 @@
 
       /// \brief Read write map of the nodes to type \c T.
-      /// 
+      ///
       /// ReadWrite map of the nodes to type \c T.
       /// \sa Reference
-      template<class T> 
+      template<class T>
       class NodeMap : public ReadWriteMap< Node, T > {
       public:
@@ -440 +440 @@
         ///Assignment operator
         template <typename CMap>
-        NodeMap& operator=(const CMap&) { 
+        NodeMap& operator=(const CMap&) {
           checkConcept<ReadMap<Node, T>, CMap>();
-          return *this; 
+          return *this;
         }
       };
@@ -450 +450 @@
       /// Reference map of the arcs to type \c T.
       /// \sa Reference
-      template<class T> 
+      template<class T>
       class ArcMap : public ReadWriteMap<Arc,T> {
       public:
@@ -462 +462 @@
         ///Assignment operator
         template <typename CMap>
-        ArcMap& operator=(const CMap&) { 
+        ArcMap& operator=(const CMap&) {
           checkConcept<ReadMap<Arc, T>, CMap>();
-          return *this; 
+          return *this;
         }
       };
@@ -472 +472 @@
         void constraints() {
           checkConcept<IterableDigraphComponent<>, _Digraph>();
-          checkConcept<IDableDigraphComponent<>, _Digraph>();
+          checkConcept<IDableDigraphComponent<>, _Digraph>();
           checkConcept<MappableDigraphComponent<>, _Digraph>();
         }
@@ -478 +478 @@
 
     };
-    
-  } //namespace concepts  
+
+  } //namespace concepts
 } //namespace lemon
 

lemon/concepts/graph.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -66 +66 @@
     /// direction. The IncEdgeIt iterates also on the same edges
     /// as the OutArcIt and InArcIt but it is not convertible to Arc just
-    /// to Edge.  
+    /// to Edge.
     class Graph {
     public:
@@ -73 +73 @@
       ///
       /// The undirected graph should be tagged by the UndirectedTag. This
-      /// tag helps the enable_if technics to make compile time 
-      /// specializations for undirected graphs.  
+      /// tag helps the enable_if technics to make compile time
+      /// specializations for undirected graphs.
       typedef True UndirectedTag;
 
-      /// \brief The base type of node iterators, 
+      /// \brief The base type of node iterators,
       /// or in other words, the trivial node iterator.
       ///
       /// This is the base type of each node iterator,
       /// thus each kind of node iterator converts to this.
-      /// More precisely each kind of node iterator should be inherited 
+      /// More precisely each kind of node iterator should be inherited
       /// from the trivial node iterator.
       class Node {
@@ -109 +109 @@
 
         /// Inequality operator
-        
+
         /// \sa operator==(Node n)
         ///
         bool operator!=(Node) const { return true; }
 
-        /// Artificial ordering operator.
-        
-        /// To allow the use of graph descriptors as key type in std::map or
-        /// similar associative container we require this.
-        ///
-        /// \note This operator only have to define some strict ordering of
-        /// the items; this order has nothing to do with the iteration
-        /// ordering of the items.
-        bool operator<(Node) const { return false; }
-
-      };
-    
+        /// Artificial ordering operator.
+
+        /// To allow the use of graph descriptors as key type in std::map or
+        /// similar associative container we require this.
+        ///
+        /// \note This operator only have to define some strict ordering of
+        /// the items; this order has nothing to do with the iteration
+        /// ordering of the items.
+        bool operator<(Node) const { return false; }
+
+      };
+
       /// This iterator goes through each node.
 
@@ -143 +143 @@
         NodeIt() { }
         /// Copy constructor.
-        
+
         /// Copy constructor.
         ///
@@ -159 +159 @@
         /// Node -> NodeIt conversion.
 
-        /// Sets the iterator to the node of \c the graph pointed by 
-        /// the trivial iterator.
-        /// This feature necessitates that each time we 
+        /// Sets the iterator to the node of \c the graph pointed by
+        /// the trivial iterator.
+        /// This feature necessitates that each time we
         /// iterate the arc-set, the iteration order is the same.
         NodeIt(const Graph&, const Node&) { }
@@ -170 +170 @@
         NodeIt& operator++() { return *this; }
       };
-    
-    
+
+
       /// The base type of the edge iterators.
 
@@ -204 +204 @@
         bool operator!=(Edge) const { return true; }
 
-        /// Artificial ordering operator.
-        
-        /// To allow the use of graph descriptors as key type in std::map or
-        /// similar associative container we require this.
-        ///
-        /// \note This operator only have to define some strict ordering of
-        /// the items; this order has nothing to do with the iteration
-        /// ordering of the items.
-        bool operator<(Edge) const { return false; }
+        /// Artificial ordering operator.
+
+        /// To allow the use of graph descriptors as key type in std::map or
+        /// similar associative container we require this.
+        ///
+        /// \note This operator only have to define some strict ordering of
+        /// the items; this order has nothing to do with the iteration
+        /// ordering of the items.
+        bool operator<(Edge) const { return false; }
       };
 
@@ -242 +242 @@
         EdgeIt(Invalid) { }
         /// This constructor sets the iterator to the first edge.
-    
+
         /// This constructor sets the iterator to the first edge.
         EdgeIt(const Graph&) { }
@@ -249 +249 @@
         /// Sets the iterator to the value of the trivial iterator.
         /// This feature necessitates that each time we
-        /// iterate the edge-set, the iteration order is the 
-        /// same.
-        EdgeIt(const Graph&, const Edge&) { } 
+        /// iterate the edge-set, the iteration order is the
+        /// same.
+        EdgeIt(const Graph&, const Edge&) { }
         /// Next edge
-        
+
         /// Assign the iterator to the next edge.
         EdgeIt& operator++() { return *this; }
       };
 
-      /// \brief This iterator goes trough the incident undirected 
+      /// \brief This iterator goes trough the incident undirected
       /// arcs of a node.
       ///
       /// This iterator goes trough the incident edges
-      /// of a certain node of a graph. You should assume that the 
+      /// of a certain node of a graph. You should assume that the
       /// loop arcs will be iterated twice.
-      /// 
+      ///
       /// Its usage is quite simple, for example you can compute the
       /// degree (i.e. count the number of incident arcs of a node \c n
-      /// in graph \c g of type \c Graph as follows. 
+      /// in graph \c g of type \c Graph as follows.
       ///
       ///\code
@@ -291 +291 @@
         IncEdgeIt(Invalid) { }
         /// This constructor sets the iterator to first incident arc.
-    
+
         /// This constructor set the iterator to the first incident arc of
         /// the node.
@@ -298 +298 @@
 
         /// Sets the iterator to the value of the trivial iterator \c e.
-        /// This feature necessitates that each time we 
+        /// This feature necessitates that each time we
         /// iterate the arc-set, the iteration order is the same.
         IncEdgeIt(const Graph&, const Edge&) { }
@@ -304 +304 @@
 
         /// Assign the iterator to the next incident arc
-        /// of the corresponding node.
+        /// of the corresponding node.
         IncEdgeIt& operator++() { return *this; }
       };
@@ -341 +341 @@
         bool operator!=(Arc) const { return true; }
 
-        /// Artificial ordering operator.
-        
-        /// To allow the use of graph descriptors as key type in std::map or
-        /// similar associative container we require this.
-        ///
-        /// \note This operator only have to define some strict ordering of
-        /// the items; this order has nothing to do with the iteration
-        /// ordering of the items.
-        bool operator<(Arc) const { return false; }
-        
-      }; 
+        /// Artificial ordering operator.
+
+        /// To allow the use of graph descriptors as key type in std::map or
+        /// similar associative container we require this.
+        ///
+        /// \note This operator only have to define some strict ordering of
+        /// the items; this order has nothing to do with the iteration
+        /// ordering of the items.
+        bool operator<(Arc) const { return false; }
+
+      };
       /// This iterator goes through each directed arc.
 
@@ -379 +379 @@
         ArcIt(Invalid) { }
         /// This constructor sets the iterator to the first arc.
-    
+
         /// This constructor sets the iterator to the first arc of \c g.
         ///@param g the graph
@@ -386 +386 @@
 
         /// Sets the iterator to the value of the trivial iterator \c e.
-        /// This feature necessitates that each time we 
+        /// This feature necessitates that each time we
         /// iterate the arc-set, the iteration order is the same.
-        ArcIt(const Graph&, const Arc&) { } 
+        ArcIt(const Graph&, const Arc&) { }
         ///Next arc
-        
+
         /// Assign the iterator to the next arc.
         ArcIt& operator++() { return *this; }
       };
-   
+
       /// This iterator goes trough the outgoing directed arcs of a node.
 
@@ -406 +406 @@
       /// for (Graph::OutArcIt e(g, n); e!=INVALID; ++e) ++count;
       ///\endcode
-    
+
       class OutArcIt : public Arc {
       public:
@@ -425 +425 @@
         OutArcIt(Invalid) { }
         /// This constructor sets the iterator to the first outgoing arc.
-    
+
         /// This constructor sets the iterator to the first outgoing arc of
         /// the node.
@@ -431 +431 @@
         ///@param g the graph
         OutArcIt(const Graph& n, const Node& g) {
-          ignore_unused_variable_warning(n);
-          ignore_unused_variable_warning(g);
-        }
+          ignore_unused_variable_warning(n);
+          ignore_unused_variable_warning(g);
+        }
         /// Arc -> OutArcIt conversion
 
         /// Sets the iterator to the value of the trivial iterator.
-        /// This feature necessitates that each time we 
+        /// This feature necessitates that each time we
         /// iterate the arc-set, the iteration order is the same.
         OutArcIt(const Graph&, const Arc&) { }
         ///Next outgoing arc
-        
-        /// Assign the iterator to the next 
+
+        /// Assign the iterator to the next
         /// outgoing arc of the corresponding node.
         OutArcIt& operator++() { return *this; }
@@ -477 +477 @@
         InArcIt(Invalid) { }
         /// This constructor sets the iterator to first incoming arc.
-    
+
         /// This constructor set the iterator to the first incoming arc of
         /// the node.
         ///@param n the node
         ///@param g the graph
-        InArcIt(const Graph& g, const Node& n) { 
-          ignore_unused_variable_warning(n);
-          ignore_unused_variable_warning(g);
-        }
+        InArcIt(const Graph& g, const Node& n) {
+          ignore_unused_variable_warning(n);
+          ignore_unused_variable_warning(g);
+        }
         /// Arc -> InArcIt conversion
 
         /// Sets the iterator to the value of the trivial iterator \c e.
-        /// This feature necessitates that each time we 
+        /// This feature necessitates that each time we
         /// iterate the arc-set, the iteration order is the same.
         InArcIt(const Graph&, const Arc&) { }
@@ -500 +500 @@
 
       /// \brief Read write map of the nodes to type \c T.
-      /// 
+      ///
       /// ReadWrite map of the nodes to type \c T.
       /// \sa Reference
-      template<class T> 
+      template<class T>
       class NodeMap : public ReadWriteMap< Node, T >
       {
@@ -517 +517 @@
         ///Assignment operator
         template <typename CMap>
-        NodeMap& operator=(const CMap&) { 
+        NodeMap& operator=(const CMap&) {
           checkConcept<ReadMap<Node, T>, CMap>();
-          return *this; 
+          return *this;
         }
       };
@@ -527 +527 @@
       /// Reference map of the directed arcs to type \c T.
       /// \sa Reference
-      template<class T> 
+      template<class T>
       class ArcMap : public ReadWriteMap<Arc,T>
       {
@@ -540 +540 @@
         ///Assignment operator
         template <typename CMap>
-        ArcMap& operator=(const CMap&) { 
+        ArcMap& operator=(const CMap&) {
           checkConcept<ReadMap<Arc, T>, CMap>();
-          return *this; 
+          return *this;
         }
       };
@@ -550 +550 @@
       /// Reference map of the arcs to type \c T.
       /// \sa Reference
-      template<class T> 
+      template<class T>
       class EdgeMap : public ReadWriteMap<Edge,T>
       {
@@ -563 +563 @@
         ///Assignment operator
         template <typename CMap>
-        EdgeMap& operator=(const CMap&) { 
+        EdgeMap& operator=(const CMap&) {
           checkConcept<ReadMap<Edge, T>, CMap>();
-          return *this; 
+          return *this;
         }
       };
@@ -574 +574 @@
       /// will be the given node.
       Arc direct(const Edge&, const Node&) const {
-        return INVALID;
+        return INVALID;
       }
 
@@ -584 +584 @@
       /// the directed arc is the same when the given bool is true.
       Arc direct(const Edge&, bool) const {
-        return INVALID;
+        return INVALID;
       }
 
@@ -626 +626 @@
 
       /// \brief Returns the id of the node.
-      int id(Node) const { return -1; } 
+      int id(Node) const { return -1; }
 
       /// \brief Returns the id of the edge.
-      int id(Edge) const { return -1; } 
+      int id(Edge) const { return -1; }
 
       /// \brief Returns the id of the arc.
-      int id(Arc) const { return -1; } 
+      int id(Arc) const { return -1; }
 
       /// \brief Returns the node with the given id.
       ///
       /// \pre The argument should be a valid node id in the graph.
-      Node nodeFromId(int) const { return INVALID; } 
+      Node nodeFromId(int) const { return INVALID; }
 
       /// \brief Returns the edge with the given id.
       ///
       /// \pre The argument should be a valid edge id in the graph.
-      Edge edgeFromId(int) const { return INVALID; } 
+      Edge edgeFromId(int) const { return INVALID; }
 
       /// \brief Returns the arc with the given id.
       ///
       /// \pre The argument should be a valid arc id in the graph.
-      Arc arcFromId(int) const { return INVALID; } 
+      Arc arcFromId(int) const { return INVALID; }
 
       /// \brief Returns an upper bound on the node IDs.
-      int maxNodeId() const { return -1; } 
+      int maxNodeId() const { return -1; }
 
       /// \brief Returns an upper bound on the edge IDs.
-      int maxEdgeId() const { return -1; } 
+      int maxEdgeId() const { return -1; }
 
       /// \brief Returns an upper bound on the arc IDs.
-      int maxArcId() const { return -1; } 
+      int maxArcId() const { return -1; }
 
       void first(Node&) const {}
@@ -684 +684 @@
 
       // Dummy parameter.
-      int maxId(Node) const { return -1; } 
+      int maxId(Node) const { return -1; }
       // Dummy parameter.
-      int maxId(Edge) const { return -1; } 
+      int maxId(Edge) const { return -1; }
       // Dummy parameter.
-      int maxId(Arc) const { return -1; } 
+      int maxId(Arc) const { return -1; }
 
       /// \brief Base node of the iterator
@@ -694 +694 @@
       /// Returns the base node (the source in this case) of the iterator
       Node baseNode(OutArcIt e) const {
-        return source(e);
+        return source(e);
       }
       /// \brief Running node of the iterator
@@ -701 +701 @@
       /// iterator
       Node runningNode(OutArcIt e) const {
-        return target(e);
+        return target(e);
       }
 
@@ -708 +708 @@
       /// Returns the base node (the target in this case) of the iterator
       Node baseNode(InArcIt e) const {
-        return target(e);
+        return target(e);
       }
       /// \brief Running node of the iterator
@@ -715 +715 @@
       /// iterator
       Node runningNode(InArcIt e) const {
-        return source(e);
+        return source(e);
       }
 
@@ -722 +722 @@
       /// Returns the base node of the iterator
       Node baseNode(IncEdgeIt) const {
-        return INVALID;
+        return INVALID;
       }
-      
+
       /// \brief Running node of the iterator
       ///
       /// Returns the running node of the iterator
       Node runningNode(IncEdgeIt) const {
-        return INVALID;
+        return INVALID;
       }
 
       template <typename _Graph>
       struct Constraints {
-        void constraints() {
-          checkConcept<IterableGraphComponent<>, _Graph>();
-          checkConcept<IDableGraphComponent<>, _Graph>();
-          checkConcept<MappableGraphComponent<>, _Graph>();
-        }
+        void constraints() {
+          checkConcept<IterableGraphComponent<>, _Graph>();
+          checkConcept<IDableGraphComponent<>, _Graph>();
+          checkConcept<MappableGraphComponent<>, _Graph>();
+        }
       };
 

lemon/concepts/graph_components.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -50 +50 @@
     public:
       /// \brief Default constructor.
-      ///      
+      ///
       /// \warning The default constructor is not required to set
       /// the item to some well-defined value. So you should consider it
@@ -67 +67 @@
       /// \brief Assign operator for nodes.
       ///
-      /// The nodes are assignable. 
+      /// The nodes are assignable.
       ///
       GraphItem& operator=(GraphItem const&) { return *this; }
@@ -93 +93 @@
       template<typename _GraphItem>
       struct Constraints {
-        void constraints() {
-          _GraphItem i1;
-          _GraphItem i2 = i1;
-          _GraphItem i3 = INVALID;
-          
-          i1 = i2 = i3;
-
-          bool b;
-          //      b = (ia == ib) && (ia != ib) && (ia < ib);
-          b = (ia == ib) && (ia != ib);
-          b = (ia == INVALID) && (ib != INVALID);
+        void constraints() {
+          _GraphItem i1;
+          _GraphItem i2 = i1;
+          _GraphItem i3 = INVALID;
+
+          i1 = i2 = i3;
+
+          bool b;
+          //          b = (ia == ib) && (ia != ib) && (ia < ib);
+          b = (ia == ib) && (ia != ib);
+          b = (ia == INVALID) && (ib != INVALID);
           b = (ia < ib);
-        }
-
-        const _GraphItem &ia;
-        const _GraphItem &ib;
+        }
+
+        const _GraphItem &ia;
+        const _GraphItem &ib;
       };
     };
 
     /// \brief An empty base directed graph class.
-    ///  
+    ///
     /// This class provides the minimal set of features needed for a
     /// directed graph structure. All digraph concepts have to be
@@ -123 +123 @@
 
       typedef BaseDigraphComponent Digraph;
-      
+
       /// \brief Node class of the digraph.
       ///
-      /// This class represents the Nodes of the digraph. 
+      /// This class represents the Nodes of the digraph.
       ///
       typedef GraphItem<'n'> Node;
@@ -132 +132 @@
       /// \brief Arc class of the digraph.
       ///
-      /// This class represents the Arcs of the digraph. 
+      /// This class represents the Arcs of the digraph.
       ///
       typedef GraphItem<'e'> Arc;
@@ -157 +157 @@
       template <typename _Digraph>
       struct Constraints {
-        typedef typename _Digraph::Node Node;
-        typedef typename _Digraph::Arc Arc;
-      
-        void constraints() {
-          checkConcept<GraphItem<'n'>, Node>();
-          checkConcept<GraphItem<'a'>, Arc>();
-          {
-            Node n;
-            Arc e(INVALID);
-            n = digraph.source(e);
-            n = digraph.target(e);
+        typedef typename _Digraph::Node Node;
+        typedef typename _Digraph::Arc Arc;
+
+        void constraints() {
+          checkConcept<GraphItem<'n'>, Node>();
+          checkConcept<GraphItem<'a'>, Arc>();
+          {
+            Node n;
+            Arc e(INVALID);
+            n = digraph.source(e);
+            n = digraph.target(e);
             n = digraph.oppositeNode(n, e);
-          }      
-        }
-      
-        const _Digraph& digraph;
+          }
+        }
+
+        const _Digraph& digraph;
       };
     };
 
     /// \brief An empty base undirected graph class.
-    ///  
+    ///
     /// This class provides the minimal set of features needed for an
     /// undirected graph structure. All undirected graph concepts have
@@ -200 +200 @@
         typedef GraphItem<'u'> Parent;
         /// \brief Default constructor.
-        ///      
+        ///
         /// \warning The default constructor is not required to set
         /// the item to some well-defined value. So you should consider it
@@ -218 +218 @@
         ///
         /// Besides the core graph item functionality each arc should
-        /// be convertible to the represented edge. 
+        /// be convertible to the represented edge.
         Edge(const Arc&) {}
         /// \brief Assign arc to edge.
         ///
         /// Besides the core graph item functionality each arc should
-        /// be convertible to the represented edge. 
+        /// be convertible to the represented edge.
         Edge& operator=(const Arc&) { return *this; }
       };
@@ -238 +238 @@
       /// Returns the directed arc from its direction and the
       /// represented edge.
-      Arc direct(const Edge&, bool) const { return INVALID;} 
+      Arc direct(const Edge&, bool) const { return INVALID;}
 
       /// \brief Returns the directed arc.
@@ -244 +244 @@
       /// Returns the directed arc from its source and the
       /// represented edge.
-      Arc direct(const Edge&, const Node&) const { return INVALID;} 
+      Arc direct(const Edge&, const Node&) const { return INVALID;}
 
       /// \brief Returns the opposite arc.
@@ -261 +261 @@
       /// Gives back the other ending of an edge.
       Node v(const Edge&) const { return INVALID;}
-      
+
       template <typename _Graph>
       struct Constraints {
-        typedef typename _Graph::Node Node;
-        typedef typename _Graph::Arc Arc;
-        typedef typename _Graph::Edge Edge;
-      
-        void constraints() {
+        typedef typename _Graph::Node Node;
+        typedef typename _Graph::Arc Arc;
+        typedef typename _Graph::Edge Edge;
+
+        void constraints() {
           checkConcept<BaseDigraphComponent, _Graph>();
-          checkConcept<GraphItem<'u'>, Edge>();
-          {
-            Node n;
-            Edge ue(INVALID);
+          checkConcept<GraphItem<'u'>, Edge>();
+          {
+            Node n;
+            Edge ue(INVALID);
             Arc e;
-            n = graph.u(ue);
-            n = graph.v(ue);
+            n = graph.u(ue);
+            n = graph.v(ue);
             e = graph.direct(ue, true);
             e = graph.direct(ue, n);
@@ -283 +283 @@
             bool d = graph.direction(e);
             ignore_unused_variable_warning(d);
-          }      
-        }
-      
-        const _Graph& graph;
+          }
+        }
+
+        const _Graph& graph;
       };
 
@@ -292 +292 @@
 
     /// \brief An empty idable base digraph class.
-    ///  
+    ///
     /// This class provides beside the core digraph features
     /// core id functions for the digraph structure.
@@ -305 +305 @@
       typedef typename Base::Arc Arc;
 
-      /// \brief Gives back an unique integer id for the Node. 
-      ///
-      /// Gives back an unique integer id for the Node. 
+      /// \brief Gives back an unique integer id for the Node.
+      ///
+      /// Gives back an unique integer id for the Node.
       ///
       int id(const Node&) const { return -1;}
@@ -315 +315 @@
       /// Gives back the node by the unique id.
       /// If the digraph does not contain node with the given id
-      /// then the result of the function is undetermined. 
+      /// then the result of the function is undetermined.
       Node nodeFromId(int) const { return INVALID;}
 
-      /// \brief Gives back an unique integer id for the Arc. 
-      ///
-      /// Gives back an unique integer id for the Arc. 
+      /// \brief Gives back an unique integer id for the Arc.
+      ///
+      /// Gives back an unique integer id for the Arc.
       ///
       int id(const Arc&) const { return -1;}
@@ -328 +328 @@
       /// Gives back the arc by the unique id.
       /// If the digraph does not contain arc with the given id
-      /// then the result of the function is undetermined. 
+      /// then the result of the function is undetermined.
       Arc arcFromId(int) const { return INVALID;}
 
@@ -348 +348 @@
       struct Constraints {
 
-        void constraints() {
-          checkConcept<Base, _Digraph >();
-          typename _Digraph::Node node;
-          int nid = digraph.id(node);
-          nid = digraph.id(node);
-          node = digraph.nodeFromId(nid);
-          typename _Digraph::Arc arc;
-          int eid = digraph.id(arc);
-          eid = digraph.id(arc);
-          arc = digraph.arcFromId(eid);
-
-          nid = digraph.maxNodeId();
-          ignore_unused_variable_warning(nid);
-          eid = digraph.maxArcId();
-          ignore_unused_variable_warning(eid);
-        }
-
-        const _Digraph& digraph;
+        void constraints() {
+          checkConcept<Base, _Digraph >();
+          typename _Digraph::Node node;
+          int nid = digraph.id(node);
+          nid = digraph.id(node);
+          node = digraph.nodeFromId(nid);
+          typename _Digraph::Arc arc;
+          int eid = digraph.id(arc);
+          eid = digraph.id(arc);
+          arc = digraph.arcFromId(eid);
+
+          nid = digraph.maxNodeId();
+          ignore_unused_variable_warning(nid);
+          eid = digraph.maxArcId();
+          ignore_unused_variable_warning(eid);
+        }
+
+        const _Digraph& digraph;
       };
     };
 
     /// \brief An empty idable base undirected graph class.
-    ///  
+    ///
     /// This class provides beside the core undirected graph features
     /// core id functions for the undirected graph structure.  The
@@ -384 +384 @@
       using IDableDigraphComponent<_Base>::id;
 
-      /// \brief Gives back an unique integer id for the Edge. 
-      ///
-      /// Gives back an unique integer id for the Edge. 
+      /// \brief Gives back an unique integer id for the Edge.
+      ///
+      /// Gives back an unique integer id for the Edge.
       ///
       int id(const Edge&) const { return -1;}
@@ -407 +407 @@
       struct Constraints {
 
-        void constraints() {
-          checkConcept<Base, _Graph >();
-          checkConcept<IDableDigraphComponent<Base>, _Graph >();
-          typename _Graph::Edge edge;
-          int ueid = graph.id(edge);
-          ueid = graph.id(edge);
-          edge = graph.edgeFromId(ueid);
-          ueid = graph.maxEdgeId();
-          ignore_unused_variable_warning(ueid);
-        }
-
-        const _Graph& graph;
+        void constraints() {
+          checkConcept<Base, _Graph >();
+          checkConcept<IDableDigraphComponent<Base>, _Graph >();
+          typename _Graph::Edge edge;
+          int ueid = graph.id(edge);
+          ueid = graph.id(edge);
+          edge = graph.edgeFromId(ueid);
+          ueid = graph.maxEdgeId();
+          ignore_unused_variable_warning(ueid);
+        }
+
+        const _Graph& graph;
       };
     };
@@ -451 +451 @@
       /// \brief Assign operator for items.
       ///
-      /// The items are assignable. 
-      ///
-      GraphItemIt& operator=(const GraphItemIt&) { return *this; }      
+      /// The items are assignable.
+      ///
+      GraphItemIt& operator=(const GraphItemIt&) { return *this; }
       /// \brief Next item.
-      /// 
+      ///
       /// Assign the iterator to the next item.
       ///
       GraphItemIt& operator++() { return *this; }
       /// \brief Equality operator
-      /// 
+      ///
       /// Two iterators are equal if and only if they point to the
       /// same object or both are invalid.
       bool operator==(const GraphItemIt&) const { return true;}
       /// \brief Inequality operator
-      ///       
+      ///
       /// \sa operator==(Node n)
       ///
       bool operator!=(const GraphItemIt&) const { return true;}
-      
+
       template<typename _GraphItemIt>
       struct Constraints {
-        void constraints() {
-          _GraphItemIt it1(g);  
-          _GraphItemIt it2;
-
-          it2 = ++it1;
-          ++it2 = it1;
-          ++(++it1);
-
-          _Item bi = it1;
-          bi = it2;
-        }
-        _Graph& g;
+        void constraints() {
+          _GraphItemIt it1(g);
+          _GraphItemIt it2;
+
+          it2 = ++it1;
+          ++it2 = it1;
+          ++(++it1);
+
+          _Item bi = it1;
+          bi = it2;
+        }
+        _Graph& g;
       };
     };
@@ -490 +490 @@
     ///
     /// \note Because InArcIt and OutArcIt may not inherit from the same
-    /// base class, the _selector is a additional template parameter. For 
-    /// InArcIt you should instantiate it with character 'i' and for 
+    /// base class, the _selector is a additional template parameter. For
+    /// InArcIt you should instantiate it with character 'i' and for
     /// OutArcIt with 'o'.
     template <typename _Graph,
-              typename _Item = typename _Graph::Arc,
-              typename _Base = typename _Graph::Node, 
-              char _selector = '0'>
+              typename _Item = typename _Graph::Arc,
+              typename _Base = typename _Graph::Node,
+              char _selector = '0'>
     class GraphIncIt : public _Item {
     public:
@@ -509 +509 @@
       ///
       GraphIncIt(GraphIncIt const& gi) : _Item(gi) {}
-      /// \brief Sets the iterator to the first arc incoming into or outgoing 
+      /// \brief Sets the iterator to the first arc incoming into or outgoing
       /// from the node.
       ///
-      /// Sets the iterator to the first arc incoming into or outgoing 
+      /// Sets the iterator to the first arc incoming into or outgoing
       /// from the node.
       ///
@@ -523 +523 @@
       /// \brief Assign operator for iterators.
       ///
-      /// The iterators are assignable. 
-      ///
-      GraphIncIt& operator=(GraphIncIt const&) { return *this; }      
+      /// The iterators are assignable.
+      ///
+      GraphIncIt& operator=(GraphIncIt const&) { return *this; }
       /// \brief Next item.
       ///
@@ -546 +546 @@
       template <typename _GraphIncIt>
       struct Constraints {
-        void constraints() {
-          checkConcept<GraphItem<_selector>, _GraphIncIt>();
-          _GraphIncIt it1(graph, node);
-          _GraphIncIt it2;
-
-          it2 = ++it1;
-          ++it2 = it1;
-          ++(++it1);
-          _Item e = it1;
-          e = it2;
-
-        }
-
-        _Item arc;
-        _Base node;
-        _Graph graph;
-        _GraphIncIt it;
+        void constraints() {
+          checkConcept<GraphItem<_selector>, _GraphIncIt>();
+          _GraphIncIt it1(graph, node);
+          _GraphIncIt it2;
+
+          it2 = ++it1;
+          ++it2 = it1;
+          ++(++it1);
+          _Item e = it1;
+          e = it2;
+
+        }
+
+        _Item arc;
+        _Base node;
+        _Graph graph;
+        _GraphIncIt it;
       };
     };
@@ -576 +576 @@
 
     public:
-    
+
       typedef _Base Base;
       typedef typename Base::Node Node;
@@ -584 +584 @@
 
       /// \name Base iteration
-      /// 
+      ///
       /// This interface provides functions for iteration on digraph items
       ///
-      /// @{  
+      /// @{
 
       /// \brief Gives back the first node in the iterating order.
-      ///      
+      ///
       /// Gives back the first node in the iterating order.
-      ///     
+      ///
       void first(Node&) const {}
 
@@ -598 +598 @@
       ///
       /// Gives back the next node in the iterating order.
-      ///     
+      ///
       void next(Node&) const {}
 
@@ -604 +604 @@
       ///
       /// Gives back the first arc in the iterating order.
-      ///     
+      ///
       void first(Arc&) const {}
 
@@ -610 +610 @@
       ///
       /// Gives back the next arc in the iterating order.
-      ///     
+      ///
       void next(Arc&) const {}
 
@@ -618 +618 @@
       ///
       /// Gives back the first of the arcs point to the given node.
-      ///     
+      ///
       void firstIn(Arc&, const Node&) const {}
 
@@ -630 +630 @@
       /// \brief Gives back the first of the arcs start from the
       /// given node.
-      ///      
+      ///
       /// Gives back the first of the arcs start from the given node.
-      ///     
+      ///
       void firstOut(Arc&, const Node&) const {}
 
@@ -639 +639 @@
       ///
       /// Gives back the next of the arcs start from the given node.
-      ///     
+      ///
       void nextOut(Arc&) const {}
 
@@ -645 +645 @@
 
       /// \name Class based iteration
-      /// 
+      ///
       /// This interface provides functions for iteration on digraph items
       ///
@@ -700 +700 @@
       /// @}
 
-      template <typename _Digraph> 
-      struct Constraints {
-        void constraints() {
-          checkConcept<Base, _Digraph>();
+      template <typename _Digraph>
+      struct Constraints {
+        void constraints() {
+          checkConcept<Base, _Digraph>();
 
           {
-            typename _Digraph::Node node(INVALID);      
+            typename _Digraph::Node node(INVALID);
             typename _Digraph::Arc arc(INVALID);
             {
@@ -724 +724 @@
               digraph.nextOut(arc);
             }
-          }           
+          }
 
           {
@@ -731 +731 @@
             checkConcept<GraphItemIt<_Digraph, typename _Digraph::Node>,
               typename _Digraph::NodeIt >();
-            checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc, 
+            checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc,
               typename _Digraph::Node, 'i'>, typename _Digraph::InArcIt>();
-            checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc, 
+            checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc,
               typename _Digraph::Node, 'o'>, typename _Digraph::OutArcIt>();
 
@@ -746 +746 @@
           }
         }
-        
-        const _Digraph& digraph;
-        
+
+        const _Digraph& digraph;
+
       };
     };
@@ -766 +766 @@
       typedef typename Base::Edge Edge;
 
-    
+
       typedef IterableGraphComponent Graph;
 
       /// \name Base iteration
-      /// 
+      ///
       /// This interface provides functions for iteration on graph items
-      /// @{  
+      /// @{
 
       using IterableDigraphComponent<_Base>::first;
@@ -781 +781 @@
       ///
       /// Gives back the first edge in the iterating order.
-      ///     
+      ///
       void first(Edge&) const {}
 
@@ -788 +788 @@
       ///
       /// Gives back the next edge in the iterating order.
-      ///     
+      ///
       void next(Edge&) const {}
 
@@ -815 +815 @@
 
       /// \name Class based iteration
-      /// 
+      ///
       /// This interface provides functions for iteration on graph items
       ///
@@ -842 +842 @@
       /// @}
 
-      template <typename _Graph> 
-      struct Constraints {
-        void constraints() {
-          checkConcept<IterableDigraphComponent<Base>, _Graph>();
+      template <typename _Graph>
+      struct Constraints {
+        void constraints() {
+          checkConcept<IterableDigraphComponent<Base>, _Graph>();
 
           {
@@ -859 +859 @@
               graph.nextInc(edge, dir);
             }
-            
-          }     
-  
+
+          }
+
           {
             checkConcept<GraphItemIt<_Graph, typename _Graph::Edge>,
               typename _Graph::EdgeIt >();
-            checkConcept<GraphIncIt<_Graph, typename _Graph::Edge, 
+            checkConcept<GraphIncIt<_Graph, typename _Graph::Edge,
               typename _Graph::Node, 'u'>, typename _Graph::IncEdgeIt>();
-            
+
             typename _Graph::Node n;
             typename _Graph::IncEdgeIt ueit(INVALID);
@@ -874 +874 @@
           }
         }
-        
-        const _Graph& graph;
-        
+
+        const _Graph& graph;
+
       };
     };
 
     /// \brief An empty alteration notifier digraph class.
-    ///  
+    ///
     /// This class provides beside the core digraph features alteration
     /// notifier interface for the digraph structure.  This implements
@@ -898 +898 @@
 
       /// The node observer registry.
-      typedef AlterationNotifier<AlterableDigraphComponent, Node> 
+      typedef AlterationNotifier<AlterableDigraphComponent, Node>
       NodeNotifier;
       /// The arc observer registry.
-      typedef AlterationNotifier<AlterableDigraphComponent, Arc> 
+      typedef AlterationNotifier<AlterableDigraphComponent, Arc>
       ArcNotifier;
-      
+
       /// \brief Gives back the node alteration notifier.
       ///
       /// Gives back the node alteration notifier.
       NodeNotifier& notifier(Node) const {
-        return NodeNotifier();
+        return NodeNotifier();
       }
-      
+
       /// \brief Gives back the arc alteration notifier.
       ///
       /// Gives back the arc alteration notifier.
       ArcNotifier& notifier(Arc) const {
-        return ArcNotifier();
+        return ArcNotifier();
       }
 
-      template <typename _Digraph> 
-      struct Constraints {
-        void constraints() {
-          checkConcept<Base, _Digraph>();
-          typename _Digraph::NodeNotifier& nn 
+      template <typename _Digraph>
+      struct Constraints {
+        void constraints() {
+          checkConcept<Base, _Digraph>();
+          typename _Digraph::NodeNotifier& nn
             = digraph.notifier(typename _Digraph::Node());
 
-          typename _Digraph::ArcNotifier& en 
+          typename _Digraph::ArcNotifier& en
             = digraph.notifier(typename _Digraph::Arc());
-          
+
           ignore_unused_variable_warning(nn);
           ignore_unused_variable_warning(en);
-        }
-        
-        const _Digraph& digraph;
-        
-      };
-      
+        }
+
+        const _Digraph& digraph;
+
+      };
+
     };
 
     /// \brief An empty alteration notifier undirected graph class.
-    ///  
+    ///
     /// This class provides beside the core graph features alteration
     /// notifier interface for the graph structure.  This implements
@@ -955 +955 @@
 
       /// The arc observer registry.
-      typedef AlterationNotifier<AlterableGraphComponent, Edge> 
+      typedef AlterationNotifier<AlterableGraphComponent, Edge>
       EdgeNotifier;
-      
+
       /// \brief Gives back the arc alteration notifier.
       ///
       /// Gives back the arc alteration notifier.
       EdgeNotifier& notifier(Edge) const {
-        return EdgeNotifier();
+        return EdgeNotifier();
       }
 
-      template <typename _Graph> 
-      struct Constraints {
-        void constraints() {
-          checkConcept<AlterableGraphComponent<Base>, _Graph>();
-          typename _Graph::EdgeNotifier& uen 
+      template <typename _Graph>
+      struct Constraints {
+        void constraints() {
+          checkConcept<AlterableGraphComponent<Base>, _Graph>();
+          typename _Graph::EdgeNotifier& uen
             = graph.notifier(typename _Graph::Edge());
           ignore_unused_variable_warning(uen);
-        }
-        
-        const _Graph& graph;
-        
-      };
-      
+        }
+
+        const _Graph& graph;
+
+      };
+
     };
 
     /// \brief Class describing the concept of graph maps
-    /// 
+    ///
     /// This class describes the common interface of the graph maps
     /// (NodeMap, ArcMap), that is \ref maps-page "maps" which can be used to
@@ -1010 +1010 @@
       /// Copy Constructor.
       GraphMap(const GraphMap&) : Parent() {}
-      
+
       /// \brief Assign operator.
       ///
       /// Assign operator. It does not mofify the underlying graph,
       /// it just iterates on the current item set and set the  map
-      /// with the value returned by the assigned map. 
+      /// with the value returned by the assigned map.
       template <typename CMap>
-      GraphMap& operator=(const CMap&) { 
+      GraphMap& operator=(const CMap&) {
         checkConcept<ReadMap<Key, Value>, CMap>();
         return *this;
@@ -1024 +1024 @@
       template<typename _Map>
       struct Constraints {
-        void constraints() {
-          checkConcept<ReadWriteMap<Key, Value>, _Map >();
-          // Construction with a graph parameter
-          _Map a(g);
-          // Constructor with a graph and a default value parameter
-          _Map a2(g,t);
-          // Copy constructor.
-          _Map b(c);
-          
+        void constraints() {
+          checkConcept<ReadWriteMap<Key, Value>, _Map >();
+          // Construction with a graph parameter
+          _Map a(g);
+          // Constructor with a graph and a default value parameter
+          _Map a2(g,t);
+          // Copy constructor.
+          _Map b(c);
+
           ReadMap<Key, Value> cmap;
           b = cmap;
 
-          ignore_unused_variable_warning(a2);
-          ignore_unused_variable_warning(b);
-        }
-
-        const _Map &c;
-        const Graph &g;
-        const typename GraphMap::Value &t;
+          ignore_unused_variable_warning(a2);
+          ignore_unused_variable_warning(b);
+        }
+
+        const _Map &c;
+        const Graph &g;
+        const typename GraphMap::Value &t;
       };
 
@@ -1071 +1071 @@
         typedef GraphMap<MappableDigraphComponent, Node, _Value> Parent;
 
-        /// \brief Construct a new map.
-        ///
-        /// Construct a new map for the digraph.
-        explicit NodeMap(const MappableDigraphComponent& digraph) 
+        /// \brief Construct a new map.
+        ///
+        /// Construct a new map for the digraph.
+        explicit NodeMap(const MappableDigraphComponent& digraph)
           : Parent(digraph) {}
 
-        /// \brief Construct a new map with default value.
-        ///
-        /// Construct a new map for the digraph and initalise the values.
-        NodeMap(const MappableDigraphComponent& digraph, const _Value& value)
+        /// \brief Construct a new map with default value.
+        ///
+        /// Construct a new map for the digraph and initalise the values.
+        NodeMap(const MappableDigraphComponent& digraph, const _Value& value)
           : Parent(digraph, value) {}
 
-        /// \brief Copy constructor.
-        ///
-        /// Copy Constructor.
-        NodeMap(const NodeMap& nm) : Parent(nm) {}
-
-        /// \brief Assign operator.
-        ///
-        /// Assign operator.
+        /// \brief Copy constructor.
+        ///
+        /// Copy Constructor.
+        NodeMap(const NodeMap& nm) : Parent(nm) {}
+
+        /// \brief Assign operator.
+        ///
+        /// Assign operator.
         template <typename CMap>
-        NodeMap& operator=(const CMap&) { 
+        NodeMap& operator=(const CMap&) {
           checkConcept<ReadMap<Node, _Value>, CMap>();
           return *this;
@@ -1108 +1108 @@
         typedef GraphMap<MappableDigraphComponent, Arc, _Value> Parent;
 
-        /// \brief Construct a new map.
-        ///
-        /// Construct a new map for the digraph.
-        explicit ArcMap(const MappableDigraphComponent& digraph) 
+        /// \brief Construct a new map.
+        ///
+        /// Construct a new map for the digraph.
+        explicit ArcMap(const MappableDigraphComponent& digraph)
           : Parent(digraph) {}
 
-        /// \brief Construct a new map with default value.
-        ///
-        /// Construct a new map for the digraph and initalise the values.
-        ArcMap(const MappableDigraphComponent& digraph, const _Value& value)
+        /// \brief Construct a new map with default value.
+        ///
+        /// Construct a new map for the digraph and initalise the values.
+        ArcMap(const MappableDigraphComponent& digraph, const _Value& value)
           : Parent(digraph, value) {}
 
-        /// \brief Copy constructor.
-        ///
-        /// Copy Constructor.
-        ArcMap(const ArcMap& nm) : Parent(nm) {}
-
-        /// \brief Assign operator.
-        ///
-        /// Assign operator.
+        /// \brief Copy constructor.
+        ///
+        /// Copy Constructor.
+        ArcMap(const ArcMap& nm) : Parent(nm) {}
+
+        /// \brief Assign operator.
+        ///
+        /// Assign operator.
         template <typename CMap>
-        ArcMap& operator=(const CMap&) { 
+        ArcMap& operator=(const CMap&) {
           checkConcept<ReadMap<Arc, _Value>, CMap>();
           return *this;
@@ -1140 +1140 @@
       struct Constraints {
 
-        struct Dummy {
-          int value;
-          Dummy() : value(0) {}
-          Dummy(int _v) : value(_v) {}
-        };
-
-        void constraints() {
-          checkConcept<Base, _Digraph>();
-          { // int map test
-            typedef typename _Digraph::template NodeMap<int> IntNodeMap;
-            checkConcept<GraphMap<_Digraph, typename _Digraph::Node, int>, 
-              IntNodeMap >();
-          } { // bool map test
-            typedef typename _Digraph::template NodeMap<bool> BoolNodeMap;
-            checkConcept<GraphMap<_Digraph, typename _Digraph::Node, bool>,
-              BoolNodeMap >();
-          } { // Dummy map test
-            typedef typename _Digraph::template NodeMap<Dummy> DummyNodeMap;
-            checkConcept<GraphMap<_Digraph, typename _Digraph::Node, Dummy>,
-              DummyNodeMap >();
-          } 
-
-          { // int map test
-            typedef typename _Digraph::template ArcMap<int> IntArcMap;
-            checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, int>,
-              IntArcMap >();
-          } { // bool map test
-            typedef typename _Digraph::template ArcMap<bool> BoolArcMap;
-            checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, bool>,
-              BoolArcMap >();
-          } { // Dummy map test
-            typedef typename _Digraph::template ArcMap<Dummy> DummyArcMap;
-            checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, Dummy>, 
-              DummyArcMap >();
-          } 
-        }
-
-        _Digraph& digraph;
+        struct Dummy {
+          int value;
+          Dummy() : value(0) {}
+          Dummy(int _v) : value(_v) {}
+        };
+
+        void constraints() {
+          checkConcept<Base, _Digraph>();
+          { // int map test
+            typedef typename _Digraph::template NodeMap<int> IntNodeMap;
+            checkConcept<GraphMap<_Digraph, typename _Digraph::Node, int>,
+              IntNodeMap >();
+          } { // bool map test
+            typedef typename _Digraph::template NodeMap<bool> BoolNodeMap;
+            checkConcept<GraphMap<_Digraph, typename _Digraph::Node, bool>,
+              BoolNodeMap >();
+          } { // Dummy map test
+            typedef typename _Digraph::template NodeMap<Dummy> DummyNodeMap;
+            checkConcept<GraphMap<_Digraph, typename _Digraph::Node, Dummy>,
+              DummyNodeMap >();
+          }
+
+          { // int map test
+            typedef typename _Digraph::template ArcMap<int> IntArcMap;
+            checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, int>,
+              IntArcMap >();
+          } { // bool map test
+            typedef typename _Digraph::template ArcMap<bool> BoolArcMap;
+            checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, bool>,
+              BoolArcMap >();
+          } { // Dummy map test
+            typedef typename _Digraph::template ArcMap<Dummy> DummyArcMap;
+            checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, Dummy>,
+              DummyArcMap >();
+          }
+        }
+
+        _Digraph& digraph;
       };
     };
@@ -1200 +1200 @@
       ///
       template <typename _Value>
-      class EdgeMap : public GraphMap<Graph, Edge, _Value> {  
+      class EdgeMap : public GraphMap<Graph, Edge, _Value> {
       public:
         typedef GraphMap<MappableGraphComponent, Edge, _Value> Parent;
 
-        /// \brief Construct a new map.
-        ///
-        /// Construct a new map for the graph.
-        explicit EdgeMap(const MappableGraphComponent& graph) 
+        /// \brief Construct a new map.
+        ///
+        /// Construct a new map for the graph.
+        explicit EdgeMap(const MappableGraphComponent& graph)
           : Parent(graph) {}
 
-        /// \brief Construct a new map with default value.
-        ///
-        /// Construct a new map for the graph and initalise the values.
-        EdgeMap(const MappableGraphComponent& graph, const _Value& value)
+        /// \brief Construct a new map with default value.
+        ///
+        /// Construct a new map for the graph and initalise the values.
+        EdgeMap(const MappableGraphComponent& graph, const _Value& value)
           : Parent(graph, value) {}
 
-        /// \brief Copy constructor.
-        ///
-        /// Copy Constructor.
-        EdgeMap(const EdgeMap& nm) : Parent(nm) {}
-
-        /// \brief Assign operator.
-        ///
-        /// Assign operator.
+        /// \brief Copy constructor.
+        ///
+        /// Copy Constructor.
+        EdgeMap(const EdgeMap& nm) : Parent(nm) {}
+
+        /// \brief Assign operator.
+        ///
+        /// Assign operator.
         template <typename CMap>
-        EdgeMap& operator=(const CMap&) { 
+        EdgeMap& operator=(const CMap&) {
           checkConcept<ReadMap<Edge, _Value>, CMap>();
           return *this;
@@ -1236 +1236 @@
       struct Constraints {
 
-        struct Dummy {
-          int value;
-          Dummy() : value(0) {}
-          Dummy(int _v) : value(_v) {}
-        };
-
-        void constraints() {
-          checkConcept<MappableGraphComponent<Base>, _Graph>();
-
-          { // int map test
-            typedef typename _Graph::template EdgeMap<int> IntEdgeMap;
-            checkConcept<GraphMap<_Graph, typename _Graph::Edge, int>,
-              IntEdgeMap >();
-          } { // bool map test
-            typedef typename _Graph::template EdgeMap<bool> BoolEdgeMap;
-            checkConcept<GraphMap<_Graph, typename _Graph::Edge, bool>,
-              BoolEdgeMap >();
-          } { // Dummy map test
-            typedef typename _Graph::template EdgeMap<Dummy> DummyEdgeMap;
-            checkConcept<GraphMap<_Graph, typename _Graph::Edge, Dummy>, 
-              DummyEdgeMap >();
-          } 
-        }
-
-        _Graph& graph;
+        struct Dummy {
+          int value;
+          Dummy() : value(0) {}
+          Dummy(int _v) : value(_v) {}
+        };
+
+        void constraints() {
+          checkConcept<MappableGraphComponent<Base>, _Graph>();
+
+          { // int map test
+            typedef typename _Graph::template EdgeMap<int> IntEdgeMap;
+            checkConcept<GraphMap<_Graph, typename _Graph::Edge, int>,
+              IntEdgeMap >();
+          } { // bool map test
+            typedef typename _Graph::template EdgeMap<bool> BoolEdgeMap;
+            checkConcept<GraphMap<_Graph, typename _Graph::Edge, bool>,
+              BoolEdgeMap >();
+          } { // Dummy map test
+            typedef typename _Graph::template EdgeMap<Dummy> DummyEdgeMap;
+            checkConcept<GraphMap<_Graph, typename _Graph::Edge, Dummy>,
+              DummyEdgeMap >();
+          }
+        }
+
+        _Graph& graph;
       };
     };
@@ -1283 +1283 @@
       ///
       Node addNode() {
-        return INVALID;
+        return INVALID;
       }
-    
+
       /// \brief Adds a new arc connects the given two nodes.
       ///
       /// Adds a new arc connects the the given two nodes.
       Arc addArc(const Node&, const Node&) {
-        return INVALID;
+        return INVALID;
       }
 
       template <typename _Digraph>
       struct Constraints {
-        void constraints() {
+        void constraints() {
           checkConcept<Base, _Digraph>();
-          typename _Digraph::Node node_a, node_b;
-          node_a = digraph.addNode();
-          node_b = digraph.addNode();
-          typename _Digraph::Arc arc;
-          arc = digraph.addArc(node_a, node_b);
-        }
-
-        _Digraph& digraph;
+          typename _Digraph::Node node_a, node_b;
+          node_a = digraph.addNode();
+          node_b = digraph.addNode();
+          typename _Digraph::Arc arc;
+          arc = digraph.addArc(node_a, node_b);
+        }
+
+        _Digraph& digraph;
       };
     };
@@ -1328 +1328 @@
       ///
       Node addNode() {
-        return INVALID;
+        return INVALID;
       }
-    
+
       /// \brief Adds a new arc connects the given two nodes.
       ///
       /// Adds a new arc connects the the given two nodes.
       Edge addArc(const Node&, const Node&) {
-        return INVALID;
+        return INVALID;
       }
 
       template <typename _Graph>
       struct Constraints {
-        void constraints() {
-          checkConcept<Base, _Graph>();
-          typename _Graph::Node node_a, node_b;
-          node_a = graph.addNode();
-          node_b = graph.addNode();
-          typename _Graph::Edge edge;
-          edge = graph.addEdge(node_a, node_b);
-        }
-
-        _Graph& graph;
+        void constraints() {
+          checkConcept<Base, _Graph>();
+          typename _Graph::Node node_a, node_b;
+          node_a = graph.addNode();
+          node_b = graph.addNode();
+          typename _Graph::Edge edge;
+          edge = graph.addEdge(node_a, node_b);
+        }
+
+        _Graph& graph;
       };
     };
 
     /// \brief An empty erasable digraph class.
-    ///  
+    ///
     /// This class provides beside the core digraph features core erase
     /// functions for the digraph structure. The main difference between
@@ -1369 +1369 @@
       /// \brief Erase a node from the digraph.
       ///
-      /// Erase a node from the digraph. This function should 
+      /// Erase a node from the digraph. This function should
       /// erase all arcs connecting to the node.
-      void erase(const Node&) {}    
+      void erase(const Node&) {}
 
       /// \brief Erase an arc from the digraph.
@@ -1381 +1381 @@
       template <typename _Digraph>
       struct Constraints {
-        void constraints() {
+        void constraints() {
           checkConcept<Base, _Digraph>();
-          typename _Digraph::Node node;
-          digraph.erase(node);
-          typename _Digraph::Arc arc;
-          digraph.erase(arc);
-        }
-
-        _Digraph& digraph;
+          typename _Digraph::Node node;
+          digraph.erase(node);
+          typename _Digraph::Arc arc;
+          digraph.erase(arc);
+        }
+
+        _Digraph& digraph;
       };
     };
 
     /// \brief An empty erasable base undirected graph class.
-    ///  
+    ///
     /// This class provides beside the core undirected graph features
     /// core erase functions for the undirceted graph structure. The
@@ -1411 +1411 @@
       /// Erase a node from the graph. This function should erase
       /// arcs connecting to the node.
-      void erase(const Node&) {}    
+      void erase(const Node&) {}
 
       /// \brief Erase an arc from the graph.
@@ -1421 +1421 @@
       template <typename _Graph>
       struct Constraints {
-        void constraints() {
+        void constraints() {
           checkConcept<Base, _Graph>();
-          typename _Graph::Node node;
-          graph.erase(node);
-          typename _Graph::Edge edge;
-          graph.erase(edge);
-        }
-
-        _Graph& graph;
+          typename _Graph::Node node;
+          graph.erase(node);
+          typename _Graph::Edge edge;
+          graph.erase(edge);
+        }
+
+        _Graph& graph;
       };
     };
@@ -1449 +1449 @@
       /// Erase all nodes and arcs from the digraph.
       ///
-      void clear() {}    
+      void clear() {}
 
       template <typename _Digraph>
       struct Constraints {
-        void constraints() {
+        void constraints() {
           checkConcept<Base, _Digraph>();
-          digraph.clear();
-        }
-
-        _Digraph digraph;
+          digraph.clear();
+        }
+
+        _Digraph digraph;
       };
     };
@@ -1476 +1476 @@
       template <typename _Graph>
       struct Constraints {
-        void constraints() {
+        void constraints() {
           checkConcept<ClearableGraphComponent<Base>, _Graph>();
-        }
-
-        _Graph graph;
+        }
+
+        _Graph graph;
       };
     };

lemon/concepts/heap.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -53 +53 @@
       /// the user.
       ///
-      /// The \c ItemIntMap must be initialized in such a way, that it 
+      /// The \c ItemIntMap must be initialized in such a way, that it
       /// assigns \c PRE_HEAP (<tt>-1</tt>) to every item.
       enum State {
-        IN_HEAP = 0,
-        PRE_HEAP = -1,
-        POST_HEAP = -2
+        IN_HEAP = 0,
+        PRE_HEAP = -1,
+        POST_HEAP = -2
       };
-      
+
       /// \brief The constructor.
       ///
@@ -86 +86 @@
 
       /// \brief Inserts an item into the heap with the given priority.
-      ///    
-      /// Inserts the given item into the heap with the given priority. 
+      ///
+      /// Inserts the given item into the heap with the given priority.
       /// \param i The item to insert.
       /// \param p The priority of the item.
@@ -113 +113 @@
       ///
       /// Removes the given item from the heap if it is already stored.
-      /// \param i The item to delete. 
+      /// \param i The item to delete.
       void erase(const Item &i) {}
 
       /// \brief The priority of an item.
       ///
-      /// Returns the priority of the given item.  
+      /// Returns the priority of the given item.
       /// \pre \c i must be in the heap.
       /// \param i The item.
@@ -134 +134 @@
       /// \param p The priority.
       void set(const Item &i, const Prio &p) {}
-      
+
       /// \brief Decreases the priority of an item to the given value.
       ///
@@ -175 +175 @@
       struct Constraints {
       public:
-        void constraints() {
-          typedef typename _Heap::Item OwnItem;
-          typedef typename _Heap::Prio OwnPrio;
-          typedef typename _Heap::State OwnState;
-
-          Item item;
-          Prio prio;
-          item=Item();
-          prio=Prio();
-          ignore_unused_variable_warning(item);
-          ignore_unused_variable_warning(prio);
-
-          OwnItem own_item;
-          OwnPrio own_prio;
-          OwnState own_state;
-          own_item=Item();
-          own_prio=Prio();
-          ignore_unused_variable_warning(own_item);
-          ignore_unused_variable_warning(own_prio);
-          ignore_unused_variable_warning(own_state);
-
-          _Heap heap1(map);
-          _Heap heap2 = heap1;
-          ignore_unused_variable_warning(heap1);
-          ignore_unused_variable_warning(heap2);
-          
-          int s = heap.size();
-          ignore_unused_variable_warning(s);
-          bool e = heap.empty();
-          ignore_unused_variable_warning(e);
-
-          prio = heap.prio();
-          item = heap.top();
-          prio = heap[item];
-          own_prio = heap.prio();
-          own_item = heap.top();
-          own_prio = heap[own_item];
-
-          heap.push(item, prio);
-          heap.push(own_item, own_prio);
-          heap.pop();
-
-          heap.set(item, prio);
-          heap.decrease(item, prio);
-          heap.increase(item, prio);
-          heap.set(own_item, own_prio);
-          heap.decrease(own_item, own_prio);
-          heap.increase(own_item, own_prio);
-
-          heap.erase(item);
-          heap.erase(own_item);
-          heap.clear();
-
-          own_state = heap.state(own_item);
-          heap.state(own_item, own_state);
-
-          own_state = _Heap::PRE_HEAP;
-          own_state = _Heap::IN_HEAP;
-          own_state = _Heap::POST_HEAP;
-        }
-
-        _Heap& heap;
-        ItemIntMap& map;
+        void constraints() {
+          typedef typename _Heap::Item OwnItem;
+          typedef typename _Heap::Prio OwnPrio;
+          typedef typename _Heap::State OwnState;
+
+          Item item;
+          Prio prio;
+          item=Item();
+          prio=Prio();
+          ignore_unused_variable_warning(item);
+          ignore_unused_variable_warning(prio);
+
+          OwnItem own_item;
+          OwnPrio own_prio;
+          OwnState own_state;
+          own_item=Item();
+          own_prio=Prio();
+          ignore_unused_variable_warning(own_item);
+          ignore_unused_variable_warning(own_prio);
+          ignore_unused_variable_warning(own_state);
+
+          _Heap heap1(map);
+          _Heap heap2 = heap1;
+          ignore_unused_variable_warning(heap1);
+          ignore_unused_variable_warning(heap2);
+
+          int s = heap.size();
+          ignore_unused_variable_warning(s);
+          bool e = heap.empty();
+          ignore_unused_variable_warning(e);
+
+          prio = heap.prio();
+          item = heap.top();
+          prio = heap[item];
+          own_prio = heap.prio();
+          own_item = heap.top();
+          own_prio = heap[own_item];
+
+          heap.push(item, prio);
+          heap.push(own_item, own_prio);
+          heap.pop();
+
+          heap.set(item, prio);
+          heap.decrease(item, prio);
+          heap.increase(item, prio);
+          heap.set(own_item, own_prio);
+          heap.decrease(own_item, own_prio);
+          heap.increase(own_item, own_prio);
+
+          heap.erase(item);
+          heap.erase(own_item);
+          heap.clear();
+
+          own_state = heap.state(own_item);
+          heap.state(own_item, own_state);
+
+          own_state = _Heap::PRE_HEAP;
+          own_state = _Heap::IN_HEAP;
+          own_state = _Heap::POST_HEAP;
+        }
+
+        _Heap& heap;
+        ItemIntMap& map;
       };
     };

lemon/concepts/maps.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -48 +48 @@
 
       /// Returns the value associated with the given key.
-      Value operator[](const Key &) const { 
+      Value operator[](const Key &) const {
         return *static_cast<Value *>(0);
       }
@@ -54 +54 @@
       template<typename _ReadMap>
       struct Constraints {
-        void constraints() {
-          Value val = m[key];
-          val = m[key];
-          typename _ReadMap::Value own_val = m[own_key];
-          own_val = m[own_key];
-
-          ignore_unused_variable_warning(key);
-          ignore_unused_variable_warning(val);
-          ignore_unused_variable_warning(own_key);
-          ignore_unused_variable_warning(own_val);
-        }
-        const Key& key;
-        const typename _ReadMap::Key& own_key;
-        const _ReadMap& m;
+        void constraints() {
+          Value val = m[key];
+          val = m[key];
+          typename _ReadMap::Value own_val = m[own_key];
+          own_val = m[own_key];
+
+          ignore_unused_variable_warning(key);
+          ignore_unused_variable_warning(val);
+          ignore_unused_variable_warning(own_key);
+          ignore_unused_variable_warning(own_val);
+        }
+        const Key& key;
+        const typename _ReadMap::Key& own_key;
+        const _ReadMap& m;
       };
 
@@ -94 +94 @@
       template <typename _WriteMap>
       struct Constraints {
-        void constraints() {
-          m.set(key, val);
-          m.set(own_key, own_val);
-
-          ignore_unused_variable_warning(key);
-          ignore_unused_variable_warning(val);
-          ignore_unused_variable_warning(own_key);
-          ignore_unused_variable_warning(own_val);
-        }
-        const Key& key;
-        const Value& val;
-        const typename _WriteMap::Key& own_key;
-        const typename _WriteMap::Value& own_val;
-        _WriteMap& m;
+        void constraints() {
+          m.set(key, val);
+          m.set(own_key, own_val);
+
+          ignore_unused_variable_warning(key);
+          ignore_unused_variable_warning(val);
+          ignore_unused_variable_warning(own_key);
+          ignore_unused_variable_warning(own_val);
+        }
+        const Key& key;
+        const Value& val;
+        const typename _WriteMap::Key& own_key;
+        const typename _WriteMap::Value& own_val;
+        _WriteMap& m;
       };
     };
@@ -117 +117 @@
     template<typename K, typename T>
     class ReadWriteMap : public ReadMap<K,T>,
-                         public WriteMap<K,T>
+                         public WriteMap<K,T>
     {
     public:
@@ -126 +126 @@
 
       /// Returns the value associated with the given key.
-      Value operator[](const Key &) const { 
+      Value operator[](const Key &) const {
         return *static_cast<Value *>(0);
       }
@@ -135 +135 @@
       template<typename _ReadWriteMap>
       struct Constraints {
-        void constraints() {
-          checkConcept<ReadMap<K, T>, _ReadWriteMap >();
-          checkConcept<WriteMap<K, T>, _ReadWriteMap >();
-        }
+        void constraints() {
+          checkConcept<ReadMap<K, T>, _ReadWriteMap >();
+          checkConcept<WriteMap<K, T>, _ReadWriteMap >();
+        }
       };
     };
@@ -165 +165 @@
 
       /// Returns a reference to the value associated with the given key.
-      Reference operator[](const Key &) { 
+      Reference operator[](const Key &) {
         return *static_cast<Value *>(0);
       }
@@ -179 +179 @@
       template<typename _ReferenceMap>
       struct Constraints {
-        void constraints() {
-          checkConcept<ReadWriteMap<K, T>, _ReferenceMap >();
-          ref = m[key];
-          m[key] = val;
-          m[key] = ref;
-          m[key] = cref;
-          own_ref = m[own_key];
-          m[own_key] = own_val;
-          m[own_key] = own_ref;
-          m[own_key] = own_cref;
-          m[key] = m[own_key];
-          m[own_key] = m[key];
-        }
-        const Key& key;
-        Value& val;
-        Reference ref;
-        ConstReference cref;
-        const typename _ReferenceMap::Key& own_key;
-        typename _ReferenceMap::Value& own_val;
-        typename _ReferenceMap::Reference own_ref;
-        typename _ReferenceMap::ConstReference own_cref;
-        _ReferenceMap& m;
+        void constraints() {
+          checkConcept<ReadWriteMap<K, T>, _ReferenceMap >();
+          ref = m[key];
+          m[key] = val;
+          m[key] = ref;
+          m[key] = cref;
+          own_ref = m[own_key];
+          m[own_key] = own_val;
+          m[own_key] = own_ref;
+          m[own_key] = own_cref;
+          m[key] = m[own_key];
+          m[own_key] = m[key];
+        }
+        const Key& key;
+        Value& val;
+        Reference ref;
+        ConstReference cref;
+        const typename _ReferenceMap::Key& own_key;
+        typename _ReferenceMap::Value& own_val;
+        typename _ReferenceMap::Reference own_ref;
+        typename _ReferenceMap::ConstReference own_cref;
+        _ReferenceMap& m;
       };
     };

lemon/concepts/path.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -40 +40 @@
     ///
     /// A skeleton structure for representing directed paths in a
-    /// digraph.  
+    /// digraph.
     /// \tparam _Digraph The digraph type in which the path is.
     ///
@@ -84 +84 @@
       class ArcIt {
       public:
-        /// Default constructor
-        ArcIt() {}
-        /// Invalid constructor
-        ArcIt(Invalid) {}
-        /// Constructor for first arc
-        ArcIt(const Path &) {}
+        /// Default constructor
+        ArcIt() {}
+        /// Invalid constructor
+        ArcIt(Invalid) {}
+        /// Constructor for first arc
+        ArcIt(const Path &) {}
 
         /// Conversion to Arc
-        operator Arc() const { return INVALID; }
-
-        /// Next arc
-        ArcIt& operator++() {return *this;}
-
-        /// Comparison operator
-        bool operator==(const ArcIt&) const {return true;}
-        /// Comparison operator
-        bool operator!=(const ArcIt&) const {return true;}
-        /// Comparison operator
-        bool operator<(const ArcIt&) const {return false;}
+        operator Arc() const { return INVALID; }
+
+        /// Next arc
+        ArcIt& operator++() {return *this;}
+
+        /// Comparison operator
+        bool operator==(const ArcIt&) const {return true;}
+        /// Comparison operator
+        bool operator!=(const ArcIt&) const {return true;}
+         /// Comparison operator
+         bool operator<(const ArcIt&) const {return false;}
 
       };
@@ -138 +138 @@
 
     namespace _path_bits {
-      
+
       template <typename _Digraph, typename _Path, typename RevPathTag = void>
       struct PathDumperConstraints {
@@ -163 +163 @@
       template <typename _Digraph, typename _Path>
       struct PathDumperConstraints<
-        _Digraph, _Path, 
+        _Digraph, _Path,
         typename enable_if<typename _Path::RevPathTag, void>::type
       > {
@@ -185 +185 @@
         _Path& p;
       };
-    
+
     }
 
@@ -210 +210 @@
     /// The paths can be constructed from any path type by a
     /// template constructor or a template assignment operator.
-    /// 
+    ///
     template <typename _Digraph>
     class PathDumper {
@@ -239 +239 @@
       class ArcIt {
       public:
-        /// Default constructor
-        ArcIt() {}
-        /// Invalid constructor
-        ArcIt(Invalid) {}
-        /// Constructor for first arc
-        ArcIt(const PathDumper&) {}
+        /// Default constructor
+        ArcIt() {}
+        /// Invalid constructor
+        ArcIt(Invalid) {}
+        /// Constructor for first arc
+        ArcIt(const PathDumper&) {}
 
         /// Conversion to Arc
-        operator Arc() const { return INVALID; }
-
-        /// Next arc
-        ArcIt& operator++() {return *this;}
-
-        /// Comparison operator
-        bool operator==(const ArcIt&) const {return true;}
-        /// Comparison operator
-        bool operator!=(const ArcIt&) const {return true;}
-        /// Comparison operator
-        bool operator<(const ArcIt&) const {return false;}
+        operator Arc() const { return INVALID; }
+
+        /// Next arc
+        ArcIt& operator++() {return *this;}
+
+        /// Comparison operator
+        bool operator==(const ArcIt&) const {return true;}
+        /// Comparison operator
+        bool operator!=(const ArcIt&) const {return true;}
+         /// Comparison operator
+         bool operator<(const ArcIt&) const {return false;}
 
       };
@@ -267 +267 @@
       class RevArcIt {
       public:
-        /// Default constructor
-        RevArcIt() {}
-        /// Invalid constructor
-        RevArcIt(Invalid) {}
-        /// Constructor for first arc
-        RevArcIt(const PathDumper &) {}
+        /// Default constructor
+        RevArcIt() {}
+        /// Invalid constructor
+        RevArcIt(Invalid) {}
+        /// Constructor for first arc
+        RevArcIt(const PathDumper &) {}
 
         /// Conversion to Arc
-        operator Arc() const { return INVALID; }
-
-        /// Next arc
-        RevArcIt& operator++() {return *this;}
-
-        /// Comparison operator
-        bool operator==(const RevArcIt&) const {return true;}
-        /// Comparison operator
-        bool operator!=(const RevArcIt&) const {return true;}
-        /// Comparison operator
-        bool operator<(const RevArcIt&) const {return false;}
+        operator Arc() const { return INVALID; }
+
+        /// Next arc
+        RevArcIt& operator++() {return *this;}
+
+        /// Comparison operator
+        bool operator==(const RevArcIt&) const {return true;}
+        /// Comparison operator
+        bool operator!=(const RevArcIt&) const {return true;}
+         /// Comparison operator
+         bool operator<(const RevArcIt&) const {return false;}
 
       };

lemon/counter.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -27 +27 @@
 ///\brief Tools for counting steps and events
 
-namespace lemon 
+namespace lemon
 {
 
@@ -33 +33 @@
 
   template<class P>
-  class _SubCounter 
+  class _SubCounter
   {
     P &_parent;
@@ -50 +50 @@
     _SubCounter(P &parent,const char *title,std::ostream &os=std::cerr)
       : _parent(parent), _title(title), _os(os), count(0) {}
-    ~_SubCounter() { 
+    ~_SubCounter() {
       _os << _title << count <<std::endl;
       _parent+=count;
@@ -64 +64 @@
 
   template<class P>
-  class _NoSubCounter 
+  class _NoSubCounter
   {
     P &_parent;
@@ -70 +70 @@
     typedef _NoSubCounter<_NoSubCounter<P> > SubCounter;
     typedef _NoSubCounter<_NoSubCounter<P> > NoSubCounter;
-  
+
     _NoSubCounter(P &parent) :_parent(parent) {}
-    _NoSubCounter(P &parent,std::string,std::ostream &) 
-      :_parent(parent) {}
-    _NoSubCounter(P &parent,std::string) 
+    _NoSubCounter(P &parent,std::string,std::ostream &)
+      :_parent(parent) {}
+    _NoSubCounter(P &parent,std::string)
       :_parent(parent) {}
     _NoSubCounter(P &parent,const char *,std::ostream &)
@@ -103 +103 @@
   /// for different types of operations.
   /// A report containing the given title and the value of the counter
-  /// is automatically printed on destruction. 
+  /// is automatically printed on destruction.
   ///
   /// The following example shows the usage of counters and subcounters.
@@ -134 +134 @@
   ///
   /// \sa NoCounter
-  class Counter 
+  class Counter
   {
     std::string _title;
@@ -142 +142 @@
 
     /// SubCounter class
-    
+
     /// This class can be used to setup subcounters for a \ref Counter
     /// to have finer reports. A subcounter provides exactly the same
@@ -148 +148 @@
     /// decrements the value of its parent.
     /// Subcounters can also have subcounters.
-    /// 
+    ///
     /// The parent counter must be given as the first parameter of the
     /// constructor. Apart from that a title and an \c ostream object
@@ -157 +157 @@
     /// would like to turn off this report, use \ref NoSubCounter
     /// instead.
-    /// 
+    ///
     /// \sa NoSubCounter
     typedef _SubCounter<Counter> SubCounter;
 
-    /// SubCounter class without printing report on destruction 
-    
+    /// SubCounter class without printing report on destruction
+
     /// This class can be used to setup subcounters for a \ref Counter.
     /// It is the same as \ref SubCounter but it does not print report
@@ -169 +169 @@
     ///
     /// Replacing \ref SubCounter "SubCounter"s with \ref NoSubCounter
-    /// "NoSubCounter"s makes it possible to turn off reporting 
+    /// "NoSubCounter"s makes it possible to turn off reporting
     /// subcounter values without actually removing the definitions
     /// and the increment or decrement operators.
@@ -179 +179 @@
     Counter() : _title(), _os(std::cerr), count(0) {}
     /// Constructor.
-    Counter(std::string title,std::ostream &os=std::cerr) 
+    Counter(std::string title,std::ostream &os=std::cerr)
       : _title(title), _os(os), count(0) {}
     /// Constructor.
@@ -205 +205 @@
     /// \note This function does not reset the values of
     /// \ref SubCounter "SubCounter"s but it resets \ref NoSubCounter
-    /// "NoSubCounter"s along with the main counter. 
+    /// "NoSubCounter"s along with the main counter.
     void reset(int c=0) {count=c;}
     /// Returns the value of the counter.

lemon/dfs.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -35 +35 @@
 namespace lemon {
 
-  
+
   ///Default traits class of Dfs class.
 
@@ -43 +43 @@
   struct DfsDefaultTraits
   {
-    ///The digraph type the algorithm runs on. 
+    ///The digraph type the algorithm runs on.
     typedef GR Digraph;
     ///\brief The type of the map that stores the last
     ///arcs of the %DFS paths.
-    /// 
+    ///
     ///The type of the map that stores the last
     ///arcs of the %DFS paths.
@@ -54 +54 @@
     typedef typename Digraph::template NodeMap<typename GR::Arc> PredMap;
     ///Instantiates a PredMap.
- 
-    ///This function instantiates a \ref PredMap. 
+
+    ///This function instantiates a \ref PredMap.
     ///\param G is the digraph, to which we would like to define the PredMap.
     ///\todo The digraph alone may be insufficient to initialize
-    static PredMap *createPredMap(const GR &G) 
+    static PredMap *createPredMap(const GR &G)
     {
       return new PredMap(G);
@@ -64 +64 @@
 
     ///The type of the map that indicates which nodes are processed.
- 
+
     ///The type of the map that indicates which nodes are processed.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -70 +70 @@
     typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
     ///Instantiates a ProcessedMap.
- 
-    ///This function instantiates a \ref ProcessedMap. 
+
+    ///This function instantiates a \ref ProcessedMap.
     ///\param g is the digraph, to which
     ///we would like to define the \ref ProcessedMap
@@ -83 +83 @@
     }
     ///The type of the map that indicates which nodes are reached.
- 
+
     ///The type of the map that indicates which nodes are reached.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -89 +89 @@
     typedef typename Digraph::template NodeMap<bool> ReachedMap;
     ///Instantiates a ReachedMap.
- 
-    ///This function instantiates a \ref ReachedMap. 
+
+    ///This function instantiates a \ref ReachedMap.
     ///\param G is the digraph, to which
     ///we would like to define the \ref ReachedMap.
@@ -98 +98 @@
     }
     ///The type of the map that stores the dists of the nodes.
- 
+
     ///The type of the map that stores the dists of the nodes.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -104 +104 @@
     typedef typename Digraph::template NodeMap<int> DistMap;
     ///Instantiates a DistMap.
- 
-    ///This function instantiates a \ref DistMap. 
+
+    ///This function instantiates a \ref DistMap.
     ///\param G is the digraph, to which we would like to define the \ref DistMap
     static DistMap *createDistMap(const GR &G)
@@ -112 +112 @@
     }
   };
-  
+
   ///%DFS algorithm class.
-  
+
   ///\ingroup search
   ///This class provides an efficient implementation of the %DFS algorithm.
@@ -128 +128 @@
 #ifdef DOXYGEN
   template <typename GR,
-            typename TR>
+            typename TR>
 #else
   template <typename GR=ListDigraph,
-            typename TR=DfsDefaultTraits<GR> >
+            typename TR=DfsDefaultTraits<GR> >
 #endif
   class Dfs {
@@ -144 +144 @@
     public:
       virtual const char* what() const throw() {
-        return "lemon::Dfs::UninitializedParameter";
+        return "lemon::Dfs::UninitializedParameter";
       }
     };
@@ -159 +159 @@
     ///\e
     typedef typename Digraph::OutArcIt OutArcIt;
-    
+
     ///\brief The type of the map that stores the last
     ///arcs of the %DFS paths.
@@ -193 +193 @@
 
     ///Creates the maps if necessary.
-    
+
     ///\todo Better memory allocation (instead of new).
-    void create_maps() 
+    void create_maps()
     {
       if(!_pred) {
-        local_pred = true;
-        _pred = Traits::createPredMap(*G);
+        local_pred = true;
+        _pred = Traits::createPredMap(*G);
       }
       if(!_dist) {
-        local_dist = true;
-        _dist = Traits::createDistMap(*G);
+        local_dist = true;
+        _dist = Traits::createDistMap(*G);
       }
       if(!_reached) {
-        local_reached = true;
-        _reached = Traits::createReachedMap(*G);
+        local_reached = true;
+        _reached = Traits::createReachedMap(*G);
       }
       if(!_processed) {
-        local_processed = true;
-        _processed = Traits::createProcessedMap(*G);
+        local_processed = true;
+        _processed = Traits::createProcessedMap(*G);
       }
     }
@@ -218 +218 @@
 
     Dfs() {}
-    
+
   public:
 
@@ -230 +230 @@
     struct DefPredMapTraits : public Traits {
       typedef T PredMap;
-      static PredMap *createPredMap(const Digraph &G) 
+      static PredMap *createPredMap(const Digraph &G)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -244 +244 @@
       typedef Dfs<Digraph, DefPredMapTraits<T> > Create;
     };
-    
-    
+
+
     template <class T>
     struct DefDistMapTraits : public Traits {
       typedef T DistMap;
-      static DistMap *createDistMap(const Digraph &) 
+      static DistMap *createDistMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -263 +263 @@
       typedef Dfs<Digraph, DefDistMapTraits<T> > Create;
     };
-    
+
     template <class T>
     struct DefReachedMapTraits : public Traits {
       typedef T ReachedMap;
-      static ReachedMap *createReachedMap(const Digraph &) 
+      static ReachedMap *createReachedMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -285 +285 @@
     struct DefProcessedMapTraits : public Traits {
       typedef T ProcessedMap;
-      static ProcessedMap *createProcessedMap(const Digraph &) 
+      static ProcessedMap *createProcessedMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -296 +296 @@
     ///
     template <class T>
-    struct DefProcessedMap : public Dfs< Digraph, DefProcessedMapTraits<T> > { 
+    struct DefProcessedMap : public Dfs< Digraph, DefProcessedMapTraits<T> > {
       typedef Dfs< Digraph, DefProcessedMapTraits<T> > Create;
     };
-    
+
     struct DefDigraphProcessedMapTraits : public Traits {
       typedef typename Digraph::template NodeMap<bool> ProcessedMap;
-      static ProcessedMap *createProcessedMap(const Digraph &G) 
+      static ProcessedMap *createProcessedMap(const Digraph &G)
       {
-        return new ProcessedMap(G);
+        return new ProcessedMap(G);
       }
     };
@@ -315 +315 @@
     template <class T>
     class DefProcessedMapToBeDefaultMap :
-      public Dfs< Digraph, DefDigraphProcessedMapTraits> { 
+      public Dfs< Digraph, DefDigraphProcessedMapTraits> {
       typedef Dfs< Digraph, DefDigraphProcessedMapTraits> Create;
     };
-    
+
     ///@}
 
-  public:      
-    
+  public:
+
     ///Constructor.
-    
+
     ///\param _G the digraph the algorithm will run on.
     ///
@@ -334 +334 @@
       _processed(NULL), local_processed(false)
     { }
-    
+
     ///Destructor.
-    ~Dfs() 
+    ~Dfs()
     {
       if(local_pred) delete _pred;
@@ -351 +351 @@
     ///automatically allocated map, of course.
     ///\return <tt> (*this) </tt>
-    Dfs &predMap(PredMap &m) 
+    Dfs &predMap(PredMap &m)
     {
       if(local_pred) {
-        delete _pred;
-        local_pred=false;
+        delete _pred;
+        local_pred=false;
       }
       _pred = &m;
@@ -368 +368 @@
     ///automatically allocated map, of course.
     ///\return <tt> (*this) </tt>
-    Dfs &distMap(DistMap &m) 
+    Dfs &distMap(DistMap &m)
     {
       if(local_dist) {
-        delete _dist;
-        local_dist=false;
+        delete _dist;
+        local_dist=false;
       }
       _dist = &m;
@@ -385 +385 @@
     ///automatically allocated map, of course.
     ///\return <tt> (*this) </tt>
-    Dfs &reachedMap(ReachedMap &m) 
+    Dfs &reachedMap(ReachedMap &m)
     {
       if(local_reached) {
-        delete _reached;
-        local_reached=false;
+        delete _reached;
+        local_reached=false;
       }
       _reached = &m;
@@ -402 +402 @@
     ///automatically allocated map, of course.
     ///\return <tt> (*this) </tt>
-    Dfs &processedMap(ProcessedMap &m) 
+    Dfs &processedMap(ProcessedMap &m)
     {
       if(local_processed) {
-        delete _processed;
-        local_processed=false;
+        delete _processed;
+        local_processed=false;
       }
       _processed = &m;
@@ -435 +435 @@
       _stack_head=-1;
       for ( NodeIt u(*G) ; u!=INVALID ; ++u ) {
-        _pred->set(u,INVALID);
-        // _predNode->set(u,INVALID);
-        _reached->set(u,false);
-        _processed->set(u,false);
-      }
-    }
-    
+        _pred->set(u,INVALID);
+        // _predNode->set(u,INVALID);
+        _reached->set(u,false);
+        _processed->set(u,false);
+      }
+    }
+
     ///Adds a new source node.
 
@@ -451 +451 @@
     {
       if(!(*_reached)[s])
-        {
-          _reached->set(s,true);
-          _pred->set(s,INVALID);
-          OutArcIt e(*G,s);
-          if(e!=INVALID) {
-            _stack[++_stack_head]=e;
-            _dist->set(s,_stack_head);
-          }
-          else {
-            _processed->set(s,true);
-            _dist->set(s,0);
-          }
-        }
-    }
-    
+        {
+          _reached->set(s,true);
+          _pred->set(s,INVALID);
+          OutArcIt e(*G,s);
+          if(e!=INVALID) {
+            _stack[++_stack_head]=e;
+            _dist->set(s,_stack_head);
+          }
+          else {
+            _processed->set(s,true);
+            _dist->set(s,0);
+          }
+        }
+    }
+
     ///Processes the next arc.
 
@@ -474 +474 @@
     ///\pre The stack must not be empty!
     Arc processNextArc()
-    { 
+    {
       Node m;
       Arc e=_stack[_stack_head];
       if(!(*_reached)[m=G->target(e)]) {
-        _pred->set(m,e);
-        _reached->set(m,true);
-        ++_stack_head;
-        _stack[_stack_head] = OutArcIt(*G, m);
-        _dist->set(m,_stack_head);
+        _pred->set(m,e);
+        _reached->set(m,true);
+        ++_stack_head;
+        _stack[_stack_head] = OutArcIt(*G, m);
+        _dist->set(m,_stack_head);
       }
       else {
-        m=G->source(e);
-        ++_stack[_stack_head];
+        m=G->source(e);
+        ++_stack[_stack_head];
       }
       while(_stack_head>=0 && _stack[_stack_head]==INVALID) {
-        _processed->set(m,true);
-        --_stack_head;
-        if(_stack_head>=0) {
-          m=G->source(_stack[_stack_head]);
-          ++_stack[_stack_head];
-        }
+        _processed->set(m,true);
+        --_stack_head;
+        if(_stack_head>=0) {
+          m=G->source(_stack[_stack_head]);
+          ++_stack[_stack_head];
+        }
       }
       return e;
@@ -505 +505 @@
     /// empty.
     OutArcIt nextArc()
-    { 
+    {
       return _stack_head>=0?_stack[_stack_head]:INVALID;
     }
@@ -516 +516 @@
     bool emptyQueue() { return _stack_head<0; }
     ///Returns the number of the nodes to be processed.
-    
+
     ///Returns the number of the nodes to be processed in the queue.
     int queueSize() { return _stack_head+1; }
-    
+
     ///Executes the algorithm.
 
@@ -538 +538 @@
       while ( !emptyQueue() ) processNextArc();
     }
-    
+
     ///Executes the algorithm until \c dest is reached.
 
@@ -555 +555 @@
     void start(Node dest)
     {
-      while ( !emptyQueue() && G->target(_stack[_stack_head])!=dest ) 
-        processNextArc();
-    }
-    
+      while ( !emptyQueue() && G->target(_stack[_stack_head])!=dest )
+        processNextArc();
+    }
+
     ///Executes the algorithm until a condition is met.
 
@@ -583 +583 @@
 
     ///Runs %DFS algorithm to visit all nodes in the digraph.
-    
+
     ///This method runs the %DFS algorithm in order to
     ///compute the
@@ -611 +611 @@
 
     ///Runs %DFS algorithm from node \c s.
-    
+
     ///This method runs the %DFS algorithm from a root node \c s
     ///in order to
@@ -630 +630 @@
       start();
     }
-    
+
     ///Finds the %DFS path between \c s and \c t.
-    
+
     ///Finds the %DFS path between \c s and \c t.
     ///
@@ -650 +650 @@
       return reached(t)?_stack_head+1:0;
     }
-    
+
     ///@}
 
@@ -658 +658 @@
     ///Before the use of these functions,
     ///either run() or start() must be called.
-    
+
     ///@{
 
@@ -664 +664 @@
 
     ///Gives back the shortest path.
-    
+
     ///Gives back the shortest path.
     ///\pre The \c t should be reachable from the source.
-    Path path(Node t) 
+    Path path(Node t)
     {
       return Path(*G, *_pred, t);
@@ -676 +676 @@
     ///Returns the distance of a node from the root(s).
     ///\pre \ref run() must be called before using this function.
-    ///\warning If node \c v is unreachable from the root(s) then the return 
+    ///\warning If node \c v is unreachable from the root(s) then the return
     ///value of this funcion is undefined.
     int dist(Node v) const { return (*_dist)[v]; }
@@ -706 +706 @@
     ///using this function.
     Node predNode(Node v) const { return (*_pred)[v]==INVALID ? INVALID:
-                                  G->source((*_pred)[v]); }
-    
+                                  G->source((*_pred)[v]); }
+
     ///Returns a reference to the NodeMap of distances.
 
@@ -714 +714 @@
     ///be called before using this function.
     const DistMap &distMap() const { return *_dist;}
- 
+
     ///Returns a reference to the %DFS arc-tree map.
 
@@ -722 +722 @@
     ///must be called before using this function.
     const PredMap &predMap() const { return *_pred;}
- 
+
     ///Checks if a node is reachable from the root.
 
@@ -731 +731 @@
     ///
     bool reached(Node v) { return (*_reached)[v]; }
-    
+
     ///@}
   };
@@ -742 +742 @@
   struct DfsWizardDefaultTraits
   {
-    ///The digraph type the algorithm runs on. 
+    ///The digraph type the algorithm runs on.
     typedef GR Digraph;
     ///\brief The type of the map that stores the last
     ///arcs of the %DFS paths.
-    /// 
+    ///
     ///The type of the map that stores the last
     ///arcs of the %DFS paths.
@@ -753 +753 @@
     typedef NullMap<typename Digraph::Node,typename GR::Arc> PredMap;
     ///Instantiates a PredMap.
- 
-    ///This function instantiates a \ref PredMap. 
+
+    ///This function instantiates a \ref PredMap.
     ///\param g is the digraph, to which we would like to define the PredMap.
     ///\todo The digraph alone may be insufficient to initialize
 #ifdef DOXYGEN
-    static PredMap *createPredMap(const GR &g) 
+    static PredMap *createPredMap(const GR &g)
 #else
-    static PredMap *createPredMap(const GR &) 
+    static PredMap *createPredMap(const GR &)
 #endif
     {
@@ -767 +767 @@
 
     ///The type of the map that indicates which nodes are processed.
- 
+
     ///The type of the map that indicates which nodes are processed.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -773 +773 @@
     typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
     ///Instantiates a ProcessedMap.
- 
-    ///This function instantiates a \ref ProcessedMap. 
+
+    ///This function instantiates a \ref ProcessedMap.
     ///\param g is the digraph, to which
     ///we would like to define the \ref ProcessedMap
@@ -786 +786 @@
     }
     ///The type of the map that indicates which nodes are reached.
- 
+
     ///The type of the map that indicates which nodes are reached.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -792 +792 @@
     typedef typename Digraph::template NodeMap<bool> ReachedMap;
     ///Instantiates a ReachedMap.
- 
-    ///This function instantiates a \ref ReachedMap. 
+
+    ///This function instantiates a \ref ReachedMap.
     ///\param G is the digraph, to which
     ///we would like to define the \ref ReachedMap.
@@ -801 +801 @@
     }
     ///The type of the map that stores the dists of the nodes.
- 
+
     ///The type of the map that stores the dists of the nodes.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -807 +807 @@
     typedef NullMap<typename Digraph::Node,int> DistMap;
     ///Instantiates a DistMap.
- 
-    ///This function instantiates a \ref DistMap. 
+
+    ///This function instantiates a \ref DistMap.
     ///\param g is the digraph, to which we would like to define the \ref DistMap
 #ifdef DOXYGEN
@@ -819 +819 @@
     }
   };
-  
+
   /// Default traits used by \ref DfsWizard
 
@@ -849 +849 @@
     ///Pointer to the source node.
     Node _source;
-    
+
     public:
     /// Constructor.
-    
+
     /// This constructor does not require parameters, therefore it initiates
     /// all of the attributes to default values (0, INVALID).
     DfsWizardBase() : _g(0), _reached(0), _processed(0), _pred(0),
-                           _dist(0), _source(INVALID) {}
+                           _dist(0), _source(INVALID) {}
 
     /// Constructor.
-    
+
     /// This constructor requires some parameters,
     /// listed in the parameters list.
@@ -866 +866 @@
     /// \param s is the initial value of  \ref _source
     DfsWizardBase(const GR &g, Node s=INVALID) :
-      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))), 
+      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
       _reached(0), _processed(0), _pred(0), _dist(0), _source(s) {}
 
   };
-  
+
   /// A class to make the usage of the Dfs algorithm easier
 
@@ -905 +905 @@
     //\e
     typedef typename Digraph::OutArcIt OutArcIt;
-    
+
     ///\brief The type of the map that stores
     ///the reached nodes
@@ -935 +935 @@
 
     ///Runs Dfs algorithm from a given node.
-    
+
     ///Runs Dfs algorithm from a given node.
     ///The node can be given by the \ref source function.
@@ -942 +942 @@
       if(Base::_source==INVALID) throw UninitializedParameter();
       Dfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g));
-      if(Base::_reached) 
+      if(Base::_reached)
         alg.reachedMap(*reinterpret_cast<ReachedMap*>(Base::_reached));
-      if(Base::_processed) 
+      if(Base::_processed)
         alg.processedMap(*reinterpret_cast<ProcessedMap*>(Base::_processed));
-      if(Base::_pred) 
+      if(Base::_pred)
         alg.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
-      if(Base::_dist) 
+      if(Base::_dist)
         alg.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
       alg.run(Base::_source);
@@ -969 +969 @@
       DefPredMapBase(const TR &b) : TR(b) {}
     };
-    
+
     ///\brief \ref named-templ-param "Named parameter"
     ///function for setting PredMap type
@@ -977 +977 @@
     ///
     template<class T>
-    DfsWizard<DefPredMapBase<T> > predMap(const T &t) 
+    DfsWizard<DefPredMapBase<T> > predMap(const T &t)
     {
       Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DfsWizard<DefPredMapBase<T> >(*this);
     }
-    
- 
+
+
     template<class T>
     struct DefReachedMapBase : public Base {
@@ -990 +990 @@
       DefReachedMapBase(const TR &b) : TR(b) {}
     };
-    
+
     ///\brief \ref named-templ-param "Named parameter"
     ///function for setting ReachedMap
@@ -998 +998 @@
     ///
     template<class T>
-    DfsWizard<DefReachedMapBase<T> > reachedMap(const T &t) 
+    DfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
     {
       Base::_reached=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DfsWizard<DefReachedMapBase<T> >(*this);
     }
-    
+
 
     template<class T>
@@ -1011 +1011 @@
       DefProcessedMapBase(const TR &b) : TR(b) {}
     };
-    
+
     ///\brief \ref named-templ-param "Named parameter"
     ///function for setting ProcessedMap
@@ -1019 +1019 @@
     ///
     template<class T>
-    DfsWizard<DefProcessedMapBase<T> > processedMap(const T &t) 
+    DfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
     {
       Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DfsWizard<DefProcessedMapBase<T> >(*this);
     }
-    
+
     template<class T>
     struct DefDistMapBase : public Base {
@@ -1031 +1031 @@
       DefDistMapBase(const TR &b) : TR(b) {}
     };
-    
+
     ///\brief \ref named-templ-param "Named parameter"
     ///function for setting DistMap type
@@ -1039 +1039 @@
     ///
     template<class T>
-    DfsWizard<DefDistMapBase<T> > distMap(const T &t) 
+    DfsWizard<DefDistMapBase<T> > distMap(const T &t)
     {
       Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DfsWizard<DefDistMapBase<T> >(*this);
     }
-    
+
     /// Sets the source node, from which the Dfs algorithm runs.
 
     /// Sets the source node, from which the Dfs algorithm runs.
     /// \param s is the source node.
-    DfsWizard<TR> &source(Node s) 
+    DfsWizard<TR> &source(Node s)
     {
       Base::_source=s;
       return *this;
     }
-    
+
   };
-  
+
   ///Function type interface for Dfs algorithm.
 
@@ -1083 +1083 @@
 #ifdef DOXYGEN
   /// \brief Visitor class for dfs.
-  ///  
-  /// It gives a simple interface for a functional interface for dfs 
-  /// traversal. The traversal on a linear data structure. 
+  ///
+  /// It gives a simple interface for a functional interface for dfs
+  /// traversal. The traversal on a linear data structure.
   template <typename _Digraph>
   struct DfsVisitor {
@@ -1092 +1092 @@
     typedef typename Digraph::Node Node;
     /// \brief Called when the arc reach a node.
-    /// 
+    ///
     /// It is called when the dfs find an arc which target is not
     /// reached yet.
     void discover(const Arc& arc) {}
     /// \brief Called when the node reached first time.
-    /// 
+    ///
     /// It is Called when the node reached first time.
     void reach(const Node& node) {}
     /// \brief Called when we step back on an arc.
-    /// 
+    ///
     /// It is called when the dfs should step back on the arc.
     void backtrack(const Arc& arc) {}
     /// \brief Called when we step back from the node.
-    /// 
+    ///
     /// It is called when we step back from the node.
     void leave(const Node& node) {}
-    /// \brief Called when the arc examined but target of the arc 
+    /// \brief Called when the arc examined but target of the arc
     /// already discovered.
-    /// 
-    /// It called when the arc examined but the target of the arc 
+    ///
+    /// It called when the arc examined but the target of the arc
     /// already discovered.
     void examine(const Arc& arc) {}
     /// \brief Called for the source node of the dfs.
-    /// 
+    ///
     /// It is called for the source node of the dfs.
     void start(const Node& node) {}
     /// \brief Called when we leave the source node of the dfs.
-    /// 
+    ///
     /// It is called when we leave the source node of the dfs.
     void stop(const Node& node) {}
@@ -1141 +1141 @@
     struct Constraints {
       void constraints() {
-        Arc arc;
-        Node node;
-        visitor.discover(arc);
-        visitor.reach(node);
-        visitor.backtrack(arc);
-        visitor.leave(node);
-        visitor.examine(arc);
-        visitor.start(node);
-        visitor.stop(arc);
+        Arc arc;
+        Node node;
+        visitor.discover(arc);
+        visitor.reach(node);
+        visitor.backtrack(arc);
+        visitor.leave(node);
+        visitor.examine(arc);
+        visitor.start(node);
+        visitor.stop(arc);
       }
       _Visitor& visitor;
@@ -1163 +1163 @@
   struct DfsVisitDefaultTraits {
 
-    /// \brief The digraph type the algorithm runs on. 
+    /// \brief The digraph type the algorithm runs on.
     typedef _Digraph Digraph;
 
     /// \brief The type of the map that indicates which nodes are reached.
-    /// 
+    ///
     /// The type of the map that indicates which nodes are reached.
     /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -1175 +1175 @@
     /// \brief Instantiates a ReachedMap.
     ///
-    /// This function instantiates a \ref ReachedMap. 
+    /// This function instantiates a \ref ReachedMap.
     /// \param digraph is the digraph, to which
     /// we would like to define the \ref ReachedMap.
@@ -1183 +1183 @@
 
   };
-  
+
   /// %DFS Visit algorithm class.
-  
+
   /// \ingroup search
   /// This class provides an efficient implementation of the %DFS algorithm
@@ -1192 +1192 @@
   /// The %DfsVisit class provides an alternative interface to the Dfs
   /// class. It works with callback mechanism, the DfsVisit object calls
-  /// on every dfs event the \c Visitor class member functions. 
+  /// on every dfs event the \c Visitor class member functions.
   ///
   /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
   /// \ref ListDigraph. The value of _Digraph is not used directly by Dfs, it
   /// is only passed to \ref DfsDefaultTraits.
-  /// \tparam _Visitor The Visitor object for the algorithm. The 
+  /// \tparam _Visitor The Visitor object for the algorithm. The
   /// \ref DfsVisitor "DfsVisitor<_Digraph>" is an empty Visitor which
   /// does not observe the Dfs events. If you want to observe the dfs
   /// events you should implement your own Visitor class.
-  /// \tparam _Traits Traits class to set various data types used by the 
+  /// \tparam _Traits Traits class to set various data types used by the
   /// algorithm. The default traits class is
   /// \ref DfsVisitDefaultTraits "DfsVisitDefaultTraits<_Digraph>".
@@ -1212 +1212 @@
 #else
   template <typename _Digraph = ListDigraph,
-            typename _Visitor = DfsVisitor<_Digraph>,
-            typename _Traits = DfsDefaultTraits<_Digraph> >
+            typename _Visitor = DfsVisitor<_Digraph>,
+            typename _Traits = DfsDefaultTraits<_Digraph> >
 #endif
   class DfsVisit {
   public:
-    
+
     /// \brief \ref Exception for uninitialized parameters.
     ///
@@ -1224 +1224 @@
     class UninitializedParameter : public lemon::UninitializedParameter {
     public:
-      virtual const char* what() const throw() 
+      virtual const char* what() const throw()
       {
-        return "lemon::DfsVisit::UninitializedParameter";
+        return "lemon::DfsVisit::UninitializedParameter";
       }
     };
@@ -1263 +1263 @@
     void create_maps() {
       if(!_reached) {
-        local_reached = true;
-        _reached = Traits::createReachedMap(*_digraph);
+        local_reached = true;
+        _reached = Traits::createReachedMap(*_digraph);
       }
     }
@@ -1271 +1271 @@
 
     DfsVisit() {}
-    
+
   public:
 
@@ -1283 +1283 @@
       typedef T ReachedMap;
       static ReachedMap *createReachedMap(const Digraph &digraph) {
-        throw UninitializedParameter();
-      }
-    };
-    /// \brief \ref named-templ-param "Named parameter" for setting 
+        throw UninitializedParameter();
+      }
+    };
+    /// \brief \ref named-templ-param "Named parameter" for setting
     /// ReachedMap type
     ///
@@ -1292 +1292 @@
     template <class T>
     struct DefReachedMap : public DfsVisit< Digraph, Visitor,
-                                            DefReachedMapTraits<T> > {
+                                            DefReachedMapTraits<T> > {
       typedef DfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
     };
     ///@}
 
-  public:      
-    
+  public:
+
     /// \brief Constructor.
     ///
@@ -1306 +1306 @@
     /// \param visitor The visitor of the algorithm.
     ///
-    DfsVisit(const Digraph& digraph, Visitor& visitor) 
+    DfsVisit(const Digraph& digraph, Visitor& visitor)
       : _digraph(&digraph), _visitor(&visitor),
-        _reached(0), local_reached(false) {}
-    
+        _reached(0), local_reached(false) {}
+
     /// \brief Destructor.
     ///
@@ -1326 +1326 @@
     DfsVisit &reachedMap(ReachedMap &m) {
       if(local_reached) {
-        delete _reached;
-        local_reached=false;
+        delete _reached;
+        local_reached=false;
       }
       _reached = &m;
@@ -1354 +1354 @@
       _stack_head = -1;
       for (NodeIt u(*_digraph) ; u != INVALID ; ++u) {
-        _reached->set(u, false);
-      }
-    }
-    
+        _reached->set(u, false);
+      }
+    }
+
     /// \brief Adds a new source node.
     ///
@@ -1363 +1363 @@
     void addSource(Node s) {
       if(!(*_reached)[s]) {
-          _reached->set(s,true);
-          _visitor->start(s);
-          _visitor->reach(s);
-          Arc e; 
-          _digraph->firstOut(e, s);
-          if (e != INVALID) {
-            _stack[++_stack_head] = e;
-          } else {
-            _visitor->leave(s);
-          }
-        }
-    }
-    
+          _reached->set(s,true);
+          _visitor->start(s);
+          _visitor->reach(s);
+          Arc e;
+          _digraph->firstOut(e, s);
+          if (e != INVALID) {
+            _stack[++_stack_head] = e;
+          } else {
+            _visitor->leave(s);
+          }
+        }
+    }
+
     /// \brief Processes the next arc.
     ///
@@ -1383 +1383 @@
     ///
     /// \pre The stack must not be empty!
-    Arc processNextArc() { 
+    Arc processNextArc() {
       Arc e = _stack[_stack_head];
       Node m = _digraph->target(e);
       if(!(*_reached)[m]) {
-        _visitor->discover(e);
-        _visitor->reach(m);
-        _reached->set(m, true);
-        _digraph->firstOut(_stack[++_stack_head], m);
+        _visitor->discover(e);
+        _visitor->reach(m);
+        _reached->set(m, true);
+        _digraph->firstOut(_stack[++_stack_head], m);
       } else {
-        _visitor->examine(e);
-        m = _digraph->source(e);
-        _digraph->nextOut(_stack[_stack_head]);
+        _visitor->examine(e);
+        m = _digraph->source(e);
+        _digraph->nextOut(_stack[_stack_head]);
       }
       while (_stack_head>=0 && _stack[_stack_head] == INVALID) {
-        _visitor->leave(m);
-        --_stack_head;
-        if (_stack_head >= 0) {
-          _visitor->backtrack(_stack[_stack_head]);
-          m = _digraph->source(_stack[_stack_head]);
-          _digraph->nextOut(_stack[_stack_head]);
-        } else {
-          _visitor->stop(m);      
-        }
+        _visitor->leave(m);
+        --_stack_head;
+        if (_stack_head >= 0) {
+          _visitor->backtrack(_stack[_stack_head]);
+          m = _digraph->source(_stack[_stack_head]);
+          _digraph->nextOut(_stack[_stack_head]);
+        } else {
+          _visitor->stop(m);
+        }
       }
       return e;
@@ -1416 +1416 @@
     /// \return The next arc to be processed or INVALID if the stack is
     /// empty.
-    Arc nextArc() { 
+    Arc nextArc() {
       return _stack_head >= 0 ? _stack[_stack_head] : INVALID;
     }
@@ -1431 +1431 @@
     /// Returns the number of the nodes to be processed in the queue.
     int queueSize() { return _stack_head + 1; }
-    
+
     /// \brief Executes the algorithm.
     ///
@@ -1441 +1441 @@
       while ( !emptyQueue() ) processNextArc();
     }
-    
+
     /// \brief Executes the algorithm until \c dest is reached.
     ///
@@ -1449 +1449 @@
     /// with addSource() before using this function.
     void start(Node dest) {
-      while ( !emptyQueue() && _digraph->target(_stack[_stack_head]) != dest ) 
-        processNextArc();
-    }
-    
+      while ( !emptyQueue() && _digraph->target(_stack[_stack_head]) != dest )
+        processNextArc();
+    }
+
     /// \brief Executes the algorithm until a condition is met.
     ///
@@ -1491 +1491 @@
 
     /// \brief Runs %DFSVisit algorithm to visit all nodes in the digraph.
-    
+
     /// This method runs the %DFS algorithm in order to
     /// compute the %DFS path to each node. The algorithm computes

lemon/dijkstra.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -35 +35 @@
 
   /// \brief Default OperationTraits for the Dijkstra algorithm class.
-  ///  
+  ///
   /// It defines all computational operations and constants which are
   /// used in the Dijkstra algorithm.
@@ -55 +55 @@
 
   /// \brief Widest path OperationTraits for the Dijkstra algorithm class.
-  ///  
+  ///
   /// It defines all computational operations and constants which are
   /// used in the Dijkstra algorithm for widest path computation.
@@ -73 +73 @@
     }
   };
-  
+
   ///Default traits class of Dijkstra class.
 
@@ -82 +82 @@
   struct DijkstraDefaultTraits
   {
-    ///The digraph type the algorithm runs on. 
+    ///The digraph type the algorithm runs on.
     typedef GR Digraph;
     ///The type of the map that stores the arc lengths.
@@ -104 +104 @@
     ///Instantiates a HeapCrossRef.
 
-    ///This function instantiates a \c HeapCrossRef. 
-    /// \param G is the digraph, to which we would like to define the 
+    ///This function instantiates a \c HeapCrossRef.
+    /// \param G is the digraph, to which we would like to define the
     /// HeapCrossRef.
-    static HeapCrossRef *createHeapCrossRef(const GR &G) 
+    static HeapCrossRef *createHeapCrossRef(const GR &G)
     {
       return new HeapCrossRef(G);
     }
-    
+
     ///The heap type used by Dijkstra algorithm.
 
@@ -120 +120 @@
     typedef BinHeap<typename LM::Value, HeapCrossRef, std::less<Value> > Heap;
 
-    static Heap *createHeap(HeapCrossRef& R) 
+    static Heap *createHeap(HeapCrossRef& R)
     {
       return new Heap(R);
@@ -127 +127 @@
     ///\brief The type of the map that stores the last
     ///arcs of the shortest paths.
-    /// 
+    ///
     ///The type of the map that stores the last
     ///arcs of the shortest paths.
@@ -134 +134 @@
     typedef typename Digraph::template NodeMap<typename GR::Arc> PredMap;
     ///Instantiates a PredMap.
- 
-    ///This function instantiates a \c PredMap. 
+
+    ///This function instantiates a \c PredMap.
     ///\param G is the digraph, to which we would like to define the PredMap.
     ///\todo The digraph alone may be insufficient for the initialization
-    static PredMap *createPredMap(const GR &G) 
+    static PredMap *createPredMap(const GR &G)
     {
       return new PredMap(G);
@@ -144 +144 @@
 
     ///The type of the map that stores whether a nodes is processed.
- 
+
     ///The type of the map that stores whether a nodes is processed.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -153 +153 @@
     typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
     ///Instantiates a ProcessedMap.
- 
-    ///This function instantiates a \c ProcessedMap. 
+
+    ///This function instantiates a \c ProcessedMap.
     ///\param g is the digraph, to which
     ///we would like to define the \c ProcessedMap
@@ -166 +166 @@
     }
     ///The type of the map that stores the dists of the nodes.
- 
+
     ///The type of the map that stores the dists of the nodes.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -172 +172 @@
     typedef typename Digraph::template NodeMap<typename LM::Value> DistMap;
     ///Instantiates a DistMap.
- 
-    ///This function instantiates a \ref DistMap. 
+
+    ///This function instantiates a \ref DistMap.
     ///\param G is the digraph, to which we would like to define the \ref DistMap
     static DistMap *createDistMap(const GR &G)
@@ -180 +180 @@
     }
   };
-  
+
   ///%Dijkstra algorithm class.
-  
+
   /// \ingroup shortest_path
   ///This class provides an efficient implementation of %Dijkstra algorithm.
@@ -203 +203 @@
   ///concepts::Digraph::ArcMap "Digraph::ArcMap<int>".  The value
   ///of LM is not used directly by Dijkstra, it is only passed to \ref
-  ///DijkstraDefaultTraits.  
+  ///DijkstraDefaultTraits.
   ///\tparam TR Traits class to set
   ///various data types used by the algorithm.  The default traits
@@ -215 +215 @@
 #else
   template <typename GR=ListDigraph,
-            typename LM=typename GR::template ArcMap<int>,
-            typename TR=DijkstraDefaultTraits<GR,LM> >
+            typename LM=typename GR::template ArcMap<int>,
+            typename TR=DijkstraDefaultTraits<GR,LM> >
 #endif
   class Dijkstra {
@@ -229 +229 @@
     public:
       virtual const char* what() const throw() {
-        return "lemon::Dijkstra::UninitializedParameter";
+        return "lemon::Dijkstra::UninitializedParameter";
       }
     };
@@ -244 +244 @@
     ///\e
     typedef typename Digraph::OutArcIt OutArcIt;
-    
+
     ///The type of the length of the arcs.
     typedef typename TR::LengthMap::Value Value;
@@ -289 +289 @@
 
     ///Creates the maps if necessary.
-    
+
     ///\todo Better memory allocation (instead of new).
-    void create_maps() 
+    void create_maps()
     {
       if(!_pred) {
-        local_pred = true;
-        _pred = Traits::createPredMap(*G);
+        local_pred = true;
+        _pred = Traits::createPredMap(*G);
       }
       if(!_dist) {
-        local_dist = true;
-        _dist = Traits::createDistMap(*G);
+        local_dist = true;
+        _dist = Traits::createDistMap(*G);
       }
       if(!_processed) {
-        local_processed = true;
-        _processed = Traits::createProcessedMap(*G);
+        local_processed = true;
+        _processed = Traits::createProcessedMap(*G);
       }
       if (!_heap_cross_ref) {
-        local_heap_cross_ref = true;
-        _heap_cross_ref = Traits::createHeapCrossRef(*G);
+        local_heap_cross_ref = true;
+        _heap_cross_ref = Traits::createHeapCrossRef(*G);
       }
       if (!_heap) {
-        local_heap = true;
-        _heap = Traits::createHeap(*_heap_cross_ref);
-      }
-    }
-    
+        local_heap = true;
+        _heap = Traits::createHeap(*_heap_cross_ref);
+      }
+    }
+
   public :
 
     typedef Dijkstra Create;
- 
+
     ///\name Named template parameters
 
@@ -328 +328 @@
       static PredMap *createPredMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -336 +336 @@
     ///
     template <class T>
-    struct DefPredMap 
-      : public Dijkstra< Digraph,       LengthMap, DefPredMapTraits<T> > {
-      typedef Dijkstra< Digraph,        LengthMap, DefPredMapTraits<T> > Create;
-    };
-    
+    struct DefPredMap
+      : public Dijkstra< Digraph,        LengthMap, DefPredMapTraits<T> > {
+      typedef Dijkstra< Digraph,        LengthMap, DefPredMapTraits<T> > Create;
+    };
+
     template <class T>
     struct DefDistMapTraits : public Traits {
@@ -346 +346 @@
       static DistMap *createDistMap(const Digraph &)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -354 +354 @@
     ///
     template <class T>
-    struct DefDistMap 
-      : public Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > { 
+    struct DefDistMap
+      : public Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > {
       typedef Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > Create;
     };
-    
+
     template <class T>
     struct DefProcessedMapTraits : public Traits {
       typedef T ProcessedMap;
-      static ProcessedMap *createProcessedMap(const Digraph &G) 
+      static ProcessedMap *createProcessedMap(const Digraph &G)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -372 +372 @@
     ///
     template <class T>
-    struct DefProcessedMap 
-      : public Dijkstra< Digraph,       LengthMap, DefProcessedMapTraits<T> > { 
-      typedef Dijkstra< Digraph,        LengthMap, DefProcessedMapTraits<T> > Create;
-    };
-    
+    struct DefProcessedMap
+      : public Dijkstra< Digraph,        LengthMap, DefProcessedMapTraits<T> > {
+      typedef Dijkstra< Digraph,        LengthMap, DefProcessedMapTraits<T> > Create;
+    };
+
     struct DefDigraphProcessedMapTraits : public Traits {
       typedef typename Digraph::template NodeMap<bool> ProcessedMap;
-      static ProcessedMap *createProcessedMap(const Digraph &G) 
+      static ProcessedMap *createProcessedMap(const Digraph &G)
       {
-        return new ProcessedMap(G);
+        return new ProcessedMap(G);
       }
     };
@@ -391 +391 @@
     ///If you don't set it explicitely, it will be automatically allocated.
     template <class T>
-    struct DefProcessedMapToBeDefaultMap 
+    struct DefProcessedMapToBeDefaultMap
       : public Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> {
       typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> Create;
@@ -401 +401 @@
       typedef H Heap;
       static HeapCrossRef *createHeapCrossRef(const Digraph &) {
-        throw UninitializedParameter();
-      }
-      static Heap *createHeap(HeapCrossRef &) 
+        throw UninitializedParameter();
+      }
+      static Heap *createHeap(HeapCrossRef &)
       {
-        throw UninitializedParameter();
+        throw UninitializedParameter();
       }
     };
@@ -411 +411 @@
     ///heap and cross reference type
     ///
-    ///\ref named-templ-param "Named parameter" for setting heap and cross 
+    ///\ref named-templ-param "Named parameter" for setting heap and cross
     ///reference type
     ///
     template <class H, class CR = typename Digraph::template NodeMap<int> >
     struct DefHeap
-      : public Dijkstra< Digraph,       LengthMap, DefHeapTraits<H, CR> > { 
-      typedef Dijkstra< Digraph,        LengthMap, DefHeapTraits<H, CR> > Create;
+      : public Dijkstra< Digraph,        LengthMap, DefHeapTraits<H, CR> > {
+      typedef Dijkstra< Digraph,        LengthMap, DefHeapTraits<H, CR> > Create;
     };
 
@@ -425 +425 @@
       typedef H Heap;
       static HeapCrossRef *createHeapCrossRef(const Digraph &G) {
-        return new HeapCrossRef(G);
-      }
-      static Heap *createHeap(HeapCrossRef &R) 
+        return new HeapCrossRef(G);
+      }
+      static Heap *createHeap(HeapCrossRef &R)
       {
-        return new Heap(R);
+        return new Heap(R);
       }
     };
@@ -435 +435 @@
     ///heap and cross reference type with automatic allocation
     ///
-    ///\ref named-templ-param "Named parameter" for setting heap and cross 
-    ///reference type. It can allocate the heap and the cross reference 
-    ///object if the cross reference's constructor waits for the digraph as 
+    ///\ref named-templ-param "Named parameter" for setting heap and cross
+    ///reference type. It can allocate the heap and the cross reference
+    ///object if the cross reference's constructor waits for the digraph as
     ///parameter and the heap's constructor waits for the cross reference.
     template <class H, class CR = typename Digraph::template NodeMap<int> >
     struct DefStandardHeap
-      : public Dijkstra< Digraph,       LengthMap, DefStandardHeapTraits<H, CR> > { 
-      typedef Dijkstra< Digraph,        LengthMap, DefStandardHeapTraits<H, CR> > 
+      : public Dijkstra< Digraph,        LengthMap, DefStandardHeapTraits<H, CR> > {
+      typedef Dijkstra< Digraph,        LengthMap, DefStandardHeapTraits<H, CR> >
       Create;
     };
@@ -450 +450 @@
       typedef T OperationTraits;
     };
-    
-    /// \brief \ref named-templ-param "Named parameter" for setting 
+
+    /// \brief \ref named-templ-param "Named parameter" for setting
     /// OperationTraits type
     ///
@@ -462 +462 @@
       Create;
     };
-    
+
     ///@}
 
@@ -470 +470 @@
     Dijkstra() {}
 
-  public:      
-    
+  public:
+
     ///Constructor.
-    
+
     ///\param _G the digraph the algorithm will run on.
     ///\param _length the length map used by the algorithm.
@@ -484 +484 @@
       _heap(NULL), local_heap(false)
     { }
-    
+
     ///Destructor.
-    ~Dijkstra() 
+    ~Dijkstra()
     {
       if(local_pred) delete _pred;
@@ -499 +499 @@
     ///Sets the length map.
     ///\return <tt> (*this) </tt>
-    Dijkstra &lengthMap(const LengthMap &m) 
+    Dijkstra &lengthMap(const LengthMap &m)
     {
       length = &m;
@@ -512 +512 @@
     ///automatically allocated map, of course.
     ///\return <tt> (*this) </tt>
-    Dijkstra &predMap(PredMap &m) 
+    Dijkstra &predMap(PredMap &m)
     {
       if(local_pred) {
-        delete _pred;
-        local_pred=false;
+        delete _pred;
+        local_pred=false;
       }
       _pred = &m;
@@ -529 +529 @@
     ///automatically allocated map, of course.
     ///\return <tt> (*this) </tt>
-    Dijkstra &distMap(DistMap &m) 
+    Dijkstra &distMap(DistMap &m)
     {
       if(local_dist) {
-        delete _dist;
-        local_dist=false;
+        delete _dist;
+        local_dist=false;
       }
       _dist = &m;
@@ -549 +549 @@
     {
       if(local_heap_cross_ref) {
-        delete _heap_cross_ref;
-        local_heap_cross_ref=false;
+        delete _heap_cross_ref;
+        local_heap_cross_ref=false;
       }
       _heap_cross_ref = &cr;
       if(local_heap) {
-        delete _heap;
-        local_heap=false;
+        delete _heap;
+        local_heap=false;
       }
       _heap = &hp;
@@ -593 +593 @@
       _heap->clear();
       for ( NodeIt u(*G) ; u!=INVALID ; ++u ) {
-        _pred->set(u,INVALID);
-        _processed->set(u,false);
-        _heap_cross_ref->set(u,Heap::PRE_HEAP);
-      }
-    }
-    
+        _pred->set(u,INVALID);
+        _processed->set(u,false);
+        _heap_cross_ref->set(u,Heap::PRE_HEAP);
+      }
+    }
+
     ///Adds a new source node.
 
@@ -611 +611 @@
     {
       if(_heap->state(s) != Heap::IN_HEAP) {
-        _heap->push(s,dst);
+        _heap->push(s,dst);
       } else if(OperationTraits::less((*_heap)[s], dst)) {
-        _heap->set(s,dst);
-        _pred->set(s,INVALID);
-      }
-    }
-    
+        _heap->set(s,dst);
+        _pred->set(s,INVALID);
+      }
+    }
+
     ///Processes the next node in the priority heap
 
@@ -627 +627 @@
     Node processNextNode()
     {
-      Node v=_heap->top(); 
+      Node v=_heap->top();
       Value oldvalue=_heap->prio();
       _heap->pop();
       finalizeNodeData(v,oldvalue);
-      
+
       for(OutArcIt e(*G,v); e!=INVALID; ++e) {
-        Node w=G->target(e); 
-        switch(_heap->state(w)) {
-        case Heap::PRE_HEAP:
-          _heap->push(w,OperationTraits::plus(oldvalue, (*length)[e])); 
-          _pred->set(w,e);
-          break;
-        case Heap::IN_HEAP:
-          {
-            Value newvalue = OperationTraits::plus(oldvalue, (*length)[e]);
-            if ( OperationTraits::less(newvalue, (*_heap)[w]) ) {
-              _heap->decrease(w, newvalue); 
-              _pred->set(w,e);
-            }
-          }
-          break;
-        case Heap::POST_HEAP:
-          break;
-        }
+        Node w=G->target(e);
+        switch(_heap->state(w)) {
+        case Heap::PRE_HEAP:
+          _heap->push(w,OperationTraits::plus(oldvalue, (*length)[e]));
+          _pred->set(w,e);
+          break;
+        case Heap::IN_HEAP:
+          {
+            Value newvalue = OperationTraits::plus(oldvalue, (*length)[e]);
+            if ( OperationTraits::less(newvalue, (*_heap)[w]) ) {
+              _heap->decrease(w, newvalue);
+              _pred->set(w,e);
+            }
+          }
+          break;
+        case Heap::POST_HEAP:
+          break;
+        }
       }
       return v;
@@ -656 +656 @@
 
     ///Next node to be processed.
-    
+
     ///Next node to be processed.
     ///
@@ -662 +662 @@
     /// is empty.
     Node nextNode()
-    { 
+    {
       return !_heap->empty()?_heap->top():INVALID;
     }
- 
+
     ///\brief Returns \c false if there are nodes
     ///to be processed in the priority heap
@@ -677 +677 @@
     ///
     int queueSize() { return _heap->size(); }
-    
+
     ///Executes the algorithm.
 
@@ -696 +696 @@
       while ( !_heap->empty() ) processNextNode();
     }
-    
+
     ///Executes the algorithm until \c dest is reached.
 
@@ -716 +716 @@
       if ( !_heap->empty() ) finalizeNodeData(_heap->top(),_heap->prio());
     }
-    
+
     ///Executes the algorithm until a condition is met.
 
@@ -737 +737 @@
       return _heap->top();
     }
-    
+
     ///Runs %Dijkstra algorithm from node \c s.
-    
+
     ///This method runs the %Dijkstra algorithm from a root node \c s
     ///in order to
@@ -758 +758 @@
       start();
     }
-    
+
     ///Finds the shortest path between \c s and \c t.
-    
+
     ///Finds the shortest path between \c s and \c t.
     ///
@@ -778 +778 @@
       return (*_pred)[t]==INVALID?OperationTraits::zero():(*_dist)[t];
     }
-    
+
     ///@}
 
@@ -786 +786 @@
     ///Before the use of these functions,
     ///either run() or start() must be called.
-    
+
     ///@{
 
     ///Gives back the shortest path.
-    
+
     ///Gives back the shortest path.
     ///\pre The \c t should be reachable from the source.
-    Path path(Node t) 
+    Path path(Node t)
     {
       return Path(*G, *_pred, t);
@@ -833 +833 @@
     ///using this function.
     Node predNode(Node v) const { return (*_pred)[v]==INVALID ? INVALID:
-                                  G->source((*_pred)[v]); }
-    
+                                  G->source((*_pred)[v]); }
+
     ///Returns a reference to the NodeMap of distances.
 
@@ -840 +840 @@
     ///be called before using this function.
     const DistMap &distMap() const { return *_dist;}
- 
+
     ///Returns a reference to the shortest path tree map.
 
@@ -847 +847 @@
     ///\pre \ref run() must be called before using this function.
     const PredMap &predMap() const { return *_pred;}
- 
+
     ///Checks if a node is reachable from the root.
 
@@ -863 +863 @@
     ///
     bool processed(Node v) { return (*_heap_cross_ref)[v] == Heap::POST_HEAP; }
-    
+
     ///@}
   };
@@ -870 +870 @@
 
 
- 
+
   ///Default traits class of Dijkstra function.
 
@@ -879 +879 @@
   struct DijkstraWizardDefaultTraits
   {
-    ///The digraph type the algorithm runs on. 
+    ///The digraph type the algorithm runs on.
     typedef GR Digraph;
     ///The type of the map that stores the arc lengths.
@@ -902 +902 @@
     ///Instantiates a HeapCrossRef.
 
-    ///This function instantiates a \ref HeapCrossRef. 
-    /// \param G is the digraph, to which we would like to define the 
+    ///This function instantiates a \ref HeapCrossRef.
+    /// \param G is the digraph, to which we would like to define the
     /// HeapCrossRef.
     /// \todo The digraph alone may be insufficient for the initialization
-    static HeapCrossRef *createHeapCrossRef(const GR &G) 
+    static HeapCrossRef *createHeapCrossRef(const GR &G)
     {
       return new HeapCrossRef(G);
     }
-    
+
     ///The heap type used by Dijkstra algorithm.
 
@@ -918 +918 @@
     ///\sa Dijkstra
     typedef BinHeap<typename LM::Value, typename GR::template NodeMap<int>,
-                    std::less<Value> > Heap;
-
-    static Heap *createHeap(HeapCrossRef& R) 
+                    std::less<Value> > Heap;
+
+    static Heap *createHeap(HeapCrossRef& R)
     {
       return new Heap(R);
@@ -927 +927 @@
     ///\brief The type of the map that stores the last
     ///arcs of the shortest paths.
-    /// 
+    ///
     ///The type of the map that stores the last
     ///arcs of the shortest paths.
@@ -934 +934 @@
     typedef NullMap <typename GR::Node,typename GR::Arc> PredMap;
     ///Instantiates a PredMap.
- 
-    ///This function instantiates a \ref PredMap. 
+
+    ///This function instantiates a \ref PredMap.
     ///\param g is the digraph, to which we would like to define the PredMap.
     ///\todo The digraph alone may be insufficient for the initialization
 #ifdef DOXYGEN
-    static PredMap *createPredMap(const GR &g) 
+    static PredMap *createPredMap(const GR &g)
 #else
-    static PredMap *createPredMap(const GR &) 
+    static PredMap *createPredMap(const GR &)
 #endif
     {
@@ -947 +947 @@
     }
     ///The type of the map that stores whether a nodes is processed.
- 
+
     ///The type of the map that stores whether a nodes is processed.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -956 +956 @@
     typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
     ///Instantiates a ProcessedMap.
- 
-    ///This function instantiates a \ref ProcessedMap. 
+
+    ///This function instantiates a \ref ProcessedMap.
     ///\param g is the digraph, to which
     ///we would like to define the \ref ProcessedMap
@@ -969 +969 @@
     }
     ///The type of the map that stores the dists of the nodes.
- 
+
     ///The type of the map that stores the dists of the nodes.
     ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
@@ -975 +975 @@
     typedef NullMap<typename Digraph::Node,typename LM::Value> DistMap;
     ///Instantiates a DistMap.
- 
-    ///This function instantiates a \ref DistMap. 
+
+    ///This function instantiates a \ref DistMap.
     ///\param g is the digraph, to which we would like to define the \ref DistMap
 #ifdef DOXYGEN
@@ -987 +987 @@
     }
   };
-  
+
   /// Default traits used by \ref DijkstraWizard
 
@@ -1019 +1019 @@
     public:
     /// Constructor.
-    
+
     /// This constructor does not require parameters, therefore it initiates
     /// all of the attributes to default values (0, INVALID).
     DijkstraWizardBase() : _g(0), _length(0), _pred(0),
-                           _dist(0), _source(INVALID) {}
+                           _dist(0), _source(INVALID) {}
 
     /// Constructor.
-    
+
     /// This constructor requires some parameters,
     /// listed in the parameters list.
@@ -1034 +1034 @@
     /// \param s is the initial value of  \ref _source
     DijkstraWizardBase(const GR &g,const LM &l, Node s=INVALID) :
-      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))), 
-      _length(reinterpret_cast<void*>(const_cast<LM*>(&l))), 
+      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
+      _length(reinterpret_cast<void*>(const_cast<LM*>(&l))),
       _pred(0), _dist(0), _source(s) {}
 
   };
-  
+
   /// A class to make the usage of Dijkstra algorithm easier
 
@@ -1057 +1057 @@
   ///
   /// It does not have own \ref run method. When its \ref run method is called
-  /// it initiates a plain \ref Dijkstra class, and calls the \ref 
+  /// it initiates a plain \ref Dijkstra class, and calls the \ref
   /// Dijkstra::run method of it.
   template<class TR>
@@ -1074 +1074 @@
     //\e
     typedef typename Digraph::OutArcIt OutArcIt;
-    
+
     ///The type of the map that stores the arc lengths.
     typedef typename TR::LengthMap LengthMap;
@@ -1103 +1103 @@
 
     ///Runs Dijkstra algorithm from a given node.
-    
+
     ///Runs Dijkstra algorithm from a given node.
     ///The node can be given by the \ref source function.
@@ -1109 +1109 @@
     {
       if(Base::_source==INVALID) throw UninitializedParameter();
-      Dijkstra<Digraph,LengthMap,TR> 
-        dij(*reinterpret_cast<const Digraph*>(Base::_g),
+      Dijkstra<Digraph,LengthMap,TR>
+        dij(*reinterpret_cast<const Digraph*>(Base::_g),
             *reinterpret_cast<const LengthMap*>(Base::_length));
       if(Base::_pred) dij.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
@@ -1133 +1133 @@
       DefPredMapBase(const TR &b) : TR(b) {}
     };
-    
+
     ///\brief \ref named-templ-param "Named parameter"
     ///function for setting PredMap type
@@ -1141 +1141 @@
     ///
     template<class T>
-    DijkstraWizard<DefPredMapBase<T> > predMap(const T &t) 
+    DijkstraWizard<DefPredMapBase<T> > predMap(const T &t)
     {
       Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DijkstraWizard<DefPredMapBase<T> >(*this);
     }
-    
+
     template<class T>
     struct DefDistMapBase : public Base {
@@ -1153 +1153 @@
       DefDistMapBase(const TR &b) : TR(b) {}
     };
-    
+
     ///\brief \ref named-templ-param "Named parameter"
     ///function for setting DistMap type
@@ -1161 +1161 @@
     ///
     template<class T>
-    DijkstraWizard<DefDistMapBase<T> > distMap(const T &t) 
+    DijkstraWizard<DefDistMapBase<T> > distMap(const T &t)
     {
       Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
       return DijkstraWizard<DefDistMapBase<T> >(*this);
     }
-    
+
     /// Sets the source node, from which the Dijkstra algorithm runs.
 
     /// Sets the source node, from which the Dijkstra algorithm runs.
     /// \param s is the source node.
-    DijkstraWizard<TR> &source(Node s) 
+    DijkstraWizard<TR> &source(Node s)
     {
       Base::_source=s;
       return *this;
     }
-    
+
   };
-  
+
   ///Function type interface for Dijkstra algorithm.
 

lemon/dim2.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -25 +25 @@
 ///\ingroup misc
 ///\file
-///\brief A simple two dimensional vector and a bounding box implementation 
+///\brief A simple two dimensional vector and a bounding box implementation
 ///
 /// The class \ref lemon::dim2::Point "dim2::Point" implements
@@ -60 +60 @@
       T x;
       ///Second coordinate
-      T y;     
-      
+      T y;
+
       ///Default constructor
       Point() {}
@@ -71 +71 @@
 
       ///The dimension of the vector.
-      ///This function always returns 2. 
+      ///This function always returns 2.
       int size() const { return 2; }
 
@@ -93 +93 @@
         return x*x+y*y;
       }
-  
+
       ///Increment the left hand side by \c u
       Point<T>& operator +=(const Point<T>& u) {
@@ -100 +100 @@
         return *this;
       }
-  
+
       ///Decrement the left hand side by \c u
       Point<T>& operator -=(const Point<T>& u) {
@@ -121 +121 @@
         return *this;
       }
-  
+
       ///Return the scalar product of two vectors
       T operator *(const Point<T>& u) const {
         return x*u.x+y*u.y;
       }
-  
+
       ///Return the sum of two vectors
       Point<T> operator+(const Point<T> &u) const {
@@ -170 +170 @@
     };
 
-  ///Return a Point 
+  ///Return a Point
 
   ///Return a Point.
@@ -260 +260 @@
   }
 
-  
+
 
   /// A class to calculate or store the bounding box of plainvectors.
@@ -271 +271 @@
       bool _empty;
     public:
-      
+
       ///Default constructor: creates an empty bounding box
       BoundingBox() { _empty = true; }
@@ -277 +277 @@
       ///Construct an instance from one point
       BoundingBox(Point<T> a) { bottom_left=top_right=a; _empty = false; }
-      
+
       ///Construct an instance from two points
-      
+
       ///Construct an instance from two points.
       ///\param a The bottom left corner.
@@ -287 +287 @@
       BoundingBox(Point<T> a,Point<T> b)
       {
-        bottom_left=a;
-        top_right=b;
-        _empty = false;
-      }
-      
+        bottom_left=a;
+        top_right=b;
+        _empty = false;
+      }
+
       ///Construct an instance from four numbers
 
@@ -300 +300 @@
       ///\param t The top of the box.
       ///\warning The left side must be no more than the right side and
-      ///bottom must be no more than the top. 
+      ///bottom must be no more than the top.
       BoundingBox(T l,T b,T r,T t)
       {
-        bottom_left=Point<T>(l,b);
-        top_right=Point<T>(r,t);
-        _empty = false;
-      }
-      
+        bottom_left=Point<T>(l,b);
+        top_right=Point<T>(r,t);
+        _empty = false;
+      }
+
       ///Return \c true if the bounding box is empty.
-      
+
       ///Return \c true if the bounding box is empty (i.e. return \c false
       ///if at least one point was added to the box or the coordinates of
       ///the box were set).
       ///
-      ///The coordinates of an empty bounding box are not defined. 
+      ///The coordinates of an empty bounding box are not defined.
       bool empty() const {
         return _empty;
       }
-      
+
       ///Make the BoundingBox empty
       void clear() {
@@ -337 +337 @@
       ///It should only be used for non-empty box.
       void bottomLeft(Point<T> p) {
-        bottom_left = p;
+        bottom_left = p;
       }
 
@@ -353 +353 @@
       ///It should only be used for non-empty box.
       void topRight(Point<T> p) {
-        top_right = p;
+        top_right = p;
       }
 
@@ -369 +369 @@
       ///It should only be used for non-empty box.
       void bottomRight(Point<T> p) {
-        top_right.x = p.x;
-        bottom_left.y = p.y;
-      }
- 
+        top_right.x = p.x;
+        bottom_left.y = p.y;
+      }
+
       ///Give back the top left corner of the box
 
@@ -386 +386 @@
       ///It should only be used for non-empty box.
       void topLeft(Point<T> p) {
-        top_right.y = p.y;
-        bottom_left.x = p.x;
+        top_right.y = p.y;
+        bottom_left.x = p.x;
       }
 
@@ -403 +403 @@
       ///It should only be used for non-empty box.
       void bottom(T t) {
-        bottom_left.y = t;
+        bottom_left.y = t;
       }
 
@@ -419 +419 @@
       ///It should only be used for non-empty box.
       void top(T t) {
-        top_right.y = t;
+        top_right.y = t;
       }
 
@@ -429 +429 @@
         return bottom_left.x;
       }
- 
+
       ///Set the left side of the box
 
@@ -435 +435 @@
       ///It should only be used for non-empty box.
       void left(T t) {
-        bottom_left.x = t;
+        bottom_left.x = t;
       }
 
@@ -451 +451 @@
       ///It should only be used for non-empty box.
       void right(T t) {
-        top_right.x = t;
+        top_right.x = t;
       }
 
@@ -479 +479 @@
         }
       }
-  
+
       ///Increments a bounding box with a point
 
@@ -497 +497 @@
         return *this;
       }
-    
+
       ///Increments a bounding box to contain another bounding box
-      
+
       ///Increments a bounding box to contain another bounding box.
       ///
@@ -505 +505 @@
         if ( !u.empty() ){
           this->add(u.bottomLeft());
-          this->add(u.topRight());
+          this->add(u.topRight());
         }
         return *this;
       }
-  
+
       ///Intersection of two bounding boxes
 
@@ -517 +517 @@
         BoundingBox b;
         if (this->_empty || u._empty) {
-          b._empty = true;
-        } else {
-          b.bottom_left.x = std::max(this->bottom_left.x,u.bottom_left.x);
-          b.bottom_left.y = std::max(this->bottom_left.y,u.bottom_left.y);
-          b.top_right.x = std::min(this->top_right.x,u.top_right.x);
-          b.top_right.y = std::min(this->top_right.y,u.top_right.y);
-          b._empty = b.bottom_left.x > b.top_right.x ||
-                     b.bottom_left.y > b.top_right.y;
-        } 
+          b._empty = true;
+        } else {
+          b.bottom_left.x = std::max(this->bottom_left.x,u.bottom_left.x);
+          b.bottom_left.y = std::max(this->bottom_left.y,u.bottom_left.y);
+          b.top_right.x = std::min(this->top_right.x,u.top_right.x);
+          b.top_right.y = std::min(this->top_right.y,u.top_right.y);
+          b._empty = b.bottom_left.x > b.top_right.x ||
+                     b.bottom_left.y > b.top_right.y;
+        }
         return b;
       }
@@ -538 +538 @@
   ///
   template<class M>
-  class XMap 
+  class XMap
   {
     M& _map;
@@ -550 +550 @@
     void set(Key k,Value v) {_map.set(k,typename M::Value(v,_map[k].y));}
   };
-    
+
   ///Returns an \ref XMap class
 
@@ -557 +557 @@
   ///\ingroup maps
   ///\relates XMap
-  template<class M> 
-  inline XMap<M> xMap(M &m) 
+  template<class M>
+  inline XMap<M> xMap(M &m)
   {
     return XMap<M>(m);
   }
 
-  template<class M> 
-  inline XMap<M> xMap(const M &m) 
+  template<class M>
+  inline XMap<M> xMap(const M &m)
   {
     return XMap<M>(m);
@@ -575 +575 @@
   ///
   template<class M>
-  class ConstXMap 
+  class ConstXMap
   {
     const M& _map;
@@ -586 +586 @@
     Value operator[](Key k) const {return _map[k].x;}
   };
-    
+
   ///Returns a \ref ConstXMap class
 
@@ -593 +593 @@
   ///\ingroup maps
   ///\relates ConstXMap
-  template<class M> 
-  inline ConstXMap<M> xMap(const M &m) 
+  template<class M>
+  inline ConstXMap<M> xMap(const M &m)
   {
     return ConstXMap<M>(m);
@@ -600 +600 @@
 
   ///Map of y-coordinates of a \ref Point "Point"-map
-    
+
   ///\ingroup maps
   ///Map of y-coordinates of a \ref Point "Point"-map.
   ///
   template<class M>
-  class YMap 
+  class YMap
   {
     M& _map;
@@ -624 +624 @@
   ///\ingroup maps
   ///\relates YMap
-  template<class M> 
-  inline YMap<M> yMap(M &m) 
+  template<class M>
+  inline YMap<M> yMap(M &m)
   {
     return YMap<M>(m);
   }
 
-  template<class M> 
-  inline YMap<M> yMap(const M &m) 
+  template<class M>
+  inline YMap<M> yMap(const M &m)
   {
     return YMap<M>(m);
@@ -642 +642 @@
   ///
   template<class M>
-  class ConstYMap 
+  class ConstYMap
   {
     const M& _map;
@@ -653 +653 @@
     Value operator[](Key k) const {return _map[k].y;}
   };
-    
+
   ///Returns a \ref ConstYMap class
 
@@ -660 +660 @@
   ///\ingroup maps
   ///\relates ConstYMap
-  template<class M> 
-  inline ConstYMap<M> yMap(const M &m) 
+  template<class M>
+  inline ConstYMap<M> yMap(const M &m)
   {
     return ConstYMap<M>(m);
@@ -674 +674 @@
   ///\ingroup maps
   template<class M>
-  class NormSquareMap 
+  class NormSquareMap
   {
     const M& _map;
@@ -685 +685 @@
     Value operator[](Key k) const {return _map[k].normSquare();}
   };
-    
+
   ///Returns a \ref NormSquareMap class
 
@@ -692 +692 @@
   ///\ingroup maps
   ///\relates NormSquareMap
-  template<class M> 
-  inline NormSquareMap<M> normSquareMap(const M &m) 
+  template<class M>
+  inline NormSquareMap<M> normSquareMap(const M &m)
   {
     return NormSquareMap<M>(m);
@@ -701 +701 @@
 
   } //namespce dim2
-  
+
 } //namespace lemon
 

lemon/error.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -46 +46 @@
     ExceptionMember() throw() {
       try {
-        ptr.reset(new Type());
+        ptr.reset(new Type());
       } catch (...) {}
     }
@@ -52 +52 @@
     ExceptionMember(const Type& type) throw() {
       try {
-        ptr.reset(new Type());
-        if (ptr.get() == 0) return;
-        *ptr = type;
+        ptr.reset(new Type());
+        if (ptr.get() == 0) return;
+        *ptr = type;
       } catch (...) {}
     }
@@ -60 +60 @@
     ExceptionMember(const ExceptionMember& copy) throw() {
       try {
-        if (!copy.valid()) return;
-        ptr.reset(new Type());
-        if (ptr.get() == 0) return;
-        *ptr = copy.get();
+        if (!copy.valid()) return;
+        ptr.reset(new Type());
+        if (ptr.get() == 0) return;
+        *ptr = copy.get();
       } catch (...) {}
     }
@@ -70 +70 @@
       if (ptr.get() == 0) return;
       try {
-        if (!copy.valid()) return;
-        *ptr = copy.get();
+        if (!copy.valid()) return;
+         *ptr = copy.get();
       } catch (...) {}
     }
@@ -78 +78 @@
       if (ptr.get() == 0) return;
       try {
-        *ptr = type;
+        *ptr = type;
       } catch (...) {}
     }
@@ -110 +110 @@
     bool init() throw() {
       try {
-        buf.reset(new std::ostringstream);
+        buf.reset(new std::ostringstream);
       }
       catch(...) {
-        buf.reset();
+        buf.reset();
       }
       return buf.get();
@@ -143 +143 @@
 
       try {
-        *buf << t;
+        *buf << t;
       }
       catch(...) {
-        buf.reset();
+        buf.reset();
       }
       return *this;
@@ -157 +157 @@
       const char* mes = 0;
       try {
-        mes = buf->str().c_str();
+        mes = buf->str().c_str();
       }
       catch(...) {}
@@ -255 +255 @@
     ///\e
     DataFormatError(const std::string &file_name, int line_num,
-                    const char *the_message)
+                    const char *the_message)
       : _message(the_message), _line(line_num) { file(file_name); }
 
@@ -270 +270 @@
     const char* message() const {
       if (_message.valid() && !_message.get().empty()) {
-        return _message.get().c_str();
+        return _message.get().c_str();
       } else {
-        return 0;
+        return 0;
       }
     }
@@ -281 +281 @@
     const char* file() const {
       if (_file.valid() && !_file.get().empty()) {
-        return _file.get().c_str();
+        return _file.get().c_str();
       } else {
-        return 0;
-      }
-    }
-
-    ///\e
-    virtual const char* what() const throw() {
-      try {
-        std::ostringstream ostr;
-        ostr << "lemon:DataFormatError" << ": ";
-        if (message()) ostr << message();
-        if( file() || line() != 0 ) {
-          ostr << " (";
-          if( file() ) ostr << "in file '" << file() << "'";
-          if( file() && line() != 0 ) ostr << " ";
-          if( line() != 0 ) ostr << "at line " << line();
-          ostr << ")";
-        }
-        _message_holder.set(ostr.str());
+        return 0;
+      }
+    }
+
+    ///\e
+    virtual const char* what() const throw() {
+      try {
+        std::ostringstream ostr;
+        ostr << "lemon:DataFormatError" << ": ";
+        if (message()) ostr << message();
+        if( file() || line() != 0 ) {
+          ostr << " (";
+          if( file() ) ostr << "in file '" << file() << "'";
+          if( file() && line() != 0 ) ostr << " ";
+          if( line() != 0 ) ostr << "at line " << line();
+          ostr << ")";
+        }
+        _message_holder.set(ostr.str());
       }
       catch (...) {}
@@ -334 +334 @@
     const char* file() const {
       if (_file.valid() && !_file.get().empty()) {
-        return _file.get().c_str();
+        return _file.get().c_str();
       } else {
-        return 0;
-      }
-    }
-
-    ///\e
-    virtual const char* what() const throw() {
-      try {
-        std::ostringstream ostr;
-        ostr << "lemon::FileOpenError" << ": ";
-        ostr << "Cannot open file - " << file();
-        _message_holder.set(ostr.str());
+        return 0;
+      }
+    }
+
+    ///\e
+    virtual const char* what() const throw() {
+      try {
+        std::ostringstream ostr;
+        ostr << "lemon::FileOpenError" << ": ";
+        ostr << "Cannot open file - " << file();
+        _message_holder.set(ostr.str());
       }
       catch (...) {}
@@ -382 +382 @@
     const char* message() const {
       if (_message.valid()) {
-        return _message.get().c_str();
+        return _message.get().c_str();
       } else {
-        return 0;
+        return 0;
       }
     }
@@ -393 +393 @@
     const char* file() const {
       if (_file.valid()) {
-        return _file.get().c_str();
+        return _file.get().c_str();
       } else {
-        return 0;
-      }
-    }
-
-    ///\e
-    virtual const char* what() const throw() {
-      try {
-        std::ostringstream ostr;
-        if (message()) ostr << message();
-        if (file()) ostr << "(when reading file '" << file() << "')";
-        _message_holder.set(ostr.str());
+        return 0;
+      }
+    }
+
+    ///\e
+    virtual const char* what() const throw() {
+      try {
+        std::ostringstream ostr;
+        if (message()) ostr << message();
+        if (file()) ostr << "(when reading file '" << file() << "')";
+        _message_holder.set(ostr.str());
       }
       catch (...) {}

lemon/graph_to_eps.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -61 +61 @@
     };
   }
-  
+
 ///Default traits class of \ref GraphToEps
 
@@ -77 +77 @@
   typedef typename Graph::InArcIt InArcIt;
   typedef typename Graph::OutArcIt OutArcIt;
-  
+
 
   const Graph &g;
 
   std::ostream& os;
-  
+
   typedef ConstMap<typename Graph::Node,dim2::Point<double> > CoordsMapType;
   CoordsMapType _coords;
@@ -94 +94 @@
 
   double _arcWidthScale;
-  
+
   double _nodeScale;
   double _xBorder, _yBorder;
   double _scale;
   double _nodeBorderQuotient;
-  
+
   bool _drawArrows;
   double _arrowLength, _arrowWidth;
-  
+
   bool _showNodes, _showArcs;
 
@@ -109 +109 @@
 
   bool _showNodeText;
-  ConstMap<typename Graph::Node,bool > _nodeTexts;  
+  ConstMap<typename Graph::Node,bool > _nodeTexts;
   double _nodeTextSize;
 
   bool _showNodePsText;
-  ConstMap<typename Graph::Node,bool > _nodePsTexts;  
+  ConstMap<typename Graph::Node,bool > _nodePsTexts;
   char *_nodePsTextsPreamble;
-  
+
   bool _undirected;
 
@@ -125 +125 @@
   std::string _copyright;
 
-  enum NodeTextColorType 
+  enum NodeTextColorType
     { DIST_COL=0, DIST_BW=1, CUST_COL=2, SAME_COL=3 } _nodeTextColorType;
   ConstMap<typename Graph::Node,Color > _nodeTextColors;
@@ -147 +147 @@
   ///will be explicitly deallocated by the destructor.
   DefaultGraphToEpsTraits(const G &_g,std::ostream& _os=std::cout,
-                          bool _pros=false) :
+                          bool _pros=false) :
     g(_g), os(_os),
     _coords(dim2::Point<double>(1,1)), _nodeSizes(1), _nodeShapes(0),
@@ -176 +176 @@
 ///
 ///For detailed examples see the \ref graph_to_eps_demo.cc demo file.
-template<class T> class GraphToEps : public T 
+template<class T> class GraphToEps : public T
 {
   // Can't believe it is required by the C++ standard
@@ -195 +195 @@
   using T::_scale;
   using T::_nodeBorderQuotient;
-  
+
   using T::_drawArrows;
   using T::_arrowLength;
   using T::_arrowWidth;
-  
+
   using T::_showNodes;
   using T::_showArcs;
@@ -207 +207 @@
 
   using T::_showNodeText;
-  using T::_nodeTexts;  
+  using T::_nodeTexts;
   using T::_nodeTextSize;
 
   using T::_showNodePsText;
-  using T::_nodePsTexts;  
+  using T::_nodePsTexts;
   using T::_nodePsTextsPreamble;
-  
+
   using T::_undirected;
 
@@ -262 +262 @@
   ///Node shapes.
   ///
-  enum NodeShapes { 
+  enum NodeShapes {
     /// = 0
     ///\image html nodeshape_0.png
     ///\image latex nodeshape_0.eps "CIRCLE shape (0)" width=2cm
-    CIRCLE=0, 
+    CIRCLE=0,
     /// = 1
     ///\image html nodeshape_1.png
     ///\image latex nodeshape_1.eps "SQUARE shape (1)" width=2cm
     ///
-    SQUARE=1, 
+    SQUARE=1,
     /// = 2
     ///\image html nodeshape_2.png
@@ -294 +294 @@
   public:
     arcLess(const Graph &_g) : g(_g) {}
-    bool operator()(Arc a,Arc b) const 
+    bool operator()(Arc a,Arc b) const
     {
       Node ai=std::min(g.source(a),g.target(a));
@@ -301 +301 @@
       Node ba=std::max(g.source(b),g.target(b));
       return ai<bi ||
-        (ai==bi && (aa < ba || 
-                    (aa==ba && ai==g.source(a) && bi==g.target(b))));
+        (ai==bi && (aa < ba ||
+                    (aa==ba && ai==g.source(a) && bi==g.target(b))));
     }
   };
@@ -308 +308 @@
   {
     return (g.source(e)==g.source(f)&&
-            g.target(e)==g.target(f)) ||
+            g.target(e)==g.target(f)) ||
       (g.source(e)==g.target(f)&&
        g.target(e)==g.source(f));
   }
   template<class TT>
-  static std::string psOut(const dim2::Point<TT> &p) 
+  static std::string psOut(const dim2::Point<TT> &p)
     {
-      std::ostringstream os;    
+      std::ostringstream os;
       os << p.x << ' ' << p.y;
       return os.str();
     }
-  static std::string psOut(const Color &c) 
+  static std::string psOut(const Color &c)
     {
-      std::ostringstream os;    
+      std::ostringstream os;
       os << c.red() << ' ' << c.green() << ' ' << c.blue();
       return os.str();
     }
-  
+
 public:
   GraphToEps(const T &t) : T(t), dontPrint(false) {};
-  
+
   template<class X> struct CoordsTraits : public T {
   typedef X CoordsMapType;
@@ -338 +338 @@
   ///Sets the map of the node coordinates.
   ///\param x must be a node map with \ref dim2::Point "dim2::Point<double>" or
-  ///\ref dim2::Point "dim2::Point<int>" values. 
+  ///\ref dim2::Point "dim2::Point<int>" values.
   template<class X> GraphToEps<CoordsTraits<X> > coords(const X &x) {
     dontPrint=true;
@@ -350 +350 @@
 
   ///Sets the map of the node sizes.
-  ///\param x must be a node map with \c double (or convertible) values. 
+  ///\param x must be a node map with \c double (or convertible) values.
   template<class X> GraphToEps<NodeSizesTraits<X> > nodeSizes(const X &x)
   {
@@ -365 +365 @@
   ///The available shape values
   ///can be found in \ref NodeShapes "enum NodeShapes".
-  ///\param x must be a node map with \c int (or convertible) values. 
+  ///\param x must be a node map with \c int (or convertible) values.
   ///\sa NodeShapes
   template<class X> GraphToEps<NodeShapesTraits<X> > nodeShapes(const X &x)
@@ -380 +380 @@
   ///Sets the text printed on the nodes.
   ///\param x must be a node map with type that can be pushed to a standard
-  ///\c ostream. 
+  ///\c ostream.
   template<class X> GraphToEps<NodeTextsTraits<X> > nodeTexts(const X &x)
   {
@@ -418 +418 @@
 
   ///Sets the map of the arc widths.
-  ///\param x must be an arc map with \c double (or convertible) values. 
+  ///\param x must be an arc map with \c double (or convertible) values.
   template<class X> GraphToEps<ArcWidthsTraits<X> > arcWidths(const X &x)
   {
@@ -448 +448 @@
 
   ///Sets the map of the node text colors.
-  ///\param x must be a node map with \ref Color values. 
+  ///\param x must be a node map with \ref Color values.
   ///
   ///\sa Palette
@@ -466 +466 @@
 
   ///Sets the map of the arc colors.
-  ///\param x must be an arc map with \ref Color values. 
+  ///\param x must be an arc map with \ref Color values.
   ///
   ///\sa Palette
@@ -478 +478 @@
 
   ///Sets a global scale factor for node sizes.
-  /// 
+  ///
   /// If nodeSizes() is not given, this function simply sets the node
   /// sizes to \c d.  If nodeSizes() is given, but
@@ -569 +569 @@
   ///Sets the width of the arrowheads
   GraphToEps<T> &arrowWidth(double d=.3) {_arrowWidth*=d;return *this;}
-  
+
   ///Scales the drawing to fit to A4 page
   GraphToEps<T> &scaleToA4() {_scaleToA4=true;return *this;}
-  
+
   ///Enables parallel arcs
   GraphToEps<T> &enableParallel(bool b=true) {_enableParallel=b;return *this;}
-  
+
   ///Sets the distance between parallel arcs
   GraphToEps<T> &parArcDist(double d) {_parArcDist*=d;return *this;}
-  
+
   ///Hides the arcs
   GraphToEps<T> &hideArcs(bool b=true) {_showArcs=!b;return *this;}
   ///Hides the nodes
   GraphToEps<T> &hideNodes(bool b=true) {_showNodes=!b;return *this;}
-  
+
   ///Sets the size of the node texts
   GraphToEps<T> &nodeTextSize(double d) {_nodeTextSize=d;return *this;}
@@ -601 +601 @@
 
   ///Gives a preamble block for node Postscript block.
-  
+
   ///Gives a preamble block for node Postscript block.
   ///
@@ -626 +626 @@
   ///\sa undirected()
   GraphToEps<T> &directed(bool b=true) {_undirected=!b;return *this;}
-  
+
   ///Sets the title.
 
@@ -641 +641 @@
 
 protected:
-  bool isInsideNode(dim2::Point<double> p, double r,int t) 
+  bool isInsideNode(dim2::Point<double> p, double r,int t)
   {
     switch(t) {
@@ -658 +658 @@
 public:
   ~GraphToEps() { }
-  
+
   ///Draws the graph.
 
@@ -669 +669 @@
     const double EPSILON=1e-9;
     if(dontPrint) return;
-    
+
     _graph_to_eps_bits::_NegY<typename T::CoordsMapType>
       mycoords(_coords,_negY);
@@ -678 +678 @@
     os << "%%Creator: LEMON, graphToEps()\n";
 
-    {    
-#ifndef WIN32 
+    {
+#ifndef WIN32
       timeval tv;
       gettimeofday(&tv, 0);
@@ -689 +689 @@
       SYSTEMTIME time;
       char buf1[11], buf2[9], buf3[5];
-      
+
       GetSystemTime(&time);
-      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time, 
-                        "ddd MMM dd", buf1, 11) &&
-          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time, 
-                        "HH':'mm':'ss", buf2, 9) &&
-          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time, 
-                                "yyyy", buf3, 5)) {
-        os << "%%CreationDate: " << buf1 << ' ' 
-           << buf2 << ' ' << buf3 << std::endl;
-      }   
+      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
+                        "ddd MMM dd", buf1, 11) &&
+          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
+                        "HH':'mm':'ss", buf2, 9) &&
+          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
+                                "yyyy", buf3, 5)) {
+        os << "%%CreationDate: " << buf1 << ' '
+           << buf2 << ' ' << buf3 << std::endl;
+      }
 #endif
     }
@@ -706 +706 @@
       double max_w=0;
       for(ArcIt e(g);e!=INVALID;++e)
-        max_w=std::max(double(_arcWidths[e]),max_w);
+        max_w=std::max(double(_arcWidths[e]),max_w);
       //\todo better 'epsilon' would be nice here.
       if(max_w>EPSILON) {
-        _arcWidthScale/=max_w;
+        _arcWidthScale/=max_w;
       }
     }
@@ -716 +716 @@
       double max_s=0;
       for(NodeIt n(g);n!=INVALID;++n)
-        max_s=std::max(double(_nodeSizes[n]),max_s);
+        max_s=std::max(double(_nodeSizes[n]),max_s);
       //\todo better 'epsilon' would be nice here.
       if(max_s>EPSILON) {
-        _nodeScale/=max_s;
+        _nodeScale/=max_s;
       }
     }
@@ -728 +728 @@
       for(NodeIt n(g);n!=INVALID;++n) bb.add(mycoords[n]);
       if (bb.empty()) {
-        bb = dim2::BoundingBox<double>(dim2::Point<double>(0,0));
+        bb = dim2::BoundingBox<double>(dim2::Point<double>(0,0));
       }
       diag_len = std::sqrt((bb.bottomLeft()-bb.topRight()).normSquare());
@@ -735 +735 @@
       if(!_absoluteArcWidths) _arcWidthScale*=diag_len;
     }
-    
+
     dim2::BoundingBox<double> bb;
     for(NodeIt n(g);n!=INVALID;++n) {
@@ -744 +744 @@
       case SQUARE:
       case DIAMOND:
-        bb.add(p+mycoords[n]);
-        bb.add(-p+mycoords[n]);
-        break;
+        bb.add(p+mycoords[n]);
+        bb.add(-p+mycoords[n]);
+        break;
       case MALE:
-        bb.add(-p+mycoords[n]);
-        bb.add(dim2::Point<double>(1.5*ns,1.5*std::sqrt(3.0)*ns)+mycoords[n]);
-        break;
+        bb.add(-p+mycoords[n]);
+        bb.add(dim2::Point<double>(1.5*ns,1.5*std::sqrt(3.0)*ns)+mycoords[n]);
+        break;
       case FEMALE:
-        bb.add(p+mycoords[n]);
-        bb.add(dim2::Point<double>(-ns,-3.01*ns)+mycoords[n]);
-        break;
+        bb.add(p+mycoords[n]);
+        bb.add(dim2::Point<double>(-ns,-3.01*ns)+mycoords[n]);
+        break;
       }
     }
@@ -760 +760 @@
       bb = dim2::BoundingBox<double>(dim2::Point<double>(0,0));
     }
-    
+
     if(_scaleToA4)
       os <<"%%BoundingBox: 0 0 596 842\n%%DocumentPaperSizes: a4\n";
     else {
       if(_preScale) {
-        //Rescale so that BoundingBox won't be neither to big nor too small.
-        while(bb.height()*_scale>1000||bb.width()*_scale>1000) _scale/=10;
-        while(bb.height()*_scale<100||bb.width()*_scale<100) _scale*=10;
+        //Rescale so that BoundingBox won't be neither to big nor too small.
+        while(bb.height()*_scale>1000||bb.width()*_scale>1000) _scale/=10;
+        while(bb.height()*_scale<100||bb.width()*_scale<100) _scale*=10;
       }
-      
+
       os << "%%BoundingBox: "
-         << int(floor(bb.left()   * _scale - _xBorder)) << ' '
-         << int(floor(bb.bottom() * _scale - _yBorder)) << ' '
-         << int(ceil(bb.right()  * _scale + _xBorder)) << ' '
-         << int(ceil(bb.top()    * _scale + _yBorder)) << '\n';
-    }
-    
+         << int(floor(bb.left()   * _scale - _xBorder)) << ' '
+         << int(floor(bb.bottom() * _scale - _yBorder)) << ' '
+         << int(ceil(bb.right()  * _scale + _xBorder)) << ' '
+         << int(ceil(bb.top()    * _scale + _yBorder)) << '\n';
+    }
+
     os << "%%EndComments\n";
-    
+
     //x1 y1 x2 y2 x3 y3 cr cg cb w
     os << "/lb { setlinewidth setrgbcolor newpath moveto\n"
@@ -832 +832 @@
        << "  setrgbcolor " << 1+_nodeBorderQuotient << " div c fill\n"
        << "  } bind def\n";
-    
+
 
     os << "/arrl " << _arrowLength << " def\n";
@@ -841 +841 @@
     os << "/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx exch def\n"
        << "       /w exch def /len exch def\n"
-      //         << "       0.1 setlinewidth x1 y1 moveto dx len mul dy len mul rlineto stroke"
+      //         << "       0.1 setlinewidth x1 y1 moveto dx len mul dy len mul rlineto stroke"
        << "       newpath x1 dy w 2 div mul add y1 dx w 2 div mul sub moveto\n"
        << "       len w sub arrl sub dx dy lrl\n"
@@ -858 +858 @@
     if(_scaleToA4)
       if(bb.height()>bb.width()) {
-        double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.height(),
-                  (A4WIDTH-2*A4BORDER)/bb.width());
-        os << ((A4WIDTH -2*A4BORDER)-sc*bb.width())/2 + A4BORDER << ' '
-           << ((A4HEIGHT-2*A4BORDER)-sc*bb.height())/2 + A4BORDER
-           << " translate\n"
-           << sc << " dup scale\n"
-           << -bb.left() << ' ' << -bb.bottom() << " translate\n";
+        double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.height(),
+                  (A4WIDTH-2*A4BORDER)/bb.width());
+        os << ((A4WIDTH -2*A4BORDER)-sc*bb.width())/2 + A4BORDER << ' '
+           << ((A4HEIGHT-2*A4BORDER)-sc*bb.height())/2 + A4BORDER
+           << " translate\n"
+           << sc << " dup scale\n"
+           << -bb.left() << ' ' << -bb.bottom() << " translate\n";
       }
       else {
-        //\todo Verify centering
-        double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.width(),
-                  (A4WIDTH-2*A4BORDER)/bb.height());
-        os << ((A4WIDTH -2*A4BORDER)-sc*bb.height())/2 + A4BORDER << ' '
-           << ((A4HEIGHT-2*A4BORDER)-sc*bb.width())/2 + A4BORDER 
-           << " translate\n"
-           << sc << " dup scale\n90 rotate\n"
-           << -bb.left() << ' ' << -bb.top() << " translate\n"; 
-        }
+        //\todo Verify centering
+        double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.width(),
+                  (A4WIDTH-2*A4BORDER)/bb.height());
+        os << ((A4WIDTH -2*A4BORDER)-sc*bb.height())/2 + A4BORDER << ' '
+           << ((A4HEIGHT-2*A4BORDER)-sc*bb.width())/2 + A4BORDER
+           << " translate\n"
+           << sc << " dup scale\n90 rotate\n"
+           << -bb.left() << ' ' << -bb.top() << " translate\n";
+        }
     else if(_scale!=1.0) os << _scale << " dup scale\n";
-    
+
     if(_showArcs) {
-      os << "%Arcs:\ngsave\n";      
+      os << "%Arcs:\ngsave\n";
       if(_enableParallel) {
-        std::vector<Arc> el;
-        for(ArcIt e(g);e!=INVALID;++e)
-          if((!_undirected||g.source(e)<g.target(e))&&_arcWidths[e]>0
-             &&g.source(e)!=g.target(e))
-            el.push_back(e);
-        std::sort(el.begin(),el.end(),arcLess(g));
-        
-        typename std::vector<Arc>::iterator j;
-        for(typename std::vector<Arc>::iterator i=el.begin();i!=el.end();i=j) {
-          for(j=i+1;j!=el.end()&&isParallel(*i,*j);++j) ;
-
-          double sw=0;
-          for(typename std::vector<Arc>::iterator e=i;e!=j;++e)
-            sw+=_arcWidths[*e]*_arcWidthScale+_parArcDist;
-          sw-=_parArcDist;
-          sw/=-2.0;
-          dim2::Point<double>
-            dvec(mycoords[g.target(*i)]-mycoords[g.source(*i)]);
-          double l=std::sqrt(dvec.normSquare()); 
-          //\todo better 'epsilon' would be nice here.
-          dim2::Point<double> d(dvec/std::max(l,EPSILON));
-          dim2::Point<double> m;
-//        m=dim2::Point<double>(mycoords[g.target(*i)]+mycoords[g.source(*i)])/2.0;
-
-//        m=dim2::Point<double>(mycoords[g.source(*i)])+
-//          dvec*(double(_nodeSizes[g.source(*i)])/
-//             (_nodeSizes[g.source(*i)]+_nodeSizes[g.target(*i)]));
-
-          m=dim2::Point<double>(mycoords[g.source(*i)])+
-            d*(l+_nodeSizes[g.source(*i)]-_nodeSizes[g.target(*i)])/2.0;
-
-          for(typename std::vector<Arc>::iterator e=i;e!=j;++e) {
-            sw+=_arcWidths[*e]*_arcWidthScale/2.0;
-            dim2::Point<double> mm=m+rot90(d)*sw/.75;
-            if(_drawArrows) {
-              int node_shape;
-              dim2::Point<double> s=mycoords[g.source(*e)];
-              dim2::Point<double> t=mycoords[g.target(*e)];
-              double rn=_nodeSizes[g.target(*e)]*_nodeScale;
-              node_shape=_nodeShapes[g.target(*e)];
-              dim2::Bezier3 bez(s,mm,mm,t);
-              double t1=0,t2=1;
-              for(int ii=0;ii<INTERPOL_PREC;++ii)
-                if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape)) t2=(t1+t2)/2;
-                else t1=(t1+t2)/2;
-              dim2::Point<double> apoint=bez((t1+t2)/2);
-              rn = _arrowLength+_arcWidths[*e]*_arcWidthScale;
-              rn*=rn;
-              t2=(t1+t2)/2;t1=0;
-              for(int ii=0;ii<INTERPOL_PREC;++ii)
-                if((bez((t1+t2)/2)-apoint).normSquare()>rn) t1=(t1+t2)/2;
-                else t2=(t1+t2)/2;
-              dim2::Point<double> linend=bez((t1+t2)/2);              
-              bez=bez.before((t1+t2)/2);
-//            rn=_nodeSizes[g.source(*e)]*_nodeScale;
-//            node_shape=_nodeShapes[g.source(*e)];
-//            t1=0;t2=1;
-//            for(int i=0;i<INTERPOL_PREC;++i)
-//              if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape)) t1=(t1+t2)/2;
-//              else t2=(t1+t2)/2;
-//            bez=bez.after((t1+t2)/2);
-              os << _arcWidths[*e]*_arcWidthScale << " setlinewidth "
-                 << _arcColors[*e].red() << ' '
-                 << _arcColors[*e].green() << ' '
-                 << _arcColors[*e].blue() << " setrgbcolor newpath\n"
-                 << bez.p1.x << ' ' <<  bez.p1.y << " moveto\n"
-                 << bez.p2.x << ' ' << bez.p2.y << ' '
-                 << bez.p3.x << ' ' << bez.p3.y << ' '
-                 << bez.p4.x << ' ' << bez.p4.y << " curveto stroke\n";
-              dim2::Point<double> dd(rot90(linend-apoint));
-              dd*=(.5*_arcWidths[*e]*_arcWidthScale+_arrowWidth)/
-                std::sqrt(dd.normSquare());
-              os << "newpath " << psOut(apoint) << " moveto "
-                 << psOut(linend+dd) << " lineto "
-                 << psOut(linend-dd) << " lineto closepath fill\n";
-            }
-            else {
-              os << mycoords[g.source(*e)].x << ' '
-                 << mycoords[g.source(*e)].y << ' '
-                 << mm.x << ' ' << mm.y << ' '
-                 << mycoords[g.target(*e)].x << ' '
-                 << mycoords[g.target(*e)].y << ' '
-                 << _arcColors[*e].red() << ' '
-                 << _arcColors[*e].green() << ' '
-                 << _arcColors[*e].blue() << ' '
-                 << _arcWidths[*e]*_arcWidthScale << " lb\n";
-            }
-            sw+=_arcWidths[*e]*_arcWidthScale/2.0+_parArcDist;
-          }
-        }
+        std::vector<Arc> el;
+        for(ArcIt e(g);e!=INVALID;++e)
+          if((!_undirected||g.source(e)<g.target(e))&&_arcWidths[e]>0
+             &&g.source(e)!=g.target(e))
+            el.push_back(e);
+        std::sort(el.begin(),el.end(),arcLess(g));
+
+        typename std::vector<Arc>::iterator j;
+        for(typename std::vector<Arc>::iterator i=el.begin();i!=el.end();i=j) {
+          for(j=i+1;j!=el.end()&&isParallel(*i,*j);++j) ;
+
+          double sw=0;
+          for(typename std::vector<Arc>::iterator e=i;e!=j;++e)
+            sw+=_arcWidths[*e]*_arcWidthScale+_parArcDist;
+          sw-=_parArcDist;
+          sw/=-2.0;
+          dim2::Point<double>
+            dvec(mycoords[g.target(*i)]-mycoords[g.source(*i)]);
+          double l=std::sqrt(dvec.normSquare());
+          //\todo better 'epsilon' would be nice here.
+          dim2::Point<double> d(dvec/std::max(l,EPSILON));
+           dim2::Point<double> m;
+//           m=dim2::Point<double>(mycoords[g.target(*i)]+mycoords[g.source(*i)])/2.0;
+
+//            m=dim2::Point<double>(mycoords[g.source(*i)])+
+//             dvec*(double(_nodeSizes[g.source(*i)])/
+//                (_nodeSizes[g.source(*i)]+_nodeSizes[g.target(*i)]));
+
+           m=dim2::Point<double>(mycoords[g.source(*i)])+
+            d*(l+_nodeSizes[g.source(*i)]-_nodeSizes[g.target(*i)])/2.0;
+
+          for(typename std::vector<Arc>::iterator e=i;e!=j;++e) {
+            sw+=_arcWidths[*e]*_arcWidthScale/2.0;
+            dim2::Point<double> mm=m+rot90(d)*sw/.75;
+            if(_drawArrows) {
+              int node_shape;
+              dim2::Point<double> s=mycoords[g.source(*e)];
+              dim2::Point<double> t=mycoords[g.target(*e)];
+              double rn=_nodeSizes[g.target(*e)]*_nodeScale;
+              node_shape=_nodeShapes[g.target(*e)];
+              dim2::Bezier3 bez(s,mm,mm,t);
+              double t1=0,t2=1;
+              for(int ii=0;ii<INTERPOL_PREC;++ii)
+                if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape)) t2=(t1+t2)/2;
+                else t1=(t1+t2)/2;
+              dim2::Point<double> apoint=bez((t1+t2)/2);
+              rn = _arrowLength+_arcWidths[*e]*_arcWidthScale;
+              rn*=rn;
+              t2=(t1+t2)/2;t1=0;
+              for(int ii=0;ii<INTERPOL_PREC;++ii)
+                if((bez((t1+t2)/2)-apoint).normSquare()>rn) t1=(t1+t2)/2;
+                else t2=(t1+t2)/2;
+              dim2::Point<double> linend=bez((t1+t2)/2);
+              bez=bez.before((t1+t2)/2);
+//               rn=_nodeSizes[g.source(*e)]*_nodeScale;
+//               node_shape=_nodeShapes[g.source(*e)];
+//               t1=0;t2=1;
+//               for(int i=0;i<INTERPOL_PREC;++i)
+//                 if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape)) t1=(t1+t2)/2;
+//                 else t2=(t1+t2)/2;
+//               bez=bez.after((t1+t2)/2);
+              os << _arcWidths[*e]*_arcWidthScale << " setlinewidth "
+                 << _arcColors[*e].red() << ' '
+                 << _arcColors[*e].green() << ' '
+                 << _arcColors[*e].blue() << " setrgbcolor newpath\n"
+                 << bez.p1.x << ' ' <<  bez.p1.y << " moveto\n"
+                 << bez.p2.x << ' ' << bez.p2.y << ' '
+                 << bez.p3.x << ' ' << bez.p3.y << ' '
+                 << bez.p4.x << ' ' << bez.p4.y << " curveto stroke\n";
+              dim2::Point<double> dd(rot90(linend-apoint));
+              dd*=(.5*_arcWidths[*e]*_arcWidthScale+_arrowWidth)/
+                std::sqrt(dd.normSquare());
+              os << "newpath " << psOut(apoint) << " moveto "
+                 << psOut(linend+dd) << " lineto "
+                 << psOut(linend-dd) << " lineto closepath fill\n";
+            }
+            else {
+              os << mycoords[g.source(*e)].x << ' '
+                 << mycoords[g.source(*e)].y << ' '
+                 << mm.x << ' ' << mm.y << ' '
+                 << mycoords[g.target(*e)].x << ' '
+                 << mycoords[g.target(*e)].y << ' '
+                 << _arcColors[*e].red() << ' '
+                 << _arcColors[*e].green() << ' '
+                 << _arcColors[*e].blue() << ' '
+                 << _arcWidths[*e]*_arcWidthScale << " lb\n";
+            }
+            sw+=_arcWidths[*e]*_arcWidthScale/2.0+_parArcDist;
+          }
+        }
       }
       else for(ArcIt e(g);e!=INVALID;++e)
-        if((!_undirected||g.source(e)<g.target(e))&&_arcWidths[e]>0
-           &&g.source(e)!=g.target(e)) {
-          if(_drawArrows) {
-            dim2::Point<double> d(mycoords[g.target(e)]-mycoords[g.source(e)]);
-            double rn=_nodeSizes[g.target(e)]*_nodeScale;
-            int node_shape=_nodeShapes[g.target(e)];
-            double t1=0,t2=1;
-            for(int i=0;i<INTERPOL_PREC;++i)
-              if(isInsideNode((-(t1+t2)/2)*d,rn,node_shape)) t1=(t1+t2)/2;
-              else t2=(t1+t2)/2;
-            double l=std::sqrt(d.normSquare());
-            d/=l;
-            
-            os << l*(1-(t1+t2)/2) << ' '
-               << _arcWidths[e]*_arcWidthScale << ' '
-               << d.x << ' ' << d.y << ' '
-               << mycoords[g.source(e)].x << ' '
-               << mycoords[g.source(e)].y << ' '
-               << _arcColors[e].red() << ' '
-               << _arcColors[e].green() << ' '
-               << _arcColors[e].blue() << " arr\n";
-          } 
-          else os << mycoords[g.source(e)].x << ' '
-                  << mycoords[g.source(e)].y << ' '
-                  << mycoords[g.target(e)].x << ' '
-                  << mycoords[g.target(e)].y << ' '
-                  << _arcColors[e].red() << ' '
-                  << _arcColors[e].green() << ' '
-                  << _arcColors[e].blue() << ' '
-                  << _arcWidths[e]*_arcWidthScale << " l\n";
-        }
+        if((!_undirected||g.source(e)<g.target(e))&&_arcWidths[e]>0
+           &&g.source(e)!=g.target(e)) {
+          if(_drawArrows) {
+            dim2::Point<double> d(mycoords[g.target(e)]-mycoords[g.source(e)]);
+            double rn=_nodeSizes[g.target(e)]*_nodeScale;
+            int node_shape=_nodeShapes[g.target(e)];
+            double t1=0,t2=1;
+            for(int i=0;i<INTERPOL_PREC;++i)
+              if(isInsideNode((-(t1+t2)/2)*d,rn,node_shape)) t1=(t1+t2)/2;
+              else t2=(t1+t2)/2;
+            double l=std::sqrt(d.normSquare());
+            d/=l;
+
+            os << l*(1-(t1+t2)/2) << ' '
+               << _arcWidths[e]*_arcWidthScale << ' '
+               << d.x << ' ' << d.y << ' '
+               << mycoords[g.source(e)].x << ' '
+               << mycoords[g.source(e)].y << ' '
+               << _arcColors[e].red() << ' '
+               << _arcColors[e].green() << ' '
+               << _arcColors[e].blue() << " arr\n";
+          }
+          else os << mycoords[g.source(e)].x << ' '
+                  << mycoords[g.source(e)].y << ' '
+                  << mycoords[g.target(e)].x << ' '
+                  << mycoords[g.target(e)].y << ' '
+                  << _arcColors[e].red() << ' '
+                  << _arcColors[e].green() << ' '
+                  << _arcColors[e].blue() << ' '
+                  << _arcWidths[e]*_arcWidthScale << " l\n";
+        }
       os << "grestore\n";
     }
@@ -1009 +1009 @@
       os << "%Nodes:\ngsave\n";
       for(NodeIt n(g);n!=INVALID;++n) {
-        os << mycoords[n].x << ' ' << mycoords[n].y << ' '
-           << _nodeSizes[n]*_nodeScale << ' '
-           << _nodeColors[n].red() << ' '
-           << _nodeColors[n].green() << ' '
-           << _nodeColors[n].blue() << ' ';
-        switch(_nodeShapes[n]) {
-        case CIRCLE:
-          os<< "nc";break;
-        case SQUARE:
-          os<< "nsq";break;
-        case DIAMOND:
-          os<< "ndi";break;
-        case MALE:
-          os<< "nmale";break;
-        case FEMALE:
-          os<< "nfemale";break;
-        }
-        os<<'\n';
+        os << mycoords[n].x << ' ' << mycoords[n].y << ' '
+           << _nodeSizes[n]*_nodeScale << ' '
+           << _nodeColors[n].red() << ' '
+           << _nodeColors[n].green() << ' '
+           << _nodeColors[n].blue() << ' ';
+        switch(_nodeShapes[n]) {
+        case CIRCLE:
+          os<< "nc";break;
+        case SQUARE:
+          os<< "nsq";break;
+        case DIAMOND:
+          os<< "ndi";break;
+        case MALE:
+          os<< "nmale";break;
+        case FEMALE:
+          os<< "nfemale";break;
+        }
+        os<<'\n';
       }
       os << "grestore\n";
@@ -1035 +1035 @@
       os << "(Helvetica) findfont fosi scalefont setfont\n";
       for(NodeIt n(g);n!=INVALID;++n) {
-        switch(_nodeTextColorType) {
-        case DIST_COL:
-          os << psOut(distantColor(_nodeColors[n])) << " setrgbcolor\n";
-          break;
-        case DIST_BW:
-          os << psOut(distantBW(_nodeColors[n])) << " setrgbcolor\n";
-          break;
-        case CUST_COL:
-          os << psOut(distantColor(_nodeTextColors[n])) << " setrgbcolor\n";
-          break;
-        default:
-          os << "0 0 0 setrgbcolor\n";
-        }
-        os << mycoords[n].x << ' ' << mycoords[n].y
-           << " (" << _nodeTexts[n] << ") cshow\n";
+        switch(_nodeTextColorType) {
+        case DIST_COL:
+          os << psOut(distantColor(_nodeColors[n])) << " setrgbcolor\n";
+          break;
+        case DIST_BW:
+          os << psOut(distantBW(_nodeColors[n])) << " setrgbcolor\n";
+          break;
+        case CUST_COL:
+          os << psOut(distantColor(_nodeTextColors[n])) << " setrgbcolor\n";
+          break;
+        default:
+          os << "0 0 0 setrgbcolor\n";
+        }
+        os << mycoords[n].x << ' ' << mycoords[n].y
+           << " (" << _nodeTexts[n] << ") cshow\n";
       }
       os << "grestore\n";
@@ -1056 +1056 @@
       os << "%Node PS blocks:\ngsave\n";
       for(NodeIt n(g);n!=INVALID;++n)
-        os << mycoords[n].x << ' ' << mycoords[n].y
-           << " moveto\n" << _nodePsTexts[n] << "\n";
+        os << mycoords[n].x << ' ' << mycoords[n].y
+           << " moveto\n" << _nodePsTexts[n] << "\n";
       os << "grestore\n";
     }
-    
+
     os << "grestore\nshowpage\n";
 
@@ -1093 +1093 @@
     return autoArcWidthScale(b);
   }
-  
+
   ///An alias for absoluteArcWidths()
   GraphToEps<T> &absoluteEdgeWidths(bool b=true)
@@ -1099 +1099 @@
     return absoluteArcWidths(b);
   }
-  
+
   ///An alias for parArcDist()
   GraphToEps<T> &parEdgeDist(double d) {return parArcDist(d);}
-  
+
   ///An alias for hideArcs()
   GraphToEps<T> &hideEdges(bool b=true) {return hideArcs(b);}
@@ -1144 +1144 @@
 ///\sa graphToEps(G &g, const char *file_name)
 template<class G>
-GraphToEps<DefaultGraphToEpsTraits<G> > 
+GraphToEps<DefaultGraphToEpsTraits<G> >
 graphToEps(G &g, std::ostream& os=std::cout)
 {
-  return 
+  return
     GraphToEps<DefaultGraphToEpsTraits<G> >(DefaultGraphToEpsTraits<G>(g,os));
 }
- 
+
 ///Generates an EPS file from a graph
 
@@ -1160 +1160 @@
 ///\sa graphToEps(G &g, std::ostream& os)
 template<class G>
-GraphToEps<DefaultGraphToEpsTraits<G> > 
+GraphToEps<DefaultGraphToEpsTraits<G> >
 graphToEps(G &g,const char *file_name)
 {
@@ -1176 +1176 @@
 ///\sa graphToEps(G &g, std::ostream& os)
 template<class G>
-GraphToEps<DefaultGraphToEpsTraits<G> > 
+GraphToEps<DefaultGraphToEpsTraits<G> >
 graphToEps(G &g,const std::string& file_name)
 {

lemon/graph_utils.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -47 +47 @@
   ///This \c \#define creates convenience typedefs for the following types
   ///of \c Digraph: \c Node,  \c NodeIt, \c Arc, \c ArcIt, \c InArcIt,
-  ///\c OutArcIt, \c BoolNodeMap, \c IntNodeMap, \c DoubleNodeMap, 
+  ///\c OutArcIt, \c BoolNodeMap, \c IntNodeMap, \c DoubleNodeMap,
   ///\c BoolArcMap, \c IntArcMap, \c DoubleArcMap.
   ///
@@ -53 +53 @@
   ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
   ///macro.
-#define DIGRAPH_TYPEDEFS(Digraph)                                       \
-  typedef Digraph::Node Node;                                           \
-  typedef Digraph::NodeIt NodeIt;                                       \
-  typedef Digraph::Arc Arc;                                             \
-  typedef Digraph::ArcIt ArcIt;                                         \
-  typedef Digraph::InArcIt InArcIt;                                     \
-  typedef Digraph::OutArcIt OutArcIt;                                   \
-  typedef Digraph::NodeMap<bool> BoolNodeMap;                           \
-  typedef Digraph::NodeMap<int> IntNodeMap;                             \
-  typedef Digraph::NodeMap<double> DoubleNodeMap;                       \
-  typedef Digraph::ArcMap<bool> BoolArcMap;                             \
-  typedef Digraph::ArcMap<int> IntArcMap;                               \
+#define DIGRAPH_TYPEDEFS(Digraph)                                        \
+  typedef Digraph::Node Node;                                                \
+  typedef Digraph::NodeIt NodeIt;                                        \
+  typedef Digraph::Arc Arc;                                                \
+  typedef Digraph::ArcIt ArcIt;                                                \
+  typedef Digraph::InArcIt InArcIt;                                        \
+  typedef Digraph::OutArcIt OutArcIt;                                        \
+  typedef Digraph::NodeMap<bool> BoolNodeMap;                                \
+  typedef Digraph::NodeMap<int> IntNodeMap;                                \
+  typedef Digraph::NodeMap<double> DoubleNodeMap;                        \
+  typedef Digraph::ArcMap<bool> BoolArcMap;                                \
+  typedef Digraph::ArcMap<int> IntArcMap;                                \
   typedef Digraph::ArcMap<double> DoubleArcMap
 
@@ -73 +73 @@
   ///\note Use this macro, if the graph type is a dependent type,
   ///ie. the graph type depend on a template parameter.
-#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph)                              \
-  typedef typename Digraph::Node Node;                                  \
-  typedef typename Digraph::NodeIt NodeIt;                              \
-  typedef typename Digraph::Arc Arc;                                    \
-  typedef typename Digraph::ArcIt ArcIt;                                \
-  typedef typename Digraph::InArcIt InArcIt;                            \
-  typedef typename Digraph::OutArcIt OutArcIt;                          \
-  typedef typename Digraph::template NodeMap<bool> BoolNodeMap;         \
-  typedef typename Digraph::template NodeMap<int> IntNodeMap;           \
-  typedef typename Digraph::template NodeMap<double> DoubleNodeMap;     \
-  typedef typename Digraph::template ArcMap<bool> BoolArcMap;           \
-  typedef typename Digraph::template ArcMap<int> IntArcMap;             \
+#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph)                                \
+  typedef typename Digraph::Node Node;                                        \
+  typedef typename Digraph::NodeIt NodeIt;                                \
+  typedef typename Digraph::Arc Arc;                                        \
+  typedef typename Digraph::ArcIt ArcIt;                                \
+  typedef typename Digraph::InArcIt InArcIt;                                \
+  typedef typename Digraph::OutArcIt OutArcIt;                                \
+  typedef typename Digraph::template NodeMap<bool> BoolNodeMap;                \
+  typedef typename Digraph::template NodeMap<int> IntNodeMap;                \
+  typedef typename Digraph::template NodeMap<double> DoubleNodeMap;        \
+  typedef typename Digraph::template ArcMap<bool> BoolArcMap;                \
+  typedef typename Digraph::template ArcMap<int> IntArcMap;                \
   typedef typename Digraph::template ArcMap<double> DoubleArcMap
-  
+
   ///Creates convenience typedefs for the graph types and iterators
 
@@ -97 +97 @@
   ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
   ///macro.
-#define GRAPH_TYPEDEFS(Graph)                                           \
-  DIGRAPH_TYPEDEFS(Graph);                                              \
-  typedef Graph::Edge Edge;                                             \
-  typedef Graph::EdgeIt EdgeIt;                                         \
-  typedef Graph::IncEdgeIt IncEdgeIt;                                   \
-  typedef Graph::EdgeMap<bool> BoolEdgeMap;                             \
-  typedef Graph::EdgeMap<int> IntEdgeMap;                               \
+#define GRAPH_TYPEDEFS(Graph)                                                \
+  DIGRAPH_TYPEDEFS(Graph);                                                \
+  typedef Graph::Edge Edge;                                                \
+  typedef Graph::EdgeIt EdgeIt;                                                \
+  typedef Graph::IncEdgeIt IncEdgeIt;                                        \
+  typedef Graph::EdgeMap<bool> BoolEdgeMap;                                \
+  typedef Graph::EdgeMap<int> IntEdgeMap;                                \
   typedef Graph::EdgeMap<double> DoubleEdgeMap
 
@@ -112 +112 @@
   ///\note Use this macro, if the graph type is a dependent type,
   ///ie. the graph type depend on a template parameter.
-#define TEMPLATE_GRAPH_TYPEDEFS(Graph)                                  \
-  TEMPLATE_DIGRAPH_TYPEDEFS(Graph);                                     \
-  typedef typename Graph::Edge Edge;                                    \
-  typedef typename Graph::EdgeIt EdgeIt;                                \
-  typedef typename Graph::IncEdgeIt IncEdgeIt;                          \
-  typedef typename Graph::template EdgeMap<bool> BoolEdgeMap;           \
-  typedef typename Graph::template EdgeMap<int> IntEdgeMap;             \
+#define TEMPLATE_GRAPH_TYPEDEFS(Graph)                                        \
+  TEMPLATE_DIGRAPH_TYPEDEFS(Graph);                                        \
+  typedef typename Graph::Edge Edge;                                        \
+  typedef typename Graph::EdgeIt EdgeIt;                                \
+  typedef typename Graph::IncEdgeIt IncEdgeIt;                                \
+  typedef typename Graph::template EdgeMap<bool> BoolEdgeMap;                \
+  typedef typename Graph::template EdgeMap<int> IntEdgeMap;                \
   typedef typename Graph::template EdgeMap<double> DoubleEdgeMap
 
@@ -139 +139 @@
 
   namespace _graph_utils_bits {
-    
+
     template <typename Graph, typename Enable = void>
     struct CountNodesSelector {
@@ -149 +149 @@
     template <typename Graph>
     struct CountNodesSelector<
-      Graph, typename 
-      enable_if<typename Graph::NodeNumTag, void>::type> 
+      Graph, typename
+      enable_if<typename Graph::NodeNumTag, void>::type>
     {
       static int count(const Graph &g) {
         return g.nodeNum();
       }
-    };    
+    };
   }
 
@@ -164 +164 @@
   /// graph structures it is specialized to run in O(1).
   ///
-  /// If the graph contains a \e nodeNum() member function and a 
+  /// If the graph contains a \e nodeNum() member function and a
   /// \e NodeNumTag tag then this function calls directly the member
   /// function to query the cardinality of the node set.
@@ -175 +175 @@
 
   namespace _graph_utils_bits {
-    
+
     template <typename Graph, typename Enable = void>
     struct CountArcsSelector {
@@ -185 +185 @@
     template <typename Graph>
     struct CountArcsSelector<
-      Graph, 
-      typename enable_if<typename Graph::ArcNumTag, void>::type> 
+      Graph,
+      typename enable_if<typename Graph::ArcNumTag, void>::type>
     {
       static int count(const Graph &g) {
         return g.arcNum();
       }
-    };    
+    };
   }
 
@@ -200 +200 @@
   /// graph structures it is specialized to run in O(1).
   ///
-  /// If the graph contains a \e arcNum() member function and a 
+  /// If the graph contains a \e arcNum() member function and a
   /// \e EdgeNumTag tag then this function calls directly the member
   /// function to query the cardinality of the arc set.
@@ -210 +210 @@
   // Edge counting:
   namespace _graph_utils_bits {
-    
+
     template <typename Graph, typename Enable = void>
     struct CountEdgesSelector {
@@ -220 +220 @@
     template <typename Graph>
     struct CountEdgesSelector<
-      Graph, 
-      typename enable_if<typename Graph::EdgeNumTag, void>::type> 
+      Graph,
+      typename enable_if<typename Graph::EdgeNumTag, void>::type>
     {
       static int count(const Graph &g) {
         return g.edgeNum();
       }
-    };    
+    };
   }
 
@@ -235 +235 @@
   /// graph structures it is specialized to run in O(1).
   ///
-  /// If the graph contains a \e edgeNum() member function and a 
+  /// If the graph contains a \e edgeNum() member function and a
   /// \e EdgeNumTag tag then this function calls directly the member
   /// function to query the cardinality of the edge set.
@@ -257 +257 @@
   ///
   /// This function counts the number of the out-arcs from node \c n
-  /// in the graph.  
+  /// in the graph.
   template <typename Graph>
   inline int countOutArcs(const Graph& _g,  const typename Graph::Node& _n) {
@@ -266 +266 @@
   ///
   /// This function counts the number of the in-arcs to node \c n
-  /// in the graph.  
+  /// in the graph.
   template <typename Graph>
   inline int countInArcs(const Graph& _g,  const typename Graph::Node& _n) {
@@ -275 +275 @@
   ///
   /// This function counts the number of the inc-edges to node \c n
-  /// in the graph.  
+  /// in the graph.
   template <typename Graph>
   inline int countIncEdges(const Graph& _g,  const typename Graph::Node& _n) {
@@ -282 +282 @@
 
   namespace _graph_utils_bits {
-    
+
     template <typename Graph, typename Enable = void>
     struct FindArcSelector {
@@ -302 +302 @@
     template <typename Graph>
     struct FindArcSelector<
-      Graph, 
-      typename enable_if<typename Graph::FindEdgeTag, void>::type> 
+      Graph,
+      typename enable_if<typename Graph::FindEdgeTag, void>::type>
     {
       typedef typename Graph::Node Node;
@@ -310 +310 @@
         return g.findArc(u, v, prev);
       }
-    };    
+    };
   }
 
@@ -334 +334 @@
   ///\sa ConArcIt
   template <typename Graph>
-  inline typename Graph::Arc 
+  inline typename Graph::Arc
   findArc(const Graph &g, typename Graph::Node u, typename Graph::Node v,
            typename Graph::Arc prev = INVALID) {
@@ -342 +342 @@
   /// \brief Iterator for iterating on arcs connected the same nodes.
   ///
-  /// Iterator for iterating on arcs connected the same nodes. It is 
+  /// Iterator for iterating on arcs connected the same nodes. It is
   /// higher level interface for the findArc() function. You can
   /// use it the following way:
@@ -350 +350 @@
   /// }
   ///\endcode
-  /// 
+  ///
   ///\sa findArc()
   ///\sa ArcLookUp
@@ -375 +375 @@
     /// \brief Constructor.
     ///
-    /// Construct a new ConArcIt which continues the iterating from 
+    /// Construct a new ConArcIt which continues the iterating from
     /// the \c e arc.
     ConArcIt(const Graph& g, Arc a) : Parent(a), _graph(g) {}
-    
+
     /// \brief Increment operator.
     ///
     /// It increments the iterator and gives back the next arc.
     ConArcIt& operator++() {
-      Parent::operator=(findArc(_graph, _graph.source(*this), 
-                                _graph.target(*this), *this));
+      Parent::operator=(findArc(_graph, _graph.source(*this),
+                                _graph.target(*this), *this));
       return *this;
     }
@@ -392 +392 @@
 
   namespace _graph_utils_bits {
-    
+
     template <typename Graph, typename Enable = void>
     struct FindEdgeSelector {
@@ -426 +426 @@
     template <typename Graph>
     struct FindEdgeSelector<
-      Graph, 
-      typename enable_if<typename Graph::FindEdgeTag, void>::type> 
+      Graph,
+      typename enable_if<typename Graph::FindEdgeTag, void>::type>
     {
       typedef typename Graph::Node Node;
@@ -434 +434 @@
         return g.findEdge(u, v, prev);
       }
-    };    
+    };
   }
 
@@ -450 +450 @@
   /// Thus you can iterate through each arc from \c u to \c v as it follows.
   ///\code
-  /// for(Edge e = findEdge(g,u,v); e != INVALID; 
+  /// for(Edge e = findEdge(g,u,v); e != INVALID;
   ///     e = findEdge(g,u,v,e)) {
   ///   ...
@@ -459 +459 @@
 
   template <typename Graph>
-  inline typename Graph::Edge 
+  inline typename Graph::Edge
   findEdge(const Graph &g, typename Graph::Node u, typename Graph::Node v,
             typename Graph::Edge p = INVALID) {
@@ -467 +467 @@
   /// \brief Iterator for iterating on edges connected the same nodes.
   ///
-  /// Iterator for iterating on edges connected the same nodes. It is 
+  /// Iterator for iterating on edges connected the same nodes. It is
   /// higher level interface for the findEdge() function. You can
   /// use it the following way:
@@ -497 +497 @@
     /// \brief Constructor.
     ///
-    /// Construct a new ConEdgeIt which continues the iterating from 
+    /// Construct a new ConEdgeIt which continues the iterating from
     /// the \c e edge.
     ConEdgeIt(const Graph& g, Edge e) : Parent(e), _graph(g) {}
-    
+
     /// \brief Increment operator.
     ///
     /// It increments the iterator and gives back the next edge.
     ConEdgeIt& operator++() {
-      Parent::operator=(findEdge(_graph, _graph.u(*this), 
-                                 _graph.v(*this), *this));
+      Parent::operator=(findEdge(_graph, _graph.u(*this),
+                                 _graph.v(*this), *this));
       return *this;
     }
@@ -519 +519 @@
     public:
       virtual void copy(const Digraph& from, const RefMap& refMap) = 0;
-      
+
       virtual ~MapCopyBase() {}
     };
 
-    template <typename Digraph, typename Item, typename RefMap, 
+    template <typename Digraph, typename Item, typename RefMap,
               typename ToMap, typename FromMap>
     class MapCopy : public MapCopyBase<Digraph, Item, RefMap> {
     public:
 
-      MapCopy(ToMap& tmap, const FromMap& map) 
+      MapCopy(ToMap& tmap, const FromMap& map)
         : _tmap(tmap), _map(map) {}
-      
+
       virtual void copy(const Digraph& digraph, const RefMap& refMap) {
         typedef typename ItemSetTraits<Digraph, Item>::ItemIt ItemIt;
@@ -548 +548 @@
 
       ItemCopy(It& it, const Item& item) : _it(it), _item(item) {}
-      
+
       virtual void copy(const Digraph&, const RefMap& refMap) {
         _it = refMap[_item];
@@ -563 +563 @@
 
       RefCopy(Ref& map) : _map(map) {}
-      
+
       virtual void copy(const Digraph& digraph, const RefMap& refMap) {
         typedef typename ItemSetTraits<Digraph, Item>::ItemIt ItemIt;
@@ -575 +575 @@
     };
 
-    template <typename Digraph, typename Item, typename RefMap, 
+    template <typename Digraph, typename Item, typename RefMap,
               typename CrossRef>
     class CrossRefCopy : public MapCopyBase<Digraph, Item, RefMap> {
@@ -581 +581 @@
 
       CrossRefCopy(CrossRef& cmap) : _cmap(cmap) {}
-      
+
       virtual void copy(const Digraph& digraph, const RefMap& refMap) {
         typedef typename ItemSetTraits<Digraph, Item>::ItemIt ItemIt;
@@ -602 +602 @@
         }
         for (typename From::ArcIt it(from); it != INVALID; ++it) {
-          arcRefMap[it] = to.addArc(nodeRefMap[from.source(it)], 
-                                    nodeRefMap[from.target(it)]);
+          arcRefMap[it] = to.addArc(nodeRefMap[from.source(it)],
+                                    nodeRefMap[from.target(it)]);
         }
       }
@@ -610 +610 @@
     template <typename Digraph>
     struct DigraphCopySelector<
-      Digraph, 
-      typename enable_if<typename Digraph::BuildTag, void>::type> 
+      Digraph,
+      typename enable_if<typename Digraph::BuildTag, void>::type>
     {
       template <typename From, typename NodeRefMap, typename ArcRefMap>
@@ -629 +629 @@
         }
         for (typename From::EdgeIt it(from); it != INVALID; ++it) {
-          edgeRefMap[it] = to.addEdge(nodeRefMap[from.u(it)], 
-                                      nodeRefMap[from.v(it)]);
+          edgeRefMap[it] = to.addEdge(nodeRefMap[from.u(it)],
+                                      nodeRefMap[from.v(it)]);
         }
       }
@@ -637 +637 @@
     template <typename Graph>
     struct GraphCopySelector<
-      Graph, 
-      typename enable_if<typename Graph::BuildTag, void>::type> 
+      Graph,
+      typename enable_if<typename Graph::BuildTag, void>::type>
     {
       template <typename From, typename NodeRefMap, typename EdgeRefMap>
@@ -698 +698 @@
     typedef typename From::template NodeMap<TNode> NodeRefMap;
     typedef typename From::template ArcMap<TArc> ArcRefMap;
-    
-    
-  public: 
+
+
+  public:
 
 
@@ -707 +707 @@
     /// It copies the content of the \c _from digraph into the
     /// \c _to digraph.
-    DigraphCopy(To& to, const From& from) 
+    DigraphCopy(To& to, const From& from)
       : _from(from), _to(to) {}
 
@@ -731 +731 @@
     template <typename NodeRef>
     DigraphCopy& nodeRef(NodeRef& map) {
-      _node_maps.push_back(new _graph_utils_bits::RefCopy<From, Node, 
-                           NodeRefMap, NodeRef>(map));
+      _node_maps.push_back(new _graph_utils_bits::RefCopy<From, Node,
+                           NodeRefMap, NodeRef>(map));
       return *this;
     }
@@ -745 +745 @@
     DigraphCopy& nodeCrossRef(NodeCrossRef& map) {
       _node_maps.push_back(new _graph_utils_bits::CrossRefCopy<From, Node,
-                           NodeRefMap, NodeCrossRef>(map));
+                           NodeRefMap, NodeCrossRef>(map));
       return *this;
     }
@@ -756 +756 @@
     template <typename ToMap, typename FromMap>
     DigraphCopy& nodeMap(ToMap& tmap, const FromMap& map) {
-      _node_maps.push_back(new _graph_utils_bits::MapCopy<From, Node, 
-                           NodeRefMap, ToMap, FromMap>(tmap, map));
+      _node_maps.push_back(new _graph_utils_bits::MapCopy<From, Node,
+                           NodeRefMap, ToMap, FromMap>(tmap, map));
       return *this;
     }
@@ -765 +765 @@
     /// Make a copy of the given node.
     DigraphCopy& node(TNode& tnode, const Node& snode) {
-      _node_maps.push_back(new _graph_utils_bits::ItemCopy<From, Node, 
-                           NodeRefMap, TNode>(tnode, snode));
+      _node_maps.push_back(new _graph_utils_bits::ItemCopy<From, Node,
+                           NodeRefMap, TNode>(tnode, snode));
       return *this;
     }
@@ -775 +775 @@
     template <typename ArcRef>
     DigraphCopy& arcRef(ArcRef& map) {
-      _arc_maps.push_back(new _graph_utils_bits::RefCopy<From, Arc, 
-                          ArcRefMap, ArcRef>(map));
+      _arc_maps.push_back(new _graph_utils_bits::RefCopy<From, Arc,
+                          ArcRefMap, ArcRef>(map));
       return *this;
     }
@@ -787 +787 @@
     DigraphCopy& arcCrossRef(ArcCrossRef& map) {
       _arc_maps.push_back(new _graph_utils_bits::CrossRefCopy<From, Arc,
-                          ArcRefMap, ArcCrossRef>(map));
+                          ArcRefMap, ArcCrossRef>(map));
       return *this;
     }
@@ -793 +793 @@
     /// \brief Make copy of the given map.
     ///
-    /// Makes copy of the given map for the newly created digraph. 
+    /// Makes copy of the given map for the newly created digraph.
     /// The new map's key type is the to digraph's arc type,
     /// and the copied map's key type is the from digraph's arc
-    /// type.  
+    /// type.
     template <typename ToMap, typename FromMap>
     DigraphCopy& arcMap(ToMap& tmap, const FromMap& map) {
-      _arc_maps.push_back(new _graph_utils_bits::MapCopy<From, Arc, 
-                          ArcRefMap, ToMap, FromMap>(tmap, map));
+      _arc_maps.push_back(new _graph_utils_bits::MapCopy<From, Arc,
+                          ArcRefMap, ToMap, FromMap>(tmap, map));
       return *this;
     }
@@ -808 +808 @@
     /// Make a copy of the given arc.
     DigraphCopy& arc(TArc& tarc, const Arc& sarc) {
-      _arc_maps.push_back(new _graph_utils_bits::ItemCopy<From, Arc, 
-                          ArcRefMap, TArc>(tarc, sarc));
+      _arc_maps.push_back(new _graph_utils_bits::ItemCopy<From, Arc,
+                          ArcRefMap, TArc>(tarc, sarc));
       return *this;
     }
@@ -826 +826 @@
       for (int i = 0; i < int(_arc_maps.size()); ++i) {
         _arc_maps[i]->copy(_from, arcRefMap);
-      }      
+      }
     }
 
@@ -835 +835 @@
     To& _to;
 
-    std::vector<_graph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* > 
+    std::vector<_graph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* >
     _node_maps;
 
-    std::vector<_graph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* > 
+    std::vector<_graph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* >
     _arc_maps;
 
@@ -851 +851 @@
   /// copyDigraph(trg, src).nodeRef(nr).arcCrossRef(ecr).run();
   ///\endcode
-  /// 
+  ///
   /// After the copy the \c nr map will contain the mapping from the
   /// nodes of the \c from digraph to the nodes of the \c to digraph and
@@ -857 +857 @@
   /// to the arcs of the \c from digraph.
   ///
-  /// \see DigraphCopy 
+  /// \see DigraphCopy
   template <typename To, typename From>
   DigraphCopy<To, From> copyDigraph(To& to, const From& from) {
@@ -918 +918 @@
     struct ArcRefMap {
       ArcRefMap(const To& to, const From& from,
-                const EdgeRefMap& edge_ref, const NodeRefMap& node_ref) 
-        : _to(to), _from(from), 
+                const EdgeRefMap& edge_ref, const NodeRefMap& node_ref)
+        : _to(to), _from(from),
           _edge_ref(edge_ref), _node_ref(node_ref) {}
 
@@ -927 +927 @@
       Value operator[](const Key& key) const {
         bool forward = _from.u(key) != _from.v(key) ?
-          _node_ref[_from.source(key)] == 
-          _to.source(_to.direct(_edge_ref[key], true)) :
-          _from.direction(key);
-        return _to.direct(_edge_ref[key], forward); 
-      }
-      
+          _node_ref[_from.source(key)] ==
+          _to.source(_to.direct(_edge_ref[key], true)) :
+          _from.direction(key);
+        return _to.direct(_edge_ref[key], forward);
+      }
+
       const To& _to;
       const From& _from;
@@ -939 +939 @@
     };
 
-    
-  public: 
+
+  public:
 
 
@@ -947 +947 @@
     /// It copies the content of the \c _from graph into the
     /// \c _to graph.
-    GraphCopy(To& to, const From& from) 
+    GraphCopy(To& to, const From& from)
       : _from(from), _to(to) {}
 
@@ -971 +971 @@
     template <typename NodeRef>
     GraphCopy& nodeRef(NodeRef& map) {
-      _node_maps.push_back(new _graph_utils_bits::RefCopy<From, Node, 
-                           NodeRefMap, NodeRef>(map));
+      _node_maps.push_back(new _graph_utils_bits::RefCopy<From, Node,
+                           NodeRefMap, NodeRef>(map));
       return *this;
     }
@@ -983 +983 @@
     GraphCopy& nodeCrossRef(NodeCrossRef& map) {
       _node_maps.push_back(new _graph_utils_bits::CrossRefCopy<From, Node,
-                           NodeRefMap, NodeCrossRef>(map));
+                           NodeRefMap, NodeCrossRef>(map));
       return *this;
     }
@@ -989 +989 @@
     /// \brief Make copy of the given map.
     ///
-    /// Makes copy of the given map for the newly created graph. 
+    /// Makes copy of the given map for the newly created graph.
     /// The new map's key type is the to graph's node type,
     /// and the copied map's key type is the from graph's node
-    /// type.  
+    /// type.
     template <typename ToMap, typename FromMap>
     GraphCopy& nodeMap(ToMap& tmap, const FromMap& map) {
-      _node_maps.push_back(new _graph_utils_bits::MapCopy<From, Node, 
-                           NodeRefMap, ToMap, FromMap>(tmap, map));
+      _node_maps.push_back(new _graph_utils_bits::MapCopy<From, Node,
+                           NodeRefMap, ToMap, FromMap>(tmap, map));
       return *this;
     }
@@ -1004 +1004 @@
     /// Make a copy of the given node.
     GraphCopy& node(TNode& tnode, const Node& snode) {
-      _node_maps.push_back(new _graph_utils_bits::ItemCopy<From, Node, 
-                           NodeRefMap, TNode>(tnode, snode));
+      _node_maps.push_back(new _graph_utils_bits::ItemCopy<From, Node,
+                           NodeRefMap, TNode>(tnode, snode));
       return *this;
     }
@@ -1014 +1014 @@
     template <typename ArcRef>
     GraphCopy& arcRef(ArcRef& map) {
-      _arc_maps.push_back(new _graph_utils_bits::RefCopy<From, Arc, 
-                          ArcRefMap, ArcRef>(map));
+      _arc_maps.push_back(new _graph_utils_bits::RefCopy<From, Arc,
+                          ArcRefMap, ArcRef>(map));
       return *this;
     }
@@ -1026 +1026 @@
     GraphCopy& arcCrossRef(ArcCrossRef& map) {
       _arc_maps.push_back(new _graph_utils_bits::CrossRefCopy<From, Arc,
-                          ArcRefMap, ArcCrossRef>(map));
+                          ArcRefMap, ArcCrossRef>(map));
       return *this;
     }
@@ -1032 +1032 @@
     /// \brief Make copy of the given map.
     ///
-    /// Makes copy of the given map for the newly created graph. 
+    /// Makes copy of the given map for the newly created graph.
     /// The new map's key type is the to graph's arc type,
     /// and the copied map's key type is the from graph's arc
-    /// type.  
+    /// type.
     template <typename ToMap, typename FromMap>
     GraphCopy& arcMap(ToMap& tmap, const FromMap& map) {
-      _arc_maps.push_back(new _graph_utils_bits::MapCopy<From, Arc, 
-                          ArcRefMap, ToMap, FromMap>(tmap, map));
+      _arc_maps.push_back(new _graph_utils_bits::MapCopy<From, Arc,
+                          ArcRefMap, ToMap, FromMap>(tmap, map));
       return *this;
     }
@@ -1047 +1047 @@
     /// Make a copy of the given arc.
     GraphCopy& arc(TArc& tarc, const Arc& sarc) {
-      _arc_maps.push_back(new _graph_utils_bits::ItemCopy<From, Arc, 
-                          ArcRefMap, TArc>(tarc, sarc));
+      _arc_maps.push_back(new _graph_utils_bits::ItemCopy<From, Arc,
+                          ArcRefMap, TArc>(tarc, sarc));
       return *this;
     }
@@ -1057 +1057 @@
     template <typename EdgeRef>
     GraphCopy& edgeRef(EdgeRef& map) {
-      _edge_maps.push_back(new _graph_utils_bits::RefCopy<From, Edge, 
-                           EdgeRefMap, EdgeRef>(map));
+      _edge_maps.push_back(new _graph_utils_bits::RefCopy<From, Edge,
+                           EdgeRefMap, EdgeRef>(map));
       return *this;
     }
@@ -1068 +1068 @@
     template <typename EdgeCrossRef>
     GraphCopy& edgeCrossRef(EdgeCrossRef& map) {
-      _edge_maps.push_back(new _graph_utils_bits::CrossRefCopy<From, 
-                           Edge, EdgeRefMap, EdgeCrossRef>(map));
+      _edge_maps.push_back(new _graph_utils_bits::CrossRefCopy<From,
+                           Edge, EdgeRefMap, EdgeCrossRef>(map));
       return *this;
     }
@@ -1075 +1075 @@
     /// \brief Make copy of the given map.
     ///
-    /// Makes copy of the given map for the newly created graph. 
+    /// Makes copy of the given map for the newly created graph.
     /// The new map's key type is the to graph's edge type,
     /// and the copied map's key type is the from graph's edge
-    /// type.  
+    /// type.
     template <typename ToMap, typename FromMap>
     GraphCopy& edgeMap(ToMap& tmap, const FromMap& map) {
-      _edge_maps.push_back(new _graph_utils_bits::MapCopy<From, Edge, 
-                           EdgeRefMap, ToMap, FromMap>(tmap, map));
+      _edge_maps.push_back(new _graph_utils_bits::MapCopy<From, Edge,
+                           EdgeRefMap, ToMap, FromMap>(tmap, map));
       return *this;
     }
@@ -1090 +1090 @@
     /// Make a copy of the given edge.
     GraphCopy& edge(TEdge& tedge, const Edge& sedge) {
-      _edge_maps.push_back(new _graph_utils_bits::ItemCopy<From, Edge, 
-                           EdgeRefMap, TEdge>(tedge, sedge));
+      _edge_maps.push_back(new _graph_utils_bits::ItemCopy<From, Edge,
+                           EdgeRefMap, TEdge>(tedge, sedge));
       return *this;
     }
@@ -1116 +1116 @@
 
   private:
-    
+
     const From& _from;
     To& _to;
 
-    std::vector<_graph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* > 
+    std::vector<_graph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* >
     _node_maps;
 
-    std::vector<_graph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* > 
+    std::vector<_graph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* >
     _arc_maps;
 
-    std::vector<_graph_utils_bits::MapCopyBase<From, Edge, EdgeRefMap>* > 
+    std::vector<_graph_utils_bits::MapCopyBase<From, Edge, EdgeRefMap>* >
     _edge_maps;
 
@@ -1139 +1139 @@
   /// copyGraph(trg, src).nodeRef(nr).arcCrossRef(ecr).run();
   ///\endcode
-  /// 
+  ///
   /// After the copy the \c nr map will contain the mapping from the
   /// nodes of the \c from graph to the nodes of the \c to graph and
@@ -1145 +1145 @@
   /// to the arcs of the \c from graph.
   ///
-  /// \see GraphCopy 
+  /// \see GraphCopy
   template <typename To, typename From>
-  GraphCopy<To, From> 
+  GraphCopy<To, From>
   copyGraph(To& to, const From& from) {
     return GraphCopy<To, From>(to, from);
@@ -1215 +1215 @@
       ///
       /// Gives back the given item from its id.
-      /// 
+      ///
       Item operator[](int id) const { return _graph->fromId(id, Item());}
 
@@ -1225 +1225 @@
     ///
     /// Gives back the inverse of the IdMap.
-    InverseMap inverse() const { return InverseMap(*_graph);} 
+    InverseMap inverse() const { return InverseMap(*_graph);}
 
   };
 
-  
+
   /// \brief General invertable graph-map type.
 
-  /// This type provides simple invertable graph-maps. 
-  /// The InvertableMap wraps an arbitrary ReadWriteMap 
+  /// This type provides simple invertable graph-maps.
+  /// The InvertableMap wraps an arbitrary ReadWriteMap
   /// and if a key is set to a new value then store it
   /// in the inverse map.
@@ -1248 +1248 @@
   class InvertableMap : protected DefaultMap<_Graph, _Item, _Value> {
   private:
-    
+
     typedef DefaultMap<_Graph, _Item, _Value> Map;
     typedef _Graph Graph;
 
     typedef std::map<_Value, _Item> Container;
-    Container _inv_map;    
+    Container _inv_map;
 
   public:
- 
+
     /// The key type of InvertableMap (Node, Arc, Edge).
     typedef typename Map::Key Key;
@@ -1268 +1268 @@
     /// Construct a new InvertableMap for the graph.
     ///
-    explicit InvertableMap(const Graph& graph) : Map(graph) {} 
+    explicit InvertableMap(const Graph& graph) : Map(graph) {}
 
     /// \brief Forward iterator for values.
@@ -1276 +1276 @@
     /// be accessed in the [beginValue, endValue) range.
     ///
-    class ValueIterator 
+    class ValueIterator
       : public std::iterator<std::forward_iterator_tag, Value> {
       friend class InvertableMap;
     private:
-      ValueIterator(typename Container::const_iterator _it) 
+      ValueIterator(typename Container::const_iterator _it)
         : it(_it) {}
     public:
-      
+
       ValueIterator() {}
 
       ValueIterator& operator++() { ++it; return *this; }
-      ValueIterator operator++(int) { 
-        ValueIterator tmp(*this); 
+      ValueIterator operator++(int) {
+        ValueIterator tmp(*this);
         operator++();
-        return tmp; 
+        return tmp;
       }
 
@@ -1298 +1298 @@
       bool operator==(ValueIterator jt) const { return it == jt.it; }
       bool operator!=(ValueIterator jt) const { return it != jt.it; }
-      
+
     private:
       typename Container::const_iterator it;
@@ -1305 +1305 @@
     /// \brief Returns an iterator to the first value.
     ///
-    /// Returns an stl compatible iterator to the 
+    /// Returns an stl compatible iterator to the
     /// first value of the map. The values of the
     /// map can be accessed in the [beginValue, endValue)
@@ -1315 +1315 @@
     /// \brief Returns an iterator after the last value.
     ///
-    /// Returns an stl compatible iterator after the 
+    /// Returns an stl compatible iterator after the
     /// last value of the map. The values of the
     /// map can be accessed in the [beginValue, endValue)
@@ -1322 +1322 @@
       return ValueIterator(_inv_map.end());
     }
-    
+
     /// \brief The setter function of the map.
     ///
@@ -1330 +1330 @@
       typename Container::iterator it = _inv_map.find(oldval);
       if (it != _inv_map.end() && it->second == key) {
-        _inv_map.erase(it);
-      }      
+        _inv_map.erase(it);
+      }
       _inv_map.insert(make_pair(val, key));
       Map::set(key, val);
@@ -1339 +1339 @@
     ///
     /// It gives back the value associated with the key.
-    typename MapTraits<Map>::ConstReturnValue 
+    typename MapTraits<Map>::ConstReturnValue
     operator[](const Key& key) const {
       return Map::operator[](key);
@@ -1362 +1362 @@
       typename Container::iterator it = _inv_map.find(val);
       if (it != _inv_map.end() && it->second == key) {
-        _inv_map.erase(it);
+        _inv_map.erase(it);
       }
       Map::erase(key);
@@ -1373 +1373 @@
     virtual void erase(const std::vector<Key>& keys) {
       for (int i = 0; i < int(keys.size()); ++i) {
-        Value val = Map::operator[](keys[i]);
-        typename Container::iterator it = _inv_map.find(val);
-        if (it != _inv_map.end() && it->second == keys[i]) {
-          _inv_map.erase(it);
-        }
+        Value val = Map::operator[](keys[i]);
+        typename Container::iterator it = _inv_map.find(val);
+        if (it != _inv_map.end() && it->second == keys[i]) {
+          _inv_map.erase(it);
+        }
       }
       Map::erase(keys);
@@ -1396 +1396 @@
     ///
     /// The inverse of this map. The subscript operator of the map
-    /// gives back always the item what was last assigned to the value. 
+    /// gives back always the item what was last assigned to the value.
     class InverseMap {
     public:
@@ -1402 +1402 @@
       ///
       /// Constructor of the InverseMap.
-      explicit InverseMap(const InvertableMap& inverted) 
+      explicit InverseMap(const InvertableMap& inverted)
         : _inverted(inverted) {}
 
@@ -1408 +1408 @@
       typedef typename InvertableMap::Key Value;
       /// The key type of the InverseMap.
-      typedef typename InvertableMap::Value Key; 
-
-      /// \brief Subscript operator. 
+      typedef typename InvertableMap::Value Key;
+
+      /// \brief Subscript operator.
       ///
-      /// Subscript operator. It gives back always the item 
+      /// Subscript operator. It gives back always the item
       /// what was last assigned to the value.
       Value operator[](const Key& key) const {
-        return _inverted(key);
-      }
-      
+        return _inverted(key);
+      }
+
     private:
       const InvertableMap& _inverted;
@@ -1427 +1427 @@
     InverseMap inverse() const {
       return InverseMap(*this);
-    } 
-
-
-    
+    }
+
+
+
   };
 
-  /// \brief Provides a mutable, continuous and unique descriptor for each 
+  /// \brief Provides a mutable, continuous and unique descriptor for each
   /// item in the graph.
   ///
@@ -1446 +1446 @@
   ///
   /// \tparam _Graph The graph class the \c DescriptorMap belongs to.
-  /// \tparam _Item The Item is the Key of the Map. It may be Node, Arc or 
+  /// \tparam _Item The Item is the Key of the Map. It may be Node, Arc or
   /// Edge.
   template <typename _Graph, typename _Item>
@@ -1468 +1468 @@
     explicit DescriptorMap(const Graph& _graph) : Map(_graph) {
       Item it;
-      const typename Map::Notifier* nf = Map::notifier(); 
+      const typename Map::Notifier* nf = Map::notifier();
       for (nf->first(it); it != INVALID; nf->next(it)) {
-        Map::set(it, _inv_map.size());
-        _inv_map.push_back(it); 
-      }      
+        Map::set(it, _inv_map.size());
+        _inv_map.push_back(it);
+      }
     }
 
@@ -1494 +1494 @@
       Map::add(items);
       for (int i = 0; i < int(items.size()); ++i) {
-        Map::set(items[i], _inv_map.size());
-        _inv_map.push_back(items[i]);
+        Map::set(items[i], _inv_map.size());
+        _inv_map.push_back(items[i]);
       }
     }
@@ -1516 +1516 @@
     virtual void erase(const std::vector<Item>& items) {
       for (int i = 0; i < int(items.size()); ++i) {
-        Map::set(_inv_map.back(), Map::operator[](items[i]));
-        _inv_map[Map::operator[](items[i])] = _inv_map.back();
-        _inv_map.pop_back();
+        Map::set(_inv_map.back(), Map::operator[](items[i]));
+        _inv_map[Map::operator[](items[i])] = _inv_map.back();
+        _inv_map.pop_back();
       }
       Map::erase(items);
@@ -1530 +1530 @@
       Map::build();
       Item it;
-      const typename Map::Notifier* nf = Map::notifier(); 
+      const typename Map::Notifier* nf = Map::notifier();
       for (nf->first(it); it != INVALID; nf->next(it)) {
-        Map::set(it, _inv_map.size());
-        _inv_map.push_back(it); 
-      }      
-    }
-    
+        Map::set(it, _inv_map.size());
+        _inv_map.push_back(it);
+      }
+    }
+
     /// \brief Clear the keys from the map.
     ///
@@ -1580 +1580 @@
       return _inv_map[id];
     }
-    
+
   private:
 
@@ -1595 +1595 @@
       ///
       /// Constructor of the InverseMap.
-      explicit InverseMap(const DescriptorMap& inverted) 
-        : _inverted(inverted) {}
+      explicit InverseMap(const DescriptorMap& inverted)
+        : _inverted(inverted) {}
 
 
@@ -1602 +1602 @@
       typedef typename DescriptorMap::Key Value;
       /// The key type of the InverseMap.
-      typedef typename DescriptorMap::Value Key; 
-
-      /// \brief Subscript operator. 
+      typedef typename DescriptorMap::Value Key;
+
+      /// \brief Subscript operator.
       ///
-      /// Subscript operator. It gives back the item 
+      /// Subscript operator. It gives back the item
       /// that the descriptor belongs to currently.
       Value operator[](const Key& key) const {
-        return _inverted(key);
+        return _inverted(key);
       }
 
@@ -1616 +1616 @@
       /// Returns the size of the map.
       unsigned int size() const {
-        return _inverted.size();
-      }
-      
+        return _inverted.size();
+      }
+
     private:
       const DescriptorMap& _inverted;
@@ -1633 +1633 @@
   /// \brief Returns the source of the given arc.
   ///
-  /// The SourceMap gives back the source Node of the given arc. 
+  /// The SourceMap gives back the source Node of the given arc.
   /// \see TargetMap
   template <typename Digraph>
@@ -1651 +1651 @@
     ///
     /// The subscript operator.
-    /// \param arc The arc 
-    /// \return The source of the arc 
+    /// \param arc The arc
+    /// \return The source of the arc
     Value operator[](const Key& arc) const {
       return _digraph.source(arc);
@@ -1668 +1668 @@
   inline SourceMap<Digraph> sourceMap(const Digraph& digraph) {
     return SourceMap<Digraph>(digraph);
-  } 
+  }
 
   /// \brief Returns the target of the given arc.
   ///
-  /// The TargetMap gives back the target Node of the given arc. 
+  /// The TargetMap gives back the target Node of the given arc.
   /// \see SourceMap
   template <typename Digraph>
@@ -1690 +1690 @@
     ///
     /// The subscript operator.
-    /// \param e The arc 
-    /// \return The target of the arc 
+    /// \param e The arc
+    /// \return The target of the arc
     Value operator[](const Key& e) const {
       return _digraph.target(e);
@@ -1729 +1729 @@
     ///
     /// The subscript operator.
-    /// \param key An edge 
-    /// \return The "forward" directed arc view of edge 
+    /// \param key An edge
+    /// \return The "forward" directed arc view of edge
     Value operator[](const Key& key) const {
       return _graph.direct(key, true);
@@ -1768 +1768 @@
     ///
     /// The subscript operator.
-    /// \param key An edge 
-    /// \return The "backward" directed arc view of edge 
+    /// \param key An edge
+    /// \return The "backward" directed arc view of edge
     Value operator[](const Key& key) const {
       return _graph.direct(key, false);
@@ -1801 +1801 @@
     ///
     /// Contructor of the map
-    explicit PotentialDifferenceMap(const Digraph& digraph, 
-                                    const NodeMap& potential) 
+    explicit PotentialDifferenceMap(const Digraph& digraph,
+                                    const NodeMap& potential)
       : _digraph(digraph), _potential(potential) {}
 
@@ -1809 +1809 @@
     /// Const subscription operator
     Value operator[](const Key& arc) const {
-      return _potential[_digraph.target(arc)] - 
-        _potential[_digraph.source(arc)];
+      return _potential[_digraph.target(arc)] -
+        _potential[_digraph.source(arc)];
     }
 
@@ -1823 +1823 @@
   /// \relates PotentialDifferenceMap
   template <typename Digraph, typename NodeMap>
-  PotentialDifferenceMap<Digraph, NodeMap> 
+  PotentialDifferenceMap<Digraph, NodeMap>
   potentialDifferenceMap(const Digraph& digraph, const NodeMap& potential) {
     return PotentialDifferenceMap<Digraph, NodeMap>(digraph, potential);
@@ -1846 +1846 @@
 
   template <typename _Digraph>
-  class InDegMap  
+  class InDegMap
     : protected ItemSetTraits<_Digraph, typename _Digraph::Arc>
       ::ItemNotifier::ObserverBase {
 
   public:
-    
+
     typedef _Digraph Digraph;
     typedef int Value;
@@ -1867 +1867 @@
 
       AutoNodeMap(const Digraph& digraph) : Parent(digraph, 0) {}
-      
+
       virtual void add(const Key& key) {
-        Parent::add(key);
-        Parent::set(key, 0);
+        Parent::add(key);
+        Parent::set(key, 0);
       }
 
       virtual void add(const std::vector<Key>& keys) {
-        Parent::add(keys);
-        for (int i = 0; i < int(keys.size()); ++i) {
-          Parent::set(keys[i], 0);
-        }
+        Parent::add(keys);
+        for (int i = 0; i < int(keys.size()); ++i) {
+          Parent::set(keys[i], 0);
+        }
       }
 
       virtual void build() {
-        Parent::build();
-        Key it;
-        typename Parent::Notifier* nf = Parent::notifier();
-        for (nf->first(it); it != INVALID; nf->next(it)) {
-          Parent::set(it, 0);
-        }
+        Parent::build();
+        Key it;
+        typename Parent::Notifier* nf = Parent::notifier();
+        for (nf->first(it); it != INVALID; nf->next(it)) {
+          Parent::set(it, 0);
+        }
       }
     };
@@ -1895 +1895 @@
     ///
     /// Constructor for creating in-degree map.
-    explicit InDegMap(const Digraph& digraph) 
+    explicit InDegMap(const Digraph& digraph)
       : _digraph(digraph), _deg(digraph) {
       Parent::attach(_digraph.notifier(typename Digraph::Arc()));
-      
+
       for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-        _deg[it] = countInArcs(_digraph, it);
-      }
-    }
-    
+        _deg[it] = countInArcs(_digraph, it);
+      }
+    }
+
     /// Gives back the in-degree of a Node.
     int operator[](const Key& key) const {
@@ -1910 +1910 @@
 
   protected:
-    
+
     typedef typename Digraph::Arc Arc;
 
@@ -1935 +1935 @@
     virtual void build() {
       for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-        _deg[it] = countInArcs(_digraph, it);
-      }      
+        _deg[it] = countInArcs(_digraph, it);
+      }
     }
 
     virtual void clear() {
       for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-        _deg[it] = 0;
+        _deg[it] = 0;
       }
     }
   private:
-    
+
     const Digraph& _digraph;
     AutoNodeMap _deg;
@@ -1968 +1968 @@
 
   template <typename _Digraph>
-  class OutDegMap  
+  class OutDegMap
     : protected ItemSetTraits<_Digraph, typename _Digraph::Arc>
       ::ItemNotifier::ObserverBase {
 
   public:
-    
+
     typedef _Digraph Digraph;
     typedef int Value;
@@ -1989 +1989 @@
 
       AutoNodeMap(const Digraph& digraph) : Parent(digraph, 0) {}
-      
+
       virtual void add(const Key& key) {
-        Parent::add(key);
-        Parent::set(key, 0);
+        Parent::add(key);
+        Parent::set(key, 0);
       }
       virtual void add(const std::vector<Key>& keys) {
-        Parent::add(keys);
-        for (int i = 0; i < int(keys.size()); ++i) {
-          Parent::set(keys[i], 0);
-        }
+        Parent::add(keys);
+        for (int i = 0; i < int(keys.size()); ++i) {
+          Parent::set(keys[i], 0);
+        }
       }
       virtual void build() {
-        Parent::build();
-        Key it;
-        typename Parent::Notifier* nf = Parent::notifier();
-        for (nf->first(it); it != INVALID; nf->next(it)) {
-          Parent::set(it, 0);
-        }
+        Parent::build();
+        Key it;
+        typename Parent::Notifier* nf = Parent::notifier();
+        for (nf->first(it); it != INVALID; nf->next(it)) {
+          Parent::set(it, 0);
+        }
       }
     };
@@ -2015 +2015 @@
     ///
     /// Constructor for creating out-degree map.
-    explicit OutDegMap(const Digraph& digraph) 
+    explicit OutDegMap(const Digraph& digraph)
       : _digraph(digraph), _deg(digraph) {
       Parent::attach(_digraph.notifier(typename Digraph::Arc()));
-      
+
       for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-        _deg[it] = countOutArcs(_digraph, it);
+        _deg[it] = countOutArcs(_digraph, it);
       }
     }
@@ -2030 +2030 @@
 
   protected:
-    
+
     typedef typename Digraph::Arc Arc;
 
@@ -2055 +2055 @@
     virtual void build() {
       for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-        _deg[it] = countOutArcs(_digraph, it);
-      }      
+        _deg[it] = countOutArcs(_digraph, it);
+      }
     }
 
     virtual void clear() {
       for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-        _deg[it] = 0;
+        _deg[it] = 0;
       }
     }
   private:
-    
+
     const Digraph& _digraph;
     AutoNodeMap _deg;
@@ -2072 +2072 @@
 
   ///Dynamic arc look up between given endpoints.
-  
+
   ///\ingroup gutils
   ///Using this class, you can find an arc in a digraph from a given
@@ -2090 +2090 @@
   ///queries.
   ///
-  ///\tparam G The type of the underlying digraph.  
-  ///
-  ///\sa ArcLookUp  
-  ///\sa AllArcLookUp  
+  ///\tparam G The type of the underlying digraph.
+  ///
+  ///\sa ArcLookUp
+  ///\sa AllArcLookUp
   template<class G>
-  class DynArcLookUp 
+  class DynArcLookUp
     : protected ItemSetTraits<G, typename G::Arc>::ItemNotifier::ObserverBase
   {
@@ -2113 +2113 @@
 
       AutoNodeMap(const G& digraph) : Parent(digraph, INVALID) {}
-      
+
       virtual void add(const Node& node) {
-        Parent::add(node);
-        Parent::set(node, INVALID);
+        Parent::add(node);
+        Parent::set(node, INVALID);
       }
 
       virtual void add(const std::vector<Node>& nodes) {
-        Parent::add(nodes);
-        for (int i = 0; i < int(nodes.size()); ++i) {
-          Parent::set(nodes[i], INVALID);
-        }
+        Parent::add(nodes);
+        for (int i = 0; i < int(nodes.size()); ++i) {
+          Parent::set(nodes[i], INVALID);
+        }
       }
 
       virtual void build() {
-        Parent::build();
-        Node it;
-        typename Parent::Notifier* nf = Parent::notifier();
-        for (nf->first(it); it != INVALID; nf->next(it)) {
-          Parent::set(it, INVALID);
-        }
+        Parent::build();
+        Node it;
+        typename Parent::Notifier* nf = Parent::notifier();
+        for (nf->first(it); it != INVALID; nf->next(it)) {
+          Parent::set(it, INVALID);
+        }
       }
     };
@@ -2141 +2141 @@
     typename Digraph::template ArcMap<Arc> _left;
     typename Digraph::template ArcMap<Arc> _right;
-    
+
     class ArcLess {
       const Digraph &g;
     public:
       ArcLess(const Digraph &_g) : g(_g) {}
-      bool operator()(Arc a,Arc b) const 
+      bool operator()(Arc a,Arc b) const
       {
-        return g.target(a)<g.target(b);
-      }
-    };
-    
+        return g.target(a)<g.target(b);
+      }
+    };
+
   public:
-    
+
     ///Constructor
 
@@ -2159 +2159 @@
     ///
     ///It builds up the search database.
-    DynArcLookUp(const Digraph &g) 
-      : _g(g),_head(g),_parent(g),_left(g),_right(g) 
-    { 
+    DynArcLookUp(const Digraph &g)
+      : _g(g),_head(g),_parent(g),_left(g),_right(g)
+    {
       Parent::attach(_g.notifier(typename Digraph::Arc()));
-      refresh(); 
-    }
-    
+      refresh();
+    }
+
   protected:
 
@@ -2174 +2174 @@
     virtual void add(const std::vector<Arc>& arcs) {
       for (int i = 0; i < int(arcs.size()); ++i) {
-        insert(arcs[i]);
+        insert(arcs[i]);
       }
     }
@@ -2184 +2184 @@
     virtual void erase(const std::vector<Arc>& arcs) {
       for (int i = 0; i < int(arcs.size()); ++i) {
-        remove(arcs[i]);
-      }     
+        remove(arcs[i]);
+      }
     }
 
@@ -2194 +2194 @@
     virtual void clear() {
       for(NodeIt n(_g);n!=INVALID;++n) {
-        _head.set(n, INVALID);
+        _head.set(n, INVALID);
       }
     }
@@ -2203 +2203 @@
       _left.set(arc, INVALID);
       _right.set(arc, INVALID);
-      
+
       Arc e = _head[s];
       if (e == INVALID) {
-        _head.set(s, arc);
-        _parent.set(arc, INVALID);
-        return;
+        _head.set(s, arc);
+        _parent.set(arc, INVALID);
+        return;
       }
       while (true) {
-        if (t < _g.target(e)) {
-          if (_left[e] == INVALID) {
-            _left.set(e, arc);
-            _parent.set(arc, e);
-            splay(arc);
-            return;
-          } else {
-            e = _left[e];
-          }
-        } else {
-          if (_right[e] == INVALID) {
-            _right.set(e, arc);
-            _parent.set(arc, e);
-            splay(arc);
-            return;
-          } else {
-            e = _right[e];
-          }
-        }
+        if (t < _g.target(e)) {
+          if (_left[e] == INVALID) {
+            _left.set(e, arc);
+            _parent.set(arc, e);
+            splay(arc);
+            return;
+          } else {
+            e = _left[e];
+          }
+        } else {
+          if (_right[e] == INVALID) {
+            _right.set(e, arc);
+            _parent.set(arc, e);
+            splay(arc);
+            return;
+          } else {
+            e = _right[e];
+          }
+        }
       }
     }
@@ -2235 +2235 @@
     void remove(Arc arc) {
       if (_left[arc] == INVALID) {
-        if (_right[arc] != INVALID) {
-          _parent.set(_right[arc], _parent[arc]);
-        }
-        if (_parent[arc] != INVALID) {
-          if (_left[_parent[arc]] == arc) {
-            _left.set(_parent[arc], _right[arc]);
-          } else {
-            _right.set(_parent[arc], _right[arc]);
-          }
-        } else {
-          _head.set(_g.source(arc), _right[arc]);
-        }
+        if (_right[arc] != INVALID) {
+          _parent.set(_right[arc], _parent[arc]);
+        }
+        if (_parent[arc] != INVALID) {
+          if (_left[_parent[arc]] == arc) {
+            _left.set(_parent[arc], _right[arc]);
+          } else {
+            _right.set(_parent[arc], _right[arc]);
+          }
+        } else {
+          _head.set(_g.source(arc), _right[arc]);
+        }
       } else if (_right[arc] == INVALID) {
-        _parent.set(_left[arc], _parent[arc]);
-        if (_parent[arc] != INVALID) {
-          if (_left[_parent[arc]] == arc) {
-            _left.set(_parent[arc], _left[arc]);
-          } else {
-            _right.set(_parent[arc], _left[arc]);
-          }
-        } else {
-          _head.set(_g.source(arc), _left[arc]);
-        }
+        _parent.set(_left[arc], _parent[arc]);
+        if (_parent[arc] != INVALID) {
+          if (_left[_parent[arc]] == arc) {
+            _left.set(_parent[arc], _left[arc]);
+          } else {
+            _right.set(_parent[arc], _left[arc]);
+          }
+        } else {
+          _head.set(_g.source(arc), _left[arc]);
+        }
       } else {
-        Arc e = _left[arc];
-        if (_right[e] != INVALID) {
-          e = _right[e];          
-          while (_right[e] != INVALID) {
-            e = _right[e];
-          }
-          Arc s = _parent[e];
-          _right.set(_parent[e], _left[e]);
-          if (_left[e] != INVALID) {
-            _parent.set(_left[e], _parent[e]);
-          }
-          
-          _left.set(e, _left[arc]);
-          _parent.set(_left[arc], e);
-          _right.set(e, _right[arc]);
-          _parent.set(_right[arc], e);
-
-          _parent.set(e, _parent[arc]);
-          if (_parent[arc] != INVALID) {
-            if (_left[_parent[arc]] == arc) {
-              _left.set(_parent[arc], e);
-            } else {
-              _right.set(_parent[arc], e);
-            }
-          }
-          splay(s);
-        } else {
-          _right.set(e, _right[arc]);
-          _parent.set(_right[arc], e);
-
-          if (_parent[arc] != INVALID) {
-            if (_left[_parent[arc]] == arc) {
-              _left.set(_parent[arc], e);
-            } else {
-              _right.set(_parent[arc], e);
-            }
-          } else {
-            _head.set(_g.source(arc), e);
-          }
-        }
-      }
-    }
-
-    Arc refreshRec(std::vector<Arc> &v,int a,int b) 
+        Arc e = _left[arc];
+        if (_right[e] != INVALID) {
+          e = _right[e];
+          while (_right[e] != INVALID) {
+            e = _right[e];
+          }
+          Arc s = _parent[e];
+          _right.set(_parent[e], _left[e]);
+          if (_left[e] != INVALID) {
+            _parent.set(_left[e], _parent[e]);
+          }
+
+          _left.set(e, _left[arc]);
+          _parent.set(_left[arc], e);
+          _right.set(e, _right[arc]);
+          _parent.set(_right[arc], e);
+
+          _parent.set(e, _parent[arc]);
+          if (_parent[arc] != INVALID) {
+            if (_left[_parent[arc]] == arc) {
+              _left.set(_parent[arc], e);
+            } else {
+              _right.set(_parent[arc], e);
+            }
+          }
+          splay(s);
+        } else {
+          _right.set(e, _right[arc]);
+          _parent.set(_right[arc], e);
+
+          if (_parent[arc] != INVALID) {
+            if (_left[_parent[arc]] == arc) {
+              _left.set(_parent[arc], e);
+            } else {
+              _right.set(_parent[arc], e);
+            }
+          } else {
+            _head.set(_g.source(arc), e);
+          }
+        }
+      }
+    }
+
+    Arc refreshRec(std::vector<Arc> &v,int a,int b)
     {
       int m=(a+b)/2;
       Arc me=v[m];
       if (a < m) {
-        Arc left = refreshRec(v,a,m-1);
-        _left.set(me, left);
-        _parent.set(left, me);
+        Arc left = refreshRec(v,a,m-1);
+        _left.set(me, left);
+        _parent.set(left, me);
       } else {
-        _left.set(me, INVALID);
+        _left.set(me, INVALID);
       }
       if (m < b) {
-        Arc right = refreshRec(v,m+1,b);
-        _right.set(me, right);
-        _parent.set(right, me);
+        Arc right = refreshRec(v,m+1,b);
+        _right.set(me, right);
+        _parent.set(right, me);
       } else {
-        _right.set(me, INVALID);
+        _right.set(me, INVALID);
       }
       return me;
@@ -2325 +2325 @@
     void refresh() {
       for(NodeIt n(_g);n!=INVALID;++n) {
-        std::vector<Arc> v;
-        for(OutArcIt e(_g,n);e!=INVALID;++e) v.push_back(e);
-        if(v.size()) {
-          std::sort(v.begin(),v.end(),ArcLess(_g));
-          Arc head = refreshRec(v,0,v.size()-1);
-          _head.set(n, head);
-          _parent.set(head, INVALID);
-        }
-        else _head.set(n, INVALID);
-      }
-    }
-
-    void zig(Arc v) {        
+        std::vector<Arc> v;
+        for(OutArcIt e(_g,n);e!=INVALID;++e) v.push_back(e);
+        if(v.size()) {
+          std::sort(v.begin(),v.end(),ArcLess(_g));
+          Arc head = refreshRec(v,0,v.size()-1);
+          _head.set(n, head);
+          _parent.set(head, INVALID);
+        }
+        else _head.set(n, INVALID);
+      }
+    }
+
+    void zig(Arc v) {
       Arc w = _parent[v];
       _parent.set(v, _parent[w]);
@@ -2344 +2344 @@
       _right.set(v, w);
       if (_parent[v] != INVALID) {
-        if (_right[_parent[v]] == w) {
-          _right.set(_parent[v], v);
-        } else {
-          _left.set(_parent[v], v);
-        }
+        if (_right[_parent[v]] == w) {
+          _right.set(_parent[v], v);
+        } else {
+          _left.set(_parent[v], v);
+        }
       }
       if (_left[w] != INVALID){
-        _parent.set(_left[w], w);
-      }
-    }
-
-    void zag(Arc v) {        
+        _parent.set(_left[w], w);
+      }
+    }
+
+    void zag(Arc v) {
       Arc w = _parent[v];
       _parent.set(v, _parent[w]);
@@ -2362 +2362 @@
       _left.set(v, w);
       if (_parent[v] != INVALID){
-        if (_left[_parent[v]] == w) {
-          _left.set(_parent[v], v);
-        } else {
-          _right.set(_parent[v], v);
-        }
+        if (_left[_parent[v]] == w) {
+          _left.set(_parent[v], v);
+        } else {
+          _right.set(_parent[v], v);
+        }
       }
       if (_right[w] != INVALID){
-        _parent.set(_right[w], w);
+        _parent.set(_right[w], w);
       }
     }
@@ -2375 +2375 @@
     void splay(Arc v) {
       while (_parent[v] != INVALID) {
-        if (v == _left[_parent[v]]) {
-          if (_parent[_parent[v]] == INVALID) {
-            zig(v);
-          } else {
-            if (_parent[v] == _left[_parent[_parent[v]]]) {
-              zig(_parent[v]);
-              zig(v);
-            } else {
-              zig(v);
-              zag(v);
-            }
-          }
-        } else {
-          if (_parent[_parent[v]] == INVALID) {
-            zag(v);
-          } else {
-            if (_parent[v] == _left[_parent[_parent[v]]]) {
-              zag(v);
-              zig(v);
-            } else {
-              zag(_parent[v]);
-              zag(v);
-            }
-          }
-        }
+        if (v == _left[_parent[v]]) {
+          if (_parent[_parent[v]] == INVALID) {
+            zig(v);
+          } else {
+            if (_parent[v] == _left[_parent[_parent[v]]]) {
+              zig(_parent[v]);
+              zig(v);
+            } else {
+              zig(v);
+              zag(v);
+            }
+          }
+        } else {
+          if (_parent[_parent[v]] == INVALID) {
+            zag(v);
+          } else {
+            if (_parent[v] == _left[_parent[_parent[v]]]) {
+              zag(v);
+              zig(v);
+            } else {
+              zag(_parent[v]);
+              zag(v);
+            }
+          }
+        }
       }
       _head[_g.source(v)] = v;
@@ -2406 +2406 @@
 
   public:
-    
+
     ///Find an arc between two nodes.
-    
+
     ///Find an arc between two nodes in time <em>O(</em>log<em>d)</em>, where
     /// <em>d</em> is the number of outgoing arcs of \c s.
@@ -2419 +2419 @@
       Arc a = _head[s];
       while (true) {
-        if (_g.target(a) == t) {
-          const_cast<DynArcLookUp&>(*this).splay(a);
-          return a;
-        } else if (t < _g.target(a)) {
-          if (_left[a] == INVALID) {
-            const_cast<DynArcLookUp&>(*this).splay(a);
-            return INVALID;
-          } else {
-            a = _left[a];
-          }
-        } else  {
-          if (_right[a] == INVALID) {
-            const_cast<DynArcLookUp&>(*this).splay(a);
-            return INVALID;
-          } else {
-            a = _right[a];
-          }
-        }
+        if (_g.target(a) == t) {
+          const_cast<DynArcLookUp&>(*this).splay(a);
+          return a;
+        } else if (t < _g.target(a)) {
+          if (_left[a] == INVALID) {
+            const_cast<DynArcLookUp&>(*this).splay(a);
+            return INVALID;
+          } else {
+            a = _left[a];
+          }
+        } else  {
+          if (_right[a] == INVALID) {
+            const_cast<DynArcLookUp&>(*this).splay(a);
+            return INVALID;
+          } else {
+            a = _right[a];
+          }
+        }
       }
     }
 
     ///Find the first arc between two nodes.
-    
+
     ///Find the first arc between two nodes in time
     /// <em>O(</em>log<em>d)</em>, where <em>d</em> is the number of
-    /// outgoing arcs of \c s.  
-    ///\param s The source node 
+    /// outgoing arcs of \c s.
+    ///\param s The source node
     ///\param t The target node
     ///\return An arc from \c s to \c t if there exists, \ref INVALID
@@ -2454 +2454 @@
       Arc r = INVALID;
       while (true) {
-        if (_g.target(a) < t) {
-          if (_right[a] == INVALID) {
-            const_cast<DynArcLookUp&>(*this).splay(a);
-            return r;
-          } else {
-            a = _right[a];
-          }
-        } else {
-          if (_g.target(a) == t) {
-            r = a;
-          }
-          if (_left[a] == INVALID) {
-            const_cast<DynArcLookUp&>(*this).splay(a);
-            return r;
-          } else {
-            a = _left[a];
-          }
-        }
+        if (_g.target(a) < t) {
+          if (_right[a] == INVALID) {
+            const_cast<DynArcLookUp&>(*this).splay(a);
+            return r;
+          } else {
+            a = _right[a];
+          }
+        } else {
+          if (_g.target(a) == t) {
+            r = a;
+          }
+          if (_left[a] == INVALID) {
+            const_cast<DynArcLookUp&>(*this).splay(a);
+            return r;
+          } else {
+            a = _left[a];
+          }
+        }
       }
     }
 
     ///Find the next arc between two nodes.
-    
+
     ///Find the next arc between two nodes in time
     /// <em>O(</em>log<em>d)</em>, where <em>d</em> is the number of
-    /// outgoing arcs of \c s.  
-    ///\param s The source node 
+    /// outgoing arcs of \c s.
+    ///\param s The source node
     ///\param t The target node
     ///\return An arc from \c s to \c t if there exists, \ref INVALID
@@ -2494 +2494 @@
     {
       if (_right[a] != INVALID) {
-        a = _right[a];
-        while (_left[a] != INVALID) {
-          a = _left[a];
-        }
-        const_cast<DynArcLookUp&>(*this).splay(a);
+        a = _right[a];
+        while (_left[a] != INVALID) {
+          a = _left[a];
+        }
+        const_cast<DynArcLookUp&>(*this).splay(a);
       } else {
-        while (_parent[a] != INVALID && _right[_parent[a]] ==  a) {
-          a = _parent[a];
-        }
-        if (_parent[a] == INVALID) {
-          return INVALID;
-        } else {
-          a = _parent[a];
-          const_cast<DynArcLookUp&>(*this).splay(a);
-        }
+        while (_parent[a] != INVALID && _right[_parent[a]] ==  a) {
+          a = _parent[a];
+        }
+        if (_parent[a] == INVALID) {
+          return INVALID;
+        } else {
+          a = _parent[a];
+          const_cast<DynArcLookUp&>(*this).splay(a);
+        }
       }
       if (_g.target(a) == t) return a;
-      else return INVALID;    
+      else return INVALID;
     }
 
@@ -2517 +2517 @@
 
   ///Fast arc look up between given endpoints.
-  
+
   ///\ingroup gutils
   ///Using this class, you can find an arc in a digraph from a given
@@ -2534 +2534 @@
   ///
   ///\sa DynArcLookUp
-  ///\sa AllArcLookUp  
+  ///\sa AllArcLookUp
   template<class G>
-  class ArcLookUp 
+  class ArcLookUp
   {
   public:
@@ -2547 +2547 @@
     typename Digraph::template ArcMap<Arc> _left;
     typename Digraph::template ArcMap<Arc> _right;
-    
+
     class ArcLess {
       const Digraph &g;
     public:
       ArcLess(const Digraph &_g) : g(_g) {}
-      bool operator()(Arc a,Arc b) const 
+      bool operator()(Arc a,Arc b) const
       {
-        return g.target(a)<g.target(b);
-      }
-    };
-    
+        return g.target(a)<g.target(b);
+      }
+    };
+
   public:
-    
+
     ///Constructor
 
@@ -2567 +2567 @@
     ///changes.
     ArcLookUp(const Digraph &g) :_g(g),_head(g),_left(g),_right(g) {refresh();}
-    
+
   private:
-    Arc refreshRec(std::vector<Arc> &v,int a,int b) 
+    Arc refreshRec(std::vector<Arc> &v,int a,int b)
     {
       int m=(a+b)/2;
@@ -2584 +2584 @@
     ///It runs in time <em>O(d</em>log<em>d)</em>, where <em>d</em> is
     ///the number of the outgoing arcs of \c n.
-    void refresh(Node n) 
+    void refresh(Node n)
     {
       std::vector<Arc> v;
       for(OutArcIt e(_g,n);e!=INVALID;++e) v.push_back(e);
       if(v.size()) {
-        std::sort(v.begin(),v.end(),ArcLess(_g));
-        _head[n]=refreshRec(v,0,v.size()-1);
+        std::sort(v.begin(),v.end(),ArcLess(_g));
+        _head[n]=refreshRec(v,0,v.size()-1);
       }
       else _head[n]=INVALID;
@@ -2603 +2603 @@
     ///out-degree of the digraph.
 
-    void refresh() 
+    void refresh()
     {
       for(NodeIt n(_g);n!=INVALID;++n) refresh(n);
     }
-    
+
     ///Find an arc between two nodes.
-    
+
     ///Find an arc between two nodes in time <em>O(</em>log<em>d)</em>, where
     /// <em>d</em> is the number of outgoing arcs of \c s.
@@ -2626 +2626 @@
       Arc e;
       for(e=_head[s];
-          e!=INVALID&&_g.target(e)!=t;
-          e = t < _g.target(e)?_left[e]:_right[e]) ;
+          e!=INVALID&&_g.target(e)!=t;
+          e = t < _g.target(e)?_left[e]:_right[e]) ;
       return e;
     }
@@ -2634 +2634 @@
 
   ///Fast look up of all arcs between given endpoints.
-  
+
   ///\ingroup gutils
   ///This class is the same as \ref ArcLookUp, with the addition
@@ -2647 +2647 @@
   ///
   ///\sa DynArcLookUp
-  ///\sa ArcLookUp  
+  ///\sa ArcLookUp
   template<class G>
   class AllArcLookUp : public ArcLookUp<G>
@@ -2658 +2658 @@
     TEMPLATE_DIGRAPH_TYPEDEFS(G);
     typedef G Digraph;
-    
+
     typename Digraph::template ArcMap<Arc> _next;
-    
+
     Arc refreshNext(Arc head,Arc next=INVALID)
     {
       if(head==INVALID) return next;
       else {
-        next=refreshNext(_right[head],next);
-//      _next[head]=next;
-        _next[head]=( next!=INVALID && _g.target(next)==_g.target(head))
-          ? next : INVALID;
-        return refreshNext(_left[head],head);
-      }
-    }
-    
+        next=refreshNext(_right[head],next);
+//         _next[head]=next;
+        _next[head]=( next!=INVALID && _g.target(next)==_g.target(head))
+          ? next : INVALID;
+        return refreshNext(_left[head],head);
+      }
+    }
+
     void refreshNext()
     {
       for(NodeIt n(_g);n!=INVALID;++n) refreshNext(_head[n]);
     }
-    
+
   public:
     ///Constructor
@@ -2693 +2693 @@
     ///It runs in time <em>O(d</em>log<em>d)</em>, where <em>d</em> is
     ///the number of the outgoing arcs of \c n.
-    
-    void refresh(Node n) 
+
+    void refresh(Node n)
     {
       ArcLookUp<G>::refresh(n);
       refreshNext(_head[n]);
     }
-    
+
     ///Refresh the full data structure.
 
@@ -2709 +2709 @@
     ///out-degree of the digraph.
 
-    void refresh() 
+    void refresh()
     {
       for(NodeIt n(_g);n!=INVALID;++n) refresh(_head[n]);
     }
-    
+
     ///Find an arc between two nodes.
-    
+
     ///Find an arc between two nodes.
     ///\param s The source node
@@ -2751 +2751 @@
     }
 #endif
-      
+
   };
 

lemon/kruskal.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -46 +46 @@
     template <typename Digraph, typename In, typename Out>
     typename disable_if<lemon::UndirectedTagIndicator<Digraph>,
-                       typename In::value_type::second_type >::type
+                       typename In::value_type::second_type >::type
     kruskal(const Digraph& digraph, const In& in, Out& out,dummy<0> = 0) {
       typedef typename In::value_type::second_type Value;
       typedef typename Digraph::template NodeMap<int> IndexMap;
       typedef typename Digraph::Node Node;
-      
+
       IndexMap index(digraph);
       UnionFind<IndexMap> uf(index);
@@ -57 +57 @@
         uf.insert(it);
       }
-      
+
       Value tree_value = 0;
       for (typename In::const_iterator it = in.begin(); it != in.end(); ++it) {
@@ -75 +75 @@
     template <typename Graph, typename In, typename Out>
     typename enable_if<lemon::UndirectedTagIndicator<Graph>,
-                       typename In::value_type::second_type >::type
+                       typename In::value_type::second_type >::type
     kruskal(const Graph& graph, const In& in, Out& out,dummy<1> = 1) {
       typedef typename In::value_type::second_type Value;
       typedef typename Graph::template NodeMap<int> IndexMap;
       typedef typename Graph::Node Node;
-      
+
       IndexMap index(graph);
       UnionFind<IndexMap> uf(index);
@@ -86 +86 @@
         uf.insert(it);
       }
-      
+
       Value tree_value = 0;
       for (typename In::const_iterator it = in.begin(); it != in.end(); ++it) {
@@ -105 +105 @@
       typedef typename Sequence::value_type Value;
       bool operator()(const Value& left, const Value& right) {
-        return left.second < right.second;
+        return left.second < right.second;
       }
     };
@@ -115 +115 @@
 
     template <typename In>
-    struct SequenceInputIndicator<In, 
+    struct SequenceInputIndicator<In,
       typename exists<typename In::value_type::first_type>::type> {
       static const bool value = true;
@@ -126 +126 @@
 
     template <typename In>
-    struct MapInputIndicator<In, 
+    struct MapInputIndicator<In,
       typename exists<typename In::Value>::type> {
       static const bool value = true;
@@ -135 +135 @@
       static const bool value = false;
     };
- 
+
     template <typename Out>
-    struct SequenceOutputIndicator<Out, 
+    struct SequenceOutputIndicator<Out,
       typename exists<typename Out::value_type>::type> {
       static const bool value = true;
@@ -148 +148 @@
 
     template <typename Out>
-    struct MapOutputIndicator<Out, 
+    struct MapOutputIndicator<Out,
       typename exists<typename Out::Value>::type> {
       static const bool value = true;
@@ -158 +158 @@
     template <typename In>
     struct KruskalValueSelector<In,
-      typename enable_if<SequenceInputIndicator<In>, void>::type> 
-    {
-      typedef typename In::value_type::second_type Value;
-    };    
+      typename enable_if<SequenceInputIndicator<In>, void>::type>
+    {
+      typedef typename In::value_type::second_type Value;
+    };
 
     template <typename In>
     struct KruskalValueSelector<In,
-      typename enable_if<MapInputIndicator<In>, void>::type> 
+      typename enable_if<MapInputIndicator<In>, void>::type>
     {
       typedef typename In::Value Value;
-    };    
-    
+    };
+
     template <typename Graph, typename In, typename Out,
               typename InEnable = void>
@@ -177 +177 @@
               typename InEnable = void>
     struct KruskalOutputSelector {};
-    
+
     template <typename Graph, typename In, typename Out>
     struct KruskalInputSelector<Graph, In, Out,
-      typename enable_if<SequenceInputIndicator<In>, void>::type > 
+      typename enable_if<SequenceInputIndicator<In>, void>::type >
     {
       typedef typename In::value_type::second_type Value;
@@ -193 +193 @@
     template <typename Graph, typename In, typename Out>
     struct KruskalInputSelector<Graph, In, Out,
-      typename enable_if<MapInputIndicator<In>, void>::type > 
+      typename enable_if<MapInputIndicator<In>, void>::type >
     {
       typedef typename In::Value Value;
@@ -202 +202 @@
         typedef std::vector<std::pair<MapArc, Value> > Sequence;
         Sequence seq;
-        
+
         for (MapArcIt it(graph); it != INVALID; ++it) {
           seq.push_back(std::make_pair(it, in[it]));
@@ -225 +225 @@
     template <typename Graph, typename In, typename Out>
     struct KruskalOutputSelector<Graph, In, Out,
-      typename enable_if<SequenceOutputIndicator<Out>, void>::type > 
+      typename enable_if<SequenceOutputIndicator<Out>, void>::type >
     {
       typedef typename In::value_type::second_type Value;
@@ -239 +239 @@
     template <typename Graph, typename In, typename Out>
     struct KruskalOutputSelector<Graph, In, Out,
-      typename enable_if<MapOutputIndicator<Out>, void>::type > 
+      typename enable_if<MapOutputIndicator<Out>, void>::type >
     {
       typedef typename In::value_type::second_type Value;
@@ -255 +255 @@
   /// a graph.
   ///
-  /// This function runs Kruskal's algorithm to find a minimum cost 
+  /// This function runs Kruskal's algorithm to find a minimum cost
   /// spanning tree.
   /// Due to some C++ hacking, it accepts various input and output types.
   ///
   /// \param g The graph the algorithm runs on.
-  /// It can be either \ref concepts::Digraph "directed" or 
+  /// It can be either \ref concepts::Digraph "directed" or
   /// \ref concepts::Graph "undirected".
-  /// If the graph is directed, the algorithm consider it to be 
+  /// If the graph is directed, the algorithm consider it to be
   /// undirected by disregarding the direction of the arcs.
   ///
-  /// \param in This object is used to describe the arc/edge costs. 
+  /// \param in This object is used to describe the arc/edge costs.
   /// It can be one of the following choices.
   /// - An STL compatible 'Forward Container' with
@@ -273 +273 @@
   /// along with the assigned cost. <em>They must be in a
   /// cost-ascending order.</em>
-  /// - Any readable arc/edge map. The values of the map indicate the 
+  /// - Any readable arc/edge map. The values of the map indicate the
   /// arc/edge costs.
   ///
@@ -293 +293 @@
   ///\endcode
   /// Or if we don't know in advance the size of the tree, we can
-  /// write this.  
+  /// write this.
   ///\code
   /// std::vector<Arc> tree;
-  /// kruskal(g,cost,std::back_inserter(tree)); 
+  /// kruskal(g,cost,std::back_inserter(tree));
   ///\endcode
   ///
@@ -308 +308 @@
   template <class Graph, class In, class Out>
   Value kruskal(GR const& g, const In& in, Out& out)
-#else 
+#else
   template <class Graph, class In, class Out>
-  inline typename _kruskal_bits::KruskalValueSelector<In>::Value 
-  kruskal(const Graph& graph, const In& in, Out& out) 
+  inline typename _kruskal_bits::KruskalValueSelector<In>::Value
+  kruskal(const Graph& graph, const In& in, Out& out)
 #endif
   {
@@ -318 +318 @@
   }
 
- 
-  
+
+
 
   template <class Graph, class In, class Out>
@@ -327 +327 @@
     return _kruskal_bits::KruskalInputSelector<Graph, In, const Out>::
       kruskal(graph, in, out);
-  }  
+  }
 
 } //namespace lemon

lemon/lgf_reader.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -47 +47 @@
     struct DefaultConverter {
       Value operator()(const std::string& str) {
-        std::istringstream is(str);
-        Value value;
-        is >> value;
-
-        char c;
-        if (is >> std::ws >> c) {
-          throw DataFormatError("Remaining characters in token");
-        }
-        return value;
+        std::istringstream is(str);
+        Value value;
+        is >> value;
+
+        char c;
+        if (is >> std::ws >> c) {
+          throw DataFormatError("Remaining characters in token");
+        }
+        return value;
       }
     };
@@ -62 +62 @@
     struct DefaultConverter<std::string> {
       std::string operator()(const std::string& str) {
-        return str;
+        return str;
       }
     };
 
-    template <typename _Item>    
+    template <typename _Item>
     class MapStorageBase {
     public:
@@ -79 +79 @@
     };
 
-    template <typename _Item, typename _Map, 
-              typename _Converter = DefaultConverter<typename _Map::Value> >
+    template <typename _Item, typename _Map,
+              typename _Converter = DefaultConverter<typename _Map::Value> >
     class MapStorage : public MapStorageBase<_Item> {
     public:
@@ -86 +86 @@
       typedef _Converter Converter;
       typedef _Item Item;
-      
+
     private:
       Map& _map;
@@ -92 +92 @@
 
     public:
-      MapStorage(Map& map, const Converter& converter = Converter()) 
-        : _map(map), _converter(converter) {}
+      MapStorage(Map& map, const Converter& converter = Converter())
+        : _map(map), _converter(converter) {}
       virtual ~MapStorage() {}
 
       virtual void set(const Item& item ,const std::string& value) {
-        _map.set(item, _converter(value));
+        _map.set(item, _converter(value));
       }
     };
 
-    template <typename _Graph, bool _dir, typename _Map, 
-              typename _Converter = DefaultConverter<typename _Map::Value> >
+    template <typename _Graph, bool _dir, typename _Map,
+              typename _Converter = DefaultConverter<typename _Map::Value> >
     class GraphArcMapStorage : public MapStorageBase<typename _Graph::Edge> {
     public:
@@ -110 +110 @@
       typedef typename Graph::Edge Item;
       static const bool dir = _dir;
-      
+
     private:
       const Graph& _graph;
@@ -117 +117 @@
 
     public:
-      GraphArcMapStorage(const Graph& graph, Map& map, 
-                         const Converter& converter = Converter()) 
-        : _graph(graph), _map(map), _converter(converter) {}
+      GraphArcMapStorage(const Graph& graph, Map& map,
+                         const Converter& converter = Converter())
+        : _graph(graph), _map(map), _converter(converter) {}
       virtual ~GraphArcMapStorage() {}
 
       virtual void set(const Item& item ,const std::string& value) {
-        _map.set(_graph.direct(item, dir), _converter(value));
+        _map.set(_graph.direct(item, dir), _converter(value));
       }
     };
@@ -147 +147 @@
     public:
       ValueStorage(Value& value, const Converter& converter = Converter())
-        : _value(value), _converter(converter) {}
+         : _value(value), _converter(converter) {}
 
       virtual void set(const std::string& value) {
-        _value = _converter(value);
+        _value = _converter(value);
       }
     };
@@ -177 +177 @@
       const Graph& _graph;
       const std::map<std::string, typename Graph::Edge>& _map;
-      
-      GraphArcLookUpConverter(const Graph& graph, 
-                              const std::map<std::string,
-                                             typename Graph::Edge>& map) 
-        : _graph(graph), _map(map) {}
-      
+
+      GraphArcLookUpConverter(const Graph& graph,
+                              const std::map<std::string,
+                                             typename Graph::Edge>& map)
+        : _graph(graph), _map(map) {}
+
       typename Graph::Arc operator()(const std::string& str) {
-        if (str.empty() || (str[0] != '+' && str[0] != '-')) {
-          throw DataFormatError("Item must start with '+' or '-'");
-        }
-        typename std::map<std::string, typename Graph::Edge>
-          ::const_iterator it = _map.find(str.substr(1));
-        if (it == _map.end()) {
-          throw DataFormatError("Item not found");
-        }
-        return _graph.direct(it->second, str[0] == '+');
+        if (str.empty() || (str[0] != '+' && str[0] != '-')) {
+          throw DataFormatError("Item must start with '+' or '-'");
+        }
+        typename std::map<std::string, typename Graph::Edge>
+          ::const_iterator it = _map.find(str.substr(1));
+        if (it == _map.end()) {
+          throw DataFormatError("Item not found");
+        }
+        return _graph.direct(it->second, str[0] == '+');
       }
     };
 
     inline bool isWhiteSpace(char c) {
-      return c == ' ' || c == '\t' || c == '\v' || 
-        c == '\n' || c == '\r' || c == '\f'; 
-    }
-    
+      return c == ' ' || c == '\t' || c == '\v' ||
+        c == '\n' || c == '\r' || c == '\f';
+    }
+
     inline bool isOct(char c) {
-      return '0' <= c && c <='7'; 
-    }
-    
+      return '0' <= c && c <='7';
+    }
+
     inline int valueOct(char c) {
       LEMON_ASSERT(isOct(c), "The character is not octal.");
@@ -211 +211 @@
 
     inline bool isHex(char c) {
-      return ('0' <= c && c <= '9') || 
-        ('a' <= c && c <= 'z') || 
-        ('A' <= c && c <= 'Z'); 
-    }
-    
+      return ('0' <= c && c <= '9') ||
+        ('a' <= c && c <= 'z') ||
+        ('A' <= c && c <= 'Z');
+    }
+
     inline int valueHex(char c) {
       LEMON_ASSERT(isHex(c), "The character is not hexadecimal.");
@@ -225 +225 @@
     inline bool isIdentifierFirstChar(char c) {
       return ('a' <= c && c <= 'z') ||
-        ('A' <= c && c <= 'Z') || c == '_';
+        ('A' <= c && c <= 'Z') || c == '_';
     }
 
     inline bool isIdentifierChar(char c) {
       return isIdentifierFirstChar(c) ||
-        ('0' <= c && c <= '9');
+        ('0' <= c && c <= '9');
     }
 
@@ -236 +236 @@
       char c;
       if (!is.get(c))
-        throw DataFormatError("Escape format error");
+        throw DataFormatError("Escape format error");
 
       switch (c) {
       case '\\':
-        return '\\';
+        return '\\';
       case '\"':
-        return '\"';
+        return '\"';
       case '\'':
-        return '\'';
+        return '\'';
       case '\?':
-        return '\?';
+        return '\?';
       case 'a':
-        return '\a';
+        return '\a';
       case 'b':
-        return '\b';
+        return '\b';
       case 'f':
-        return '\f';
+        return '\f';
       case 'n':
-        return '\n';
+        return '\n';
       case 'r':
-        return '\r';
+        return '\r';
       case 't':
-        return '\t';
+        return '\t';
       case 'v':
-        return '\v';
+        return '\v';
       case 'x':
-        {
-          int code;
-          if (!is.get(c) || !isHex(c)) 
-            throw DataFormatError("Escape format error");
-          else if (code = valueHex(c), !is.get(c) || !isHex(c)) is.putback(c);
-          else code = code * 16 + valueHex(c);
-          return code;
-        }
+        {
+          int code;
+          if (!is.get(c) || !isHex(c))
+            throw DataFormatError("Escape format error");
+          else if (code = valueHex(c), !is.get(c) || !isHex(c)) is.putback(c);
+          else code = code * 16 + valueHex(c);
+          return code;
+        }
       default:
-        {
-          int code;
-          if (!isOct(c)) 
-            throw DataFormatError("Escape format error");
-          else if (code = valueOct(c), !is.get(c) || !isOct(c)) 
-            is.putback(c);
-          else if (code = code * 8 + valueOct(c), !is.get(c) || !isOct(c)) 
-            is.putback(c);
-          else code = code * 8 + valueOct(c);
-          return code;
-        }             
-      } 
-    }
-    
+        {
+          int code;
+          if (!isOct(c))
+            throw DataFormatError("Escape format error");
+          else if (code = valueOct(c), !is.get(c) || !isOct(c))
+            is.putback(c);
+          else if (code = code * 8 + valueOct(c), !is.get(c) || !isOct(c))
+            is.putback(c);
+          else code = code * 8 + valueOct(c);
+          return code;
+        }
+      }
+    }
+
     inline std::istream& readToken(std::istream& is, std::string& str) {
       std::ostringstream os;
@@ -290 +290 @@
       char c;
       is >> std::ws;
-      
-      if (!is.get(c)) 
-        return is;
+
+      if (!is.get(c))
+        return is;
 
       if (c == '\"') {
-        while (is.get(c) && c != '\"') {
-          if (c == '\\') 
-            c = readEscape(is);
-          os << c;
-        }
-        if (!is) 
-          throw DataFormatError("Quoted format error");
+        while (is.get(c) && c != '\"') {
+          if (c == '\\')
+            c = readEscape(is);
+          os << c;
+        }
+        if (!is)
+          throw DataFormatError("Quoted format error");
       } else {
-        is.putback(c);
-        while (is.get(c) && !isWhiteSpace(c)) {
-          if (c == '\\') 
-            c = readEscape(is);
-          os << c;
-        }
-        if (!is) {
-          is.clear();
-        } else {
-          is.putback(c);
-        }
+        is.putback(c);
+        while (is.get(c) && !isWhiteSpace(c)) {
+          if (c == '\\')
+            c = readEscape(is);
+          os << c;
+        }
+        if (!is) {
+          is.clear();
+        } else {
+          is.putback(c);
+        }
       }
       str = os.str();
@@ -332 +332 @@
 
     public:
-      
+
       LineSection(const Functor& functor) : _functor(functor) {}
       virtual ~LineSection() {}
 
       virtual void process(std::istream& is, int& line_num) {
-        char c;
-        std::string line;
-        while (is.get(c) && c != '@') {
-          if (c == '\n') {
-            ++line_num;
-          } else if (c == '#') {
-            getline(is, line);
-            ++line_num;
-          } else if (!isWhiteSpace(c)) {
-            is.putback(c);
-            getline(is, line);
-            _functor(line);
-            ++line_num;
-          }
-        }
-        if (is) is.putback(c);
-        else if (is.eof()) is.clear();
+        char c;
+        std::string line;
+        while (is.get(c) && c != '@') {
+          if (c == '\n') {
+            ++line_num;
+          } else if (c == '#') {
+            getline(is, line);
+            ++line_num;
+          } else if (!isWhiteSpace(c)) {
+            is.putback(c);
+            getline(is, line);
+            _functor(line);
+            ++line_num;
+          }
+        }
+        if (is) is.putback(c);
+        else if (is.eof()) is.clear();
       }
     };
@@ -364 +364 @@
 
     public:
-      
+
       StreamSection(const Functor& functor) : _functor(functor) {}
-      virtual ~StreamSection() {} 
+      virtual ~StreamSection() {}
 
       virtual void process(std::istream& is, int& line_num) {
-        _functor(is, line_num);
-        char c;
-        std::string line;
-        while (is.get(c) && c != '@') {
-          if (c == '\n') {
-            ++line_num;
-          } else if (!isWhiteSpace(c)) {
-            getline(is, line);
-            ++line_num;
-          }
-        }
-        if (is) is.putback(c);
-        else if (is.eof()) is.clear();  
+        _functor(is, line_num);
+        char c;
+        std::string line;
+        while (is.get(c) && c != '@') {
+          if (c == '\n') {
+            ++line_num;
+          } else if (!isWhiteSpace(c)) {
+            getline(is, line);
+            ++line_num;
+          }
+        }
+        if (is) is.putback(c);
+        else if (is.eof()) is.clear();
       }
     };
-    
+
   }
 
@@ -400 +400 @@
 
   /// \ingroup lemon_io
-  ///  
+  ///
   /// \brief \ref lgf-format "LGF" reader for directed graphs
   ///
@@ -454 +454 @@
     typedef _Digraph Digraph;
     TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
-    
+
   private:
 
@@ -471 +471 @@
     typedef std::map<std::string, Arc> ArcIndex;
     ArcIndex _arc_index;
-    
-    typedef std::vector<std::pair<std::string, 
-      _reader_bits::MapStorageBase<Node>*> > NodeMaps;    
-    NodeMaps _node_maps; 
+
+    typedef std::vector<std::pair<std::string,
+      _reader_bits::MapStorageBase<Node>*> > NodeMaps;
+    NodeMaps _node_maps;
 
     typedef std::vector<std::pair<std::string,
@@ -480 +480 @@
     ArcMaps _arc_maps;
 
-    typedef std::multimap<std::string, _reader_bits::ValueStorageBase*> 
+    typedef std::multimap<std::string, _reader_bits::ValueStorageBase*>
       Attributes;
     Attributes _attributes;
@@ -499 +499 @@
     /// Construct a directed graph reader, which reads from the given
     /// input stream.
-    DigraphReader(std::istream& is, Digraph& digraph) 
+    DigraphReader(std::istream& is, Digraph& digraph)
       : _is(&is), local_is(false), _digraph(digraph),
-        _use_nodes(false), _use_arcs(false),
-        _skip_nodes(false), _skip_arcs(false) {}
+        _use_nodes(false), _use_arcs(false),
+        _skip_nodes(false), _skip_arcs(false) {}
 
     /// \brief Constructor
@@ -508 +508 @@
     /// Construct a directed graph reader, which reads from the given
     /// file.
-    DigraphReader(const std::string& fn, Digraph& digraph) 
+    DigraphReader(const std::string& fn, Digraph& digraph)
       : _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
-        _use_nodes(false), _use_arcs(false),
-        _skip_nodes(false), _skip_arcs(false) {}
-    
+            _use_nodes(false), _use_arcs(false),
+        _skip_nodes(false), _skip_arcs(false) {}
+
     /// \brief Constructor
     ///
     /// Construct a directed graph reader, which reads from the given
     /// file.
-    DigraphReader(const char* fn, Digraph& digraph) 
+    DigraphReader(const char* fn, Digraph& digraph)
       : _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
-        _use_nodes(false), _use_arcs(false),
-        _skip_nodes(false), _skip_arcs(false) {}
+            _use_nodes(false), _use_arcs(false),
+        _skip_nodes(false), _skip_arcs(false) {}
 
     /// \brief Destructor
     ~DigraphReader() {
-      for (typename NodeMaps::iterator it = _node_maps.begin(); 
-           it != _node_maps.end(); ++it) {
-        delete it->second;
-      }
-
-      for (typename ArcMaps::iterator it = _arc_maps.begin(); 
-           it != _arc_maps.end(); ++it) {
-        delete it->second;
-      }
-
-      for (typename Attributes::iterator it = _attributes.begin(); 
-           it != _attributes.end(); ++it) {
-        delete it->second;
+      for (typename NodeMaps::iterator it = _node_maps.begin();
+           it != _node_maps.end(); ++it) {
+        delete it->second;
+      }
+
+      for (typename ArcMaps::iterator it = _arc_maps.begin();
+           it != _arc_maps.end(); ++it) {
+        delete it->second;
+      }
+
+      for (typename Attributes::iterator it = _attributes.begin();
+           it != _attributes.end(); ++it) {
+        delete it->second;
       }
 
       if (local_is) {
-        delete _is;
+        delete _is;
       }
 
@@ -547 +547 @@
   private:
 
-    friend DigraphReader<Digraph> digraphReader<>(std::istream& is, 
-                                                  Digraph& digraph);    
-    friend DigraphReader<Digraph> digraphReader<>(const std::string& fn, 
-                                                  Digraph& digraph);   
-    friend DigraphReader<Digraph> digraphReader<>(const char *fn, 
-                                                  Digraph& digraph);    
-
-    DigraphReader(DigraphReader& other) 
+    friend DigraphReader<Digraph> digraphReader<>(std::istream& is,
+                                                  Digraph& digraph);
+    friend DigraphReader<Digraph> digraphReader<>(const std::string& fn,
+                                                  Digraph& digraph);
+    friend DigraphReader<Digraph> digraphReader<>(const char *fn,
+                                                  Digraph& digraph);
+
+    DigraphReader(DigraphReader& other)
       : _is(other._is), local_is(other.local_is), _digraph(other._digraph),
-        _use_nodes(other._use_nodes), _use_arcs(other._use_arcs),
-        _skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
+        _use_nodes(other._use_nodes), _use_arcs(other._use_arcs),
+        _skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
 
       other._is = 0;
       other.local_is = false;
-      
+
       _node_index.swap(other._node_index);
       _arc_index.swap(other._arc_index);
@@ -581 +581 @@
     /// \name Reading rules
     /// @{
-    
+
     /// \brief Node map reading rule
     ///
@@ -588 +588 @@
     DigraphReader& nodeMap(const std::string& caption, Map& map) {
       checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
-      _reader_bits::MapStorageBase<Node>* storage = 
-        new _reader_bits::MapStorage<Node, Map>(map);
+      _reader_bits::MapStorageBase<Node>* storage =
+        new _reader_bits::MapStorage<Node, Map>(map);
       _node_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -599 +599 @@
     /// reader.
     template <typename Map, typename Converter>
-    DigraphReader& nodeMap(const std::string& caption, Map& map, 
-                           const Converter& converter = Converter()) {
+    DigraphReader& nodeMap(const std::string& caption, Map& map,
+                           const Converter& converter = Converter()) {
       checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
-      _reader_bits::MapStorageBase<Node>* storage = 
-        new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
+      _reader_bits::MapStorageBase<Node>* storage =
+        new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
       _node_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -614 +614 @@
     DigraphReader& arcMap(const std::string& caption, Map& map) {
       checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
-      _reader_bits::MapStorageBase<Arc>* storage = 
-        new _reader_bits::MapStorage<Arc, Map>(map);
+      _reader_bits::MapStorageBase<Arc>* storage =
+        new _reader_bits::MapStorage<Arc, Map>(map);
       _arc_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -625 +625 @@
     /// reader.
     template <typename Map, typename Converter>
-    DigraphReader& arcMap(const std::string& caption, Map& map, 
-                          const Converter& converter = Converter()) {
+    DigraphReader& arcMap(const std::string& caption, Map& map,
+                          const Converter& converter = Converter()) {
       checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
-      _reader_bits::MapStorageBase<Arc>* storage = 
-        new _reader_bits::MapStorage<Arc, Map, Converter>(map, converter);
+      _reader_bits::MapStorageBase<Arc>* storage =
+        new _reader_bits::MapStorage<Arc, Map, Converter>(map, converter);
       _arc_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -639 +639 @@
     template <typename Value>
     DigraphReader& attribute(const std::string& caption, Value& value) {
-      _reader_bits::ValueStorageBase* storage = 
-        new _reader_bits::ValueStorage<Value>(value);
+      _reader_bits::ValueStorageBase* storage =
+        new _reader_bits::ValueStorage<Value>(value);
       _attributes.insert(std::make_pair(caption, storage));
       return *this;
@@ -650 +650 @@
     /// reader.
     template <typename Value, typename Converter>
-    DigraphReader& attribute(const std::string& caption, Value& value, 
-                             const Converter& converter = Converter()) {
-      _reader_bits::ValueStorageBase* storage = 
-        new _reader_bits::ValueStorage<Value, Converter>(value, converter);
+    DigraphReader& attribute(const std::string& caption, Value& value,
+                             const Converter& converter = Converter()) {
+      _reader_bits::ValueStorageBase* storage =
+        new _reader_bits::ValueStorage<Value, Converter>(value, converter);
       _attributes.insert(std::make_pair(caption, storage));
       return *this;
@@ -664 +664 @@
       typedef _reader_bits::MapLookUpConverter<Node> Converter;
       Converter converter(_node_index);
-      _reader_bits::ValueStorageBase* storage = 
-        new _reader_bits::ValueStorage<Node, Converter>(node, converter);
+      _reader_bits::ValueStorageBase* storage =
+        new _reader_bits::ValueStorage<Node, Converter>(node, converter);
       _attributes.insert(std::make_pair(caption, storage));
       return *this;
@@ -676 +676 @@
       typedef _reader_bits::MapLookUpConverter<Arc> Converter;
       Converter converter(_arc_index);
-      _reader_bits::ValueStorageBase* storage = 
-        new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
+      _reader_bits::ValueStorageBase* storage =
+        new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
       _attributes.insert(std::make_pair(caption, storage));
       return *this;
@@ -723 +723 @@
     DigraphReader& useNodes(const Map& map) {
       checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
-      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member"); 
+      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member");
       _use_nodes = true;
       _writer_bits::DefaultConverter<typename Map::Value> converter;
       for (NodeIt n(_digraph); n != INVALID; ++n) {
-        _node_index.insert(std::make_pair(converter(map[n]), n));
+        _node_index.insert(std::make_pair(converter(map[n]), n));
       }
       return *this;
@@ -738 +738 @@
     /// \c std::string.
     template <typename Map, typename Converter>
-    DigraphReader& useNodes(const Map& map, 
-                            const Converter& converter = Converter()) {
+    DigraphReader& useNodes(const Map& map,
+                            const Converter& converter = Converter()) {
       checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
-      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member"); 
+      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member");
       _use_nodes = true;
       for (NodeIt n(_digraph); n != INVALID; ++n) {
-        _node_index.insert(std::make_pair(converter(map[n]), n));
+        _node_index.insert(std::make_pair(converter(map[n]), n));
       }
       return *this;
@@ -760 +760 @@
       _writer_bits::DefaultConverter<typename Map::Value> converter;
       for (ArcIt a(_digraph); a != INVALID; ++a) {
-        _arc_index.insert(std::make_pair(converter(map[a]), a));
+        _arc_index.insert(std::make_pair(converter(map[a]), a));
       }
       return *this;
@@ -771 +771 @@
     /// \c std::string.
     template <typename Map, typename Converter>
-    DigraphReader& useArcs(const Map& map, 
-                           const Converter& converter = Converter()) {
+    DigraphReader& useArcs(const Map& map,
+                           const Converter& converter = Converter()) {
       checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
-      LEMON_ASSERT(!_use_arcs, "Multiple usage of useArcs() member"); 
+      LEMON_ASSERT(!_use_arcs, "Multiple usage of useArcs() member");
       _use_arcs = true;
       for (ArcIt a(_digraph); a != INVALID; ++a) {
-        _arc_index.insert(std::make_pair(converter(map[a]), a));
+        _arc_index.insert(std::make_pair(converter(map[a]), a));
       }
       return *this;
@@ -791 +791 @@
     /// \c useNodes() should be used to specify the label of the nodes.
     DigraphReader& skipNodes() {
-      LEMON_ASSERT(!_skip_nodes, "Skip nodes already set"); 
+      LEMON_ASSERT(!_skip_nodes, "Skip nodes already set");
       _skip_nodes = true;
       return *this;
@@ -802 +802 @@
     /// will not be constructed.
     DigraphReader& skipArcs() {
-      LEMON_ASSERT(!_skip_arcs, "Skip arcs already set"); 
+      LEMON_ASSERT(!_skip_arcs, "Skip arcs already set");
       _skip_arcs = true;
       return *this;
@@ -814 +814 @@
       std::string str;
       while(++line_num, std::getline(*_is, str)) {
-        line.clear(); line.str(str);
-        char c;
-        if (line >> std::ws >> c && c != '#') {
-          line.putback(c);
-          return true;
-        }
+        line.clear(); line.str(str);
+        char c;
+        if (line >> std::ws >> c && c != '#') {
+          line.putback(c);
+          return true;
+        }
       }
       return false;
@@ -827 +827 @@
       return static_cast<bool>(*_is);
     }
-    
+
     void skipSection() {
       char c;
       while (readSuccess() && line >> c && c != '@') {
-        readLine();
+        readLine();
       }
       line.putback(c);
@@ -843 +843 @@
       char c;
       if (!readLine() || !(line >> c) || c == '@') {
-        if (readSuccess() && line) line.putback(c);
-        if (!_node_maps.empty()) 
-          throw DataFormatError("Cannot find map names");
-        return;
+        if (readSuccess() && line) line.putback(c);
+        if (!_node_maps.empty())
+          throw DataFormatError("Cannot find map names");
+        return;
       }
       line.putback(c);
 
       {
-        std::map<std::string, int> maps;
-        
-        std::string map;
-        int index = 0;
-        while (_reader_bits::readToken(line, map)) {
-          if (maps.find(map) != maps.end()) {
-            std::ostringstream msg;
-            msg << "Multiple occurence of node map: " << map;
-            throw DataFormatError(msg.str().c_str());
-          }
-          maps.insert(std::make_pair(map, index));
-          ++index;
-        }
-        
-        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
-          std::map<std::string, int>::iterator jt = 
-            maps.find(_node_maps[i].first);
-          if (jt == maps.end()) {
-            std::ostringstream msg;
-            msg << "Map not found in file: " << _node_maps[i].first;
-            throw DataFormatError(msg.str().c_str());
-          }
-          map_index[i] = jt->second;
-        }
-
-        {
-          std::map<std::string, int>::iterator jt = maps.find("label");
-          if (jt != maps.end()) {
-            label_index = jt->second;
-          } else {
-            label_index = -1;
-          }
-        }
-        map_num = maps.size();
+        std::map<std::string, int> maps;
+
+        std::string map;
+        int index = 0;
+        while (_reader_bits::readToken(line, map)) {
+          if (maps.find(map) != maps.end()) {
+            std::ostringstream msg;
+            msg << "Multiple occurence of node map: " << map;
+            throw DataFormatError(msg.str().c_str());
+          }
+          maps.insert(std::make_pair(map, index));
+          ++index;
+        }
+
+        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
+          std::map<std::string, int>::iterator jt =
+            maps.find(_node_maps[i].first);
+          if (jt == maps.end()) {
+            std::ostringstream msg;
+            msg << "Map not found in file: " << _node_maps[i].first;
+            throw DataFormatError(msg.str().c_str());
+          }
+          map_index[i] = jt->second;
+        }
+
+        {
+          std::map<std::string, int>::iterator jt = maps.find("label");
+          if (jt != maps.end()) {
+            label_index = jt->second;
+          } else {
+            label_index = -1;
+          }
+        }
+        map_num = maps.size();
       }
 
       while (readLine() && line >> c && c != '@') {
-        line.putback(c);
-
-        std::vector<std::string> tokens(map_num);
-        for (int i = 0; i < map_num; ++i) {
-          if (!_reader_bits::readToken(line, tokens[i])) {
-            std::ostringstream msg;
-            msg << "Column not found (" << i + 1 << ")";
-            throw DataFormatError(msg.str().c_str());
-          }
-        }
-        if (line >> std::ws >> c)
-          throw DataFormatError("Extra character on the end of line");
-        
-        Node n;
-        if (!_use_nodes) {
-          n = _digraph.addNode();
-          if (label_index != -1)
-            _node_index.insert(std::make_pair(tokens[label_index], n));
-        } else {
-          if (label_index == -1) 
-            throw DataFormatError("Label map not found in file");
-          typename std::map<std::string, Node>::iterator it =
-            _node_index.find(tokens[label_index]);
-          if (it == _node_index.end()) {
-            std::ostringstream msg;
-            msg << "Node with label not found: " << tokens[label_index];
-            throw DataFormatError(msg.str().c_str());       
-          }
-          n = it->second;
-        }
-
-        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
-          _node_maps[i].second->set(n, tokens[map_index[i]]);
-        }
+        line.putback(c);
+
+        std::vector<std::string> tokens(map_num);
+        for (int i = 0; i < map_num; ++i) {
+          if (!_reader_bits::readToken(line, tokens[i])) {
+            std::ostringstream msg;
+            msg << "Column not found (" << i + 1 << ")";
+            throw DataFormatError(msg.str().c_str());
+          }
+        }
+        if (line >> std::ws >> c)
+          throw DataFormatError("Extra character on the end of line");
+
+        Node n;
+        if (!_use_nodes) {
+          n = _digraph.addNode();
+          if (label_index != -1)
+            _node_index.insert(std::make_pair(tokens[label_index], n));
+        } else {
+          if (label_index == -1)
+            throw DataFormatError("Label map not found in file");
+          typename std::map<std::string, Node>::iterator it =
+            _node_index.find(tokens[label_index]);
+          if (it == _node_index.end()) {
+            std::ostringstream msg;
+            msg << "Node with label not found: " << tokens[label_index];
+            throw DataFormatError(msg.str().c_str());
+          }
+          n = it->second;
+        }
+
+        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
+          _node_maps[i].second->set(n, tokens[map_index[i]]);
+        }
 
       }
       if (readSuccess()) {
-        line.putback(c);
+        line.putback(c);
       }
     }
@@ -936 +936 @@
       char c;
       if (!readLine() || !(line >> c) || c == '@') {
-        if (readSuccess() && line) line.putback(c);
-        if (!_arc_maps.empty()) 
-          throw DataFormatError("Cannot find map names");
-        return;
+        if (readSuccess() && line) line.putback(c);
+        if (!_arc_maps.empty())
+          throw DataFormatError("Cannot find map names");
+        return;
       }
       line.putback(c);
-      
+
       {
-        std::map<std::string, int> maps;
-        
-        std::string map;
-        int index = 0;
-        while (_reader_bits::readToken(line, map)) {
-          if (maps.find(map) != maps.end()) {
-            std::ostringstream msg;
-            msg << "Multiple occurence of arc map: " << map;
-            throw DataFormatError(msg.str().c_str());
-          }
-          maps.insert(std::make_pair(map, index));
-          ++index;
-        }
-        
-        for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
-          std::map<std::string, int>::iterator jt = 
-            maps.find(_arc_maps[i].first);
-          if (jt == maps.end()) {
-            std::ostringstream msg;
-            msg << "Map not found in file: " << _arc_maps[i].first;
-            throw DataFormatError(msg.str().c_str());
-          }
-          map_index[i] = jt->second;
-        }
-
-        {
-          std::map<std::string, int>::iterator jt = maps.find("label");
-          if (jt != maps.end()) {
-            label_index = jt->second;
-          } else {
-            label_index = -1;
-          }
-        }
-        map_num = maps.size();
+        std::map<std::string, int> maps;
+
+        std::string map;
+        int index = 0;
+        while (_reader_bits::readToken(line, map)) {
+          if (maps.find(map) != maps.end()) {
+            std::ostringstream msg;
+            msg << "Multiple occurence of arc map: " << map;
+            throw DataFormatError(msg.str().c_str());
+          }
+          maps.insert(std::make_pair(map, index));
+          ++index;
+        }
+
+        for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
+          std::map<std::string, int>::iterator jt =
+            maps.find(_arc_maps[i].first);
+          if (jt == maps.end()) {
+            std::ostringstream msg;
+            msg << "Map not found in file: " << _arc_maps[i].first;
+            throw DataFormatError(msg.str().c_str());
+          }
+          map_index[i] = jt->second;
+        }
+
+        {
+          std::map<std::string, int>::iterator jt = maps.find("label");
+          if (jt != maps.end()) {
+            label_index = jt->second;
+          } else {
+            label_index = -1;
+          }
+        }
+        map_num = maps.size();
       }
 
       while (readLine() && line >> c && c != '@') {
-        line.putback(c);
-
-        std::string source_token;
-        std::string target_token;
-
-        if (!_reader_bits::readToken(line, source_token))
-          throw DataFormatError("Source not found");
-
-        if (!_reader_bits::readToken(line, target_token))
-          throw DataFormatError("Target not found");
-        
-        std::vector<std::string> tokens(map_num);
-        for (int i = 0; i < map_num; ++i) {
-          if (!_reader_bits::readToken(line, tokens[i])) {
-            std::ostringstream msg;
-            msg << "Column not found (" << i + 1 << ")";
-            throw DataFormatError(msg.str().c_str());
-          }
-        }
-        if (line >> std::ws >> c)
-          throw DataFormatError("Extra character on the end of line");
-        
-        Arc a;
-        if (!_use_arcs) {
+        line.putback(c);
+
+        std::string source_token;
+        std::string target_token;
+
+        if (!_reader_bits::readToken(line, source_token))
+          throw DataFormatError("Source not found");
+
+        if (!_reader_bits::readToken(line, target_token))
+          throw DataFormatError("Target not found");
+
+        std::vector<std::string> tokens(map_num);
+        for (int i = 0; i < map_num; ++i) {
+          if (!_reader_bits::readToken(line, tokens[i])) {
+            std::ostringstream msg;
+            msg << "Column not found (" << i + 1 << ")";
+            throw DataFormatError(msg.str().c_str());
+          }
+        }
+        if (line >> std::ws >> c)
+          throw DataFormatError("Extra character on the end of line");
+
+        Arc a;
+        if (!_use_arcs) {
 
           typename NodeIndex::iterator it;
- 
+
           it = _node_index.find(source_token);
           if (it == _node_index.end()) {
@@ -1017 +1017 @@
 
           it = _node_index.find(target_token);
-          if (it == _node_index.end()) {       
-            std::ostringstream msg;            
+          if (it == _node_index.end()) {
+            std::ostringstream msg;
             msg << "Item not found: " << target_token;
             throw DataFormatError(msg.str().c_str());
-          }                                          
-          Node target = it->second;                            
-
-          a = _digraph.addArc(source, target);
-          if (label_index != -1) 
-            _arc_index.insert(std::make_pair(tokens[label_index], a));
-        } else {
-          if (label_index == -1) 
-            throw DataFormatError("Label map not found in file");
-          typename std::map<std::string, Arc>::iterator it =
-            _arc_index.find(tokens[label_index]);
-          if (it == _arc_index.end()) {
-            std::ostringstream msg;
-            msg << "Arc with label not found: " << tokens[label_index];
-            throw DataFormatError(msg.str().c_str());       
-          }
-          a = it->second;
-        }
-
-        for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
-          _arc_maps[i].second->set(a, tokens[map_index[i]]);
-        }
+          }
+          Node target = it->second;
+
+          a = _digraph.addArc(source, target);
+          if (label_index != -1)
+            _arc_index.insert(std::make_pair(tokens[label_index], a));
+        } else {
+          if (label_index == -1)
+            throw DataFormatError("Label map not found in file");
+          typename std::map<std::string, Arc>::iterator it =
+            _arc_index.find(tokens[label_index]);
+          if (it == _arc_index.end()) {
+            std::ostringstream msg;
+            msg << "Arc with label not found: " << tokens[label_index];
+            throw DataFormatError(msg.str().c_str());
+          }
+          a = it->second;
+        }
+
+        for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
+          _arc_maps[i].second->set(a, tokens[map_index[i]]);
+        }
 
       }
       if (readSuccess()) {
-        line.putback(c);
+        line.putback(c);
       }
     }
@@ -1056 +1056 @@
       char c;
       while (readLine() && line >> c && c != '@') {
-        line.putback(c);
-        
-        std::string attr, token;
-        if (!_reader_bits::readToken(line, attr))
-          throw DataFormatError("Attribute name not found");
-        if (!_reader_bits::readToken(line, token))
-          throw DataFormatError("Attribute value not found");
-        if (line >> c)
-          throw DataFormatError("Extra character on the end of line");    
-
-        {
-          std::set<std::string>::iterator it = read_attr.find(attr);
-          if (it != read_attr.end()) {
-            std::ostringstream msg;
-            msg << "Multiple occurence of attribute " << attr;
-            throw DataFormatError(msg.str().c_str());
-          }
-          read_attr.insert(attr);
-        }
-        
-        {
-          typename Attributes::iterator it = _attributes.lower_bound(attr);
-          while (it != _attributes.end() && it->first == attr) {
-            it->second->set(token);
-            ++it;
-          }
-        }
+        line.putback(c);
+
+        std::string attr, token;
+        if (!_reader_bits::readToken(line, attr))
+          throw DataFormatError("Attribute name not found");
+        if (!_reader_bits::readToken(line, token))
+          throw DataFormatError("Attribute value not found");
+        if (line >> c)
+          throw DataFormatError("Extra character on the end of line");
+
+        {
+          std::set<std::string>::iterator it = read_attr.find(attr);
+          if (it != read_attr.end()) {
+            std::ostringstream msg;
+            msg << "Multiple occurence of attribute " << attr;
+            throw DataFormatError(msg.str().c_str());
+          }
+          read_attr.insert(attr);
+        }
+
+        {
+          typename Attributes::iterator it = _attributes.lower_bound(attr);
+          while (it != _attributes.end() && it->first == attr) {
+            it->second->set(token);
+            ++it;
+          }
+        }
 
       }
       if (readSuccess()) {
-        line.putback(c);
+        line.putback(c);
       }
       for (typename Attributes::iterator it = _attributes.begin();
-           it != _attributes.end(); ++it) {
-        if (read_attr.find(it->first) == read_attr.end()) {
-          std::ostringstream msg;
-          msg << "Attribute not found in file: " << it->first;
-          throw DataFormatError(msg.str().c_str());
-        }       
+           it != _attributes.end(); ++it) {
+        if (read_attr.find(it->first) == read_attr.end()) {
+          std::ostringstream msg;
+          msg << "Attribute not found in file: " << it->first;
+          throw DataFormatError(msg.str().c_str());
+        }
       }
     }
@@ -1100 +1100 @@
   public:
 
-    /// \name Execution of the reader    
+    /// \name Execution of the reader
     /// @{
 
@@ -1109 +1109 @@
       LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
       if (!*_is) {
-        throw DataFormatError("Cannot find file");
-      }
-      
+        throw DataFormatError("Cannot find file");
+      }
+
       bool nodes_done = _skip_nodes;
       bool arcs_done = _skip_arcs;
       bool attributes_done = false;
 
-      line_num = 0;      
+      line_num = 0;
       readLine();
       skipSection();
 
       while (readSuccess()) {
-        try {
-          char c;
-          std::string section, caption;
-          line >> c;
-          _reader_bits::readToken(line, section);
-          _reader_bits::readToken(line, caption);
-
-          if (line >> c) 
-            throw DataFormatError("Extra character on the end of line");
-
-          if (section == "nodes" && !nodes_done) {
-            if (_nodes_caption.empty() || _nodes_caption == caption) {
-              readNodes();
-              nodes_done = true;
-            }
-          } else if ((section == "arcs" || section == "edges") && 
-                     !arcs_done) {
-            if (_arcs_caption.empty() || _arcs_caption == caption) {
-              readArcs();
-              arcs_done = true;
-            }
-          } else if (section == "attributes" && !attributes_done) {
-            if (_attributes_caption.empty() || _attributes_caption == caption) {
-              readAttributes();
-              attributes_done = true;
-            }
-          } else {
-            readLine();
-            skipSection();
-          }
-        } catch (DataFormatError& error) {
-          error.line(line_num);
-          throw;
-        }       
+        try {
+          char c;
+          std::string section, caption;
+          line >> c;
+          _reader_bits::readToken(line, section);
+          _reader_bits::readToken(line, caption);
+
+          if (line >> c)
+            throw DataFormatError("Extra character on the end of line");
+
+          if (section == "nodes" && !nodes_done) {
+            if (_nodes_caption.empty() || _nodes_caption == caption) {
+              readNodes();
+              nodes_done = true;
+            }
+          } else if ((section == "arcs" || section == "edges") &&
+                     !arcs_done) {
+            if (_arcs_caption.empty() || _arcs_caption == caption) {
+              readArcs();
+              arcs_done = true;
+            }
+          } else if (section == "attributes" && !attributes_done) {
+            if (_attributes_caption.empty() || _attributes_caption == caption) {
+              readAttributes();
+              attributes_done = true;
+            }
+          } else {
+            readLine();
+            skipSection();
+          }
+        } catch (DataFormatError& error) {
+          error.line(line_num);
+          throw;
+        }
       }
 
       if (!nodes_done) {
-        throw DataFormatError("Section @nodes not found");
+        throw DataFormatError("Section @nodes not found");
       }
 
       if (!arcs_done) {
-        throw DataFormatError("Section @arcs not found");
+        throw DataFormatError("Section @arcs not found");
       }
 
       if (!attributes_done && !_attributes.empty()) {
-        throw DataFormatError("Section @attributes not found");
+        throw DataFormatError("Section @attributes not found");
       }
 
@@ -1172 +1172 @@
 
     /// @}
-    
+
   };
 
   /// \brief Return a \ref DigraphReader class
-  /// 
+  ///
   /// This function just returns a \ref DigraphReader class.
   /// \relates DigraphReader
@@ -1186 +1186 @@
 
   /// \brief Return a \ref DigraphReader class
-  /// 
+  ///
   /// This function just returns a \ref DigraphReader class.
   /// \relates DigraphReader
   template <typename Digraph>
-  DigraphReader<Digraph> digraphReader(const std::string& fn, 
-                                       Digraph& digraph) {
+  DigraphReader<Digraph> digraphReader(const std::string& fn,
+                                       Digraph& digraph) {
     DigraphReader<Digraph> tmp(fn, digraph);
     return tmp;
@@ -1197 +1197 @@
 
   /// \brief Return a \ref DigraphReader class
-  /// 
+  ///
   /// This function just returns a \ref DigraphReader class.
   /// \relates DigraphReader
@@ -1210 +1210 @@
 
   template <typename Graph>
-  GraphReader<Graph> graphReader(std::istream& is, Graph& graph);    
+  GraphReader<Graph> graphReader(std::istream& is, Graph& graph);
 
   template <typename Graph>
-  GraphReader<Graph> graphReader(const std::string& fn, Graph& graph);   
+  GraphReader<Graph> graphReader(const std::string& fn, Graph& graph);
 
   template <typename Graph>
-  GraphReader<Graph> graphReader(const char *fn, Graph& graph);    
+  GraphReader<Graph> graphReader(const char *fn, Graph& graph);
 
   /// \ingroup lemon_io
-  ///  
+  ///
   /// \brief \ref lgf-format "LGF" reader for undirected graphs
   ///
@@ -1239 +1239 @@
     typedef _Graph Graph;
     TEMPLATE_GRAPH_TYPEDEFS(Graph);
-    
+
   private:
 
@@ -1255 +1255 @@
     typedef std::map<std::string, Edge> EdgeIndex;
     EdgeIndex _edge_index;
-    
-    typedef std::vector<std::pair<std::string, 
-      _reader_bits::MapStorageBase<Node>*> > NodeMaps;    
-    NodeMaps _node_maps; 
+
+    typedef std::vector<std::pair<std::string,
+      _reader_bits::MapStorageBase<Node>*> > NodeMaps;
+    NodeMaps _node_maps;
 
     typedef std::vector<std::pair<std::string,
@@ -1264 +1264 @@
     EdgeMaps _edge_maps;
 
-    typedef std::multimap<std::string, _reader_bits::ValueStorageBase*> 
+    typedef std::multimap<std::string, _reader_bits::ValueStorageBase*>
       Attributes;
     Attributes _attributes;
@@ -1283 +1283 @@
     /// Construct an undirected graph reader, which reads from the given
     /// input stream.
-    GraphReader(std::istream& is, Graph& graph) 
+    GraphReader(std::istream& is, Graph& graph)
       : _is(&is), local_is(false), _graph(graph),
-        _use_nodes(false), _use_edges(false),
-        _skip_nodes(false), _skip_edges(false) {}
+        _use_nodes(false), _use_edges(false),
+        _skip_nodes(false), _skip_edges(false) {}
 
     /// \brief Constructor
@@ -1292 +1292 @@
     /// Construct an undirected graph reader, which reads from the given
     /// file.
-    GraphReader(const std::string& fn, Graph& graph) 
+    GraphReader(const std::string& fn, Graph& graph)
       : _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph),
-        _use_nodes(false), _use_edges(false),
-        _skip_nodes(false), _skip_edges(false) {}
-    
+            _use_nodes(false), _use_edges(false),
+        _skip_nodes(false), _skip_edges(false) {}
+
     /// \brief Constructor
     ///
     /// Construct an undirected graph reader, which reads from the given
     /// file.
-    GraphReader(const char* fn, Graph& graph) 
+    GraphReader(const char* fn, Graph& graph)
       : _is(new std::ifstream(fn)), local_is(true), _graph(graph),
-        _use_nodes(false), _use_edges(false),
-        _skip_nodes(false), _skip_edges(false) {}
+            _use_nodes(false), _use_edges(false),
+        _skip_nodes(false), _skip_edges(false) {}
 
     /// \brief Destructor
     ~GraphReader() {
-      for (typename NodeMaps::iterator it = _node_maps.begin(); 
-           it != _node_maps.end(); ++it) {
-        delete it->second;
-      }
-
-      for (typename EdgeMaps::iterator it = _edge_maps.begin(); 
-           it != _edge_maps.end(); ++it) {
-        delete it->second;
-      }
-
-      for (typename Attributes::iterator it = _attributes.begin(); 
-           it != _attributes.end(); ++it) {
-        delete it->second;
+      for (typename NodeMaps::iterator it = _node_maps.begin();
+           it != _node_maps.end(); ++it) {
+        delete it->second;
+      }
+
+      for (typename EdgeMaps::iterator it = _edge_maps.begin();
+           it != _edge_maps.end(); ++it) {
+        delete it->second;
+      }
+
+      for (typename Attributes::iterator it = _attributes.begin();
+           it != _attributes.end(); ++it) {
+        delete it->second;
       }
 
       if (local_is) {
-        delete _is;
+        delete _is;
       }
 
@@ -1330 +1330 @@
 
   private:
-    friend GraphReader<Graph> graphReader<>(std::istream& is, Graph& graph);    
-    friend GraphReader<Graph> graphReader<>(const std::string& fn, 
-                                            Graph& graph);   
-    friend GraphReader<Graph> graphReader<>(const char *fn, Graph& graph);    
-
-    GraphReader(GraphReader& other) 
+    friend GraphReader<Graph> graphReader<>(std::istream& is, Graph& graph);
+    friend GraphReader<Graph> graphReader<>(const std::string& fn,
+                                            Graph& graph);
+    friend GraphReader<Graph> graphReader<>(const char *fn, Graph& graph);
+
+    GraphReader(GraphReader& other)
       : _is(other._is), local_is(other.local_is), _graph(other._graph),
-        _use_nodes(other._use_nodes), _use_edges(other._use_edges),
-        _skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) {
+        _use_nodes(other._use_nodes), _use_edges(other._use_edges),
+        _skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) {
 
       other._is = 0;
       other.local_is = false;
-      
+
       _node_index.swap(other._node_index);
       _edge_index.swap(other._edge_index);
@@ -1362 +1362 @@
     /// \name Reading rules
     /// @{
-    
+
     /// \brief Node map reading rule
     ///
@@ -1369 +1369 @@
     GraphReader& nodeMap(const std::string& caption, Map& map) {
       checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
-      _reader_bits::MapStorageBase<Node>* storage = 
-        new _reader_bits::MapStorage<Node, Map>(map);
+      _reader_bits::MapStorageBase<Node>* storage =
+        new _reader_bits::MapStorage<Node, Map>(map);
       _node_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1380 +1380 @@
     /// reader.
     template <typename Map, typename Converter>
-    GraphReader& nodeMap(const std::string& caption, Map& map, 
-                           const Converter& converter = Converter()) {
+    GraphReader& nodeMap(const std::string& caption, Map& map,
+                           const Converter& converter = Converter()) {
       checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
-      _reader_bits::MapStorageBase<Node>* storage = 
-        new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
+      _reader_bits::MapStorageBase<Node>* storage =
+        new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
       _node_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1395 +1395 @@
     GraphReader& edgeMap(const std::string& caption, Map& map) {
       checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
-      _reader_bits::MapStorageBase<Edge>* storage = 
-        new _reader_bits::MapStorage<Edge, Map>(map);
+      _reader_bits::MapStorageBase<Edge>* storage =
+        new _reader_bits::MapStorage<Edge, Map>(map);
       _edge_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1406 +1406 @@
     /// reader.
     template <typename Map, typename Converter>
-    GraphReader& edgeMap(const std::string& caption, Map& map, 
-                          const Converter& converter = Converter()) {
+    GraphReader& edgeMap(const std::string& caption, Map& map,
+                          const Converter& converter = Converter()) {
       checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
-      _reader_bits::MapStorageBase<Edge>* storage = 
-        new _reader_bits::MapStorage<Edge, Map, Converter>(map, converter);
+      _reader_bits::MapStorageBase<Edge>* storage =
+        new _reader_bits::MapStorage<Edge, Map, Converter>(map, converter);
       _edge_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1421 +1421 @@
     GraphReader& arcMap(const std::string& caption, Map& map) {
       checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
-      _reader_bits::MapStorageBase<Edge>* forward_storage = 
-        new _reader_bits::GraphArcMapStorage<Graph, true, Map>(_graph, map);
+      _reader_bits::MapStorageBase<Edge>* forward_storage =
+        new _reader_bits::GraphArcMapStorage<Graph, true, Map>(_graph, map);
       _edge_maps.push_back(std::make_pair('+' + caption, forward_storage));
-      _reader_bits::MapStorageBase<Edge>* backward_storage = 
-        new _reader_bits::GraphArcMapStorage<Graph, false, Map>(_graph, map);
+      _reader_bits::MapStorageBase<Edge>* backward_storage =
+        new _reader_bits::GraphArcMapStorage<Graph, false, Map>(_graph, map);
       _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
       return *this;
@@ -1435 +1435 @@
     /// reader.
     template <typename Map, typename Converter>
-    GraphReader& arcMap(const std::string& caption, Map& map, 
-                          const Converter& converter = Converter()) {
+    GraphReader& arcMap(const std::string& caption, Map& map,
+                          const Converter& converter = Converter()) {
       checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
-      _reader_bits::MapStorageBase<Edge>* forward_storage = 
-        new _reader_bits::GraphArcMapStorage<Graph, true, Map, Converter>
-        (_graph, map, converter);
+      _reader_bits::MapStorageBase<Edge>* forward_storage =
+        new _reader_bits::GraphArcMapStorage<Graph, true, Map, Converter>
+        (_graph, map, converter);
       _edge_maps.push_back(std::make_pair('+' + caption, forward_storage));
-      _reader_bits::MapStorageBase<Edge>* backward_storage = 
-        new _reader_bits::GraphArcMapStorage<Graph, false, Map, Converter>
-        (_graph, map, converter);
+      _reader_bits::MapStorageBase<Edge>* backward_storage =
+        new _reader_bits::GraphArcMapStorage<Graph, false, Map, Converter>
+        (_graph, map, converter);
       _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
       return *this;
@@ -1454 +1454 @@
     template <typename Value>
     GraphReader& attribute(const std::string& caption, Value& value) {
-      _reader_bits::ValueStorageBase* storage = 
-        new _reader_bits::ValueStorage<Value>(value);
+      _reader_bits::ValueStorageBase* storage =
+        new _reader_bits::ValueStorage<Value>(value);
       _attributes.insert(std::make_pair(caption, storage));
       return *this;
@@ -1465 +1465 @@
     /// reader.
     template <typename Value, typename Converter>
-    GraphReader& attribute(const std::string& caption, Value& value, 
-                             const Converter& converter = Converter()) {
-      _reader_bits::ValueStorageBase* storage = 
-        new _reader_bits::ValueStorage<Value, Converter>(value, converter);
+    GraphReader& attribute(const std::string& caption, Value& value,
+                             const Converter& converter = Converter()) {
+      _reader_bits::ValueStorageBase* storage =
+        new _reader_bits::ValueStorage<Value, Converter>(value, converter);
       _attributes.insert(std::make_pair(caption, storage));
       return *this;
@@ -1479 +1479 @@
       typedef _reader_bits::MapLookUpConverter<Node> Converter;
       Converter converter(_node_index);
-      _reader_bits::ValueStorageBase* storage = 
-        new _reader_bits::ValueStorage<Node, Converter>(node, converter);
+      _reader_bits::ValueStorageBase* storage =
+        new _reader_bits::ValueStorage<Node, Converter>(node, converter);
       _attributes.insert(std::make_pair(caption, storage));
       return *this;
@@ -1491 +1491 @@
       typedef _reader_bits::MapLookUpConverter<Edge> Converter;
       Converter converter(_edge_index);
-      _reader_bits::ValueStorageBase* storage = 
-        new _reader_bits::ValueStorage<Edge, Converter>(edge, converter);
+      _reader_bits::ValueStorageBase* storage =
+        new _reader_bits::ValueStorage<Edge, Converter>(edge, converter);
       _attributes.insert(std::make_pair(caption, storage));
       return *this;
@@ -1503 +1503 @@
       typedef _reader_bits::GraphArcLookUpConverter<Graph> Converter;
       Converter converter(_graph, _edge_index);
-      _reader_bits::ValueStorageBase* storage = 
-        new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
+      _reader_bits::ValueStorageBase* storage =
+        new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
       _attributes.insert(std::make_pair(caption, storage));
       return *this;
@@ -1550 +1550 @@
     GraphReader& useNodes(const Map& map) {
       checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
-      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member"); 
+      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member");
       _use_nodes = true;
       _writer_bits::DefaultConverter<typename Map::Value> converter;
       for (NodeIt n(_graph); n != INVALID; ++n) {
-        _node_index.insert(std::make_pair(converter(map[n]), n));
+        _node_index.insert(std::make_pair(converter(map[n]), n));
       }
       return *this;
@@ -1565 +1565 @@
     /// \c std::string.
     template <typename Map, typename Converter>
-    GraphReader& useNodes(const Map& map, 
-                            const Converter& converter = Converter()) {
+    GraphReader& useNodes(const Map& map,
+                            const Converter& converter = Converter()) {
       checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
-      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member"); 
+      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member");
       _use_nodes = true;
       for (NodeIt n(_graph); n != INVALID; ++n) {
-        _node_index.insert(std::make_pair(converter(map[n]), n));
+        _node_index.insert(std::make_pair(converter(map[n]), n));
       }
       return *this;
@@ -1587 +1587 @@
       _writer_bits::DefaultConverter<typename Map::Value> converter;
       for (EdgeIt a(_graph); a != INVALID; ++a) {
-        _edge_index.insert(std::make_pair(converter(map[a]), a));
+        _edge_index.insert(std::make_pair(converter(map[a]), a));
       }
       return *this;
@@ -1598 +1598 @@
     /// \c std::string.
     template <typename Map, typename Converter>
-    GraphReader& useEdges(const Map& map, 
-                            const Converter& converter = Converter()) {
+    GraphReader& useEdges(const Map& map,
+                            const Converter& converter = Converter()) {
       checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
-      LEMON_ASSERT(!_use_edges, "Multiple usage of useEdges() member"); 
+      LEMON_ASSERT(!_use_edges, "Multiple usage of useEdges() member");
       _use_edges = true;
       for (EdgeIt a(_graph); a != INVALID; ++a) {
-        _edge_index.insert(std::make_pair(converter(map[a]), a));
+        _edge_index.insert(std::make_pair(converter(map[a]), a));
       }
       return *this;
@@ -1619 +1619 @@
     /// \c useNodes() should be used to specify the label of the nodes.
     GraphReader& skipNodes() {
-      LEMON_ASSERT(!_skip_nodes, "Skip nodes already set"); 
+      LEMON_ASSERT(!_skip_nodes, "Skip nodes already set");
       _skip_nodes = true;
       return *this;
@@ -1630 +1630 @@
     /// will not be constructed.
     GraphReader& skipEdges() {
-      LEMON_ASSERT(!_skip_edges, "Skip edges already set"); 
+      LEMON_ASSERT(!_skip_edges, "Skip edges already set");
       _skip_edges = true;
       return *this;
@@ -1642 +1642 @@
       std::string str;
       while(++line_num, std::getline(*_is, str)) {
-        line.clear(); line.str(str);
-        char c;
-        if (line >> std::ws >> c && c != '#') {
-          line.putback(c);
-          return true;
-        }
+        line.clear(); line.str(str);
+        char c;
+        if (line >> std::ws >> c && c != '#') {
+          line.putback(c);
+          return true;
+        }
       }
       return false;
@@ -1655 +1655 @@
       return static_cast<bool>(*_is);
     }
-    
+
     void skipSection() {
       char c;
       while (readSuccess() && line >> c && c != '@') {
-        readLine();
+        readLine();
       }
       line.putback(c);
@@ -1671 +1671 @@
       char c;
       if (!readLine() || !(line >> c) || c == '@') {
-        if (readSuccess() && line) line.putback(c);
-        if (!_node_maps.empty()) 
-          throw DataFormatError("Cannot find map names");
-        return;
+        if (readSuccess() && line) line.putback(c);
+        if (!_node_maps.empty())
+          throw DataFormatError("Cannot find map names");
+        return;
       }
       line.putback(c);
-      
+
       {
-        std::map<std::string, int> maps;
-        
-        std::string map;
-        int index = 0;
-        while (_reader_bits::readToken(line, map)) {
-          if (maps.find(map) != maps.end()) {
-            std::ostringstream msg;
-            msg << "Multiple occurence of node map: " << map;
-            throw DataFormatError(msg.str().c_str());
-          }
-          maps.insert(std::make_pair(map, index));
-          ++index;
-        }
-        
-        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
-          std::map<std::string, int>::iterator jt = 
-            maps.find(_node_maps[i].first);
-          if (jt == maps.end()) {
-            std::ostringstream msg;
-            msg << "Map not found in file: " << _node_maps[i].first;
-            throw DataFormatError(msg.str().c_str());
-          }
-          map_index[i] = jt->second;
-        }
-
-        {
-          std::map<std::string, int>::iterator jt = maps.find("label");
-          if (jt != maps.end()) {
-            label_index = jt->second;
-          } else {
-            label_index = -1;
-          }
-        }
-        map_num = maps.size();
+        std::map<std::string, int> maps;
+
+        std::string map;
+        int index = 0;
+        while (_reader_bits::readToken(line, map)) {
+          if (maps.find(map) != maps.end()) {
+            std::ostringstream msg;
+            msg << "Multiple occurence of node map: " << map;
+            throw DataFormatError(msg.str().c_str());
+          }
+          maps.insert(std::make_pair(map, index));
+          ++index;
+        }
+
+        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
+          std::map<std::string, int>::iterator jt =
+            maps.find(_node_maps[i].first);
+          if (jt == maps.end()) {
+            std::ostringstream msg;
+            msg << "Map not found in file: " << _node_maps[i].first;
+            throw DataFormatError(msg.str().c_str());
+          }
+          map_index[i] = jt->second;
+        }
+
+        {
+          std::map<std::string, int>::iterator jt = maps.find("label");
+          if (jt != maps.end()) {
+            label_index = jt->second;
+          } else {
+            label_index = -1;
+          }
+        }
+        map_num = maps.size();
       }
 
       while (readLine() && line >> c && c != '@') {
-        line.putback(c);
-
-        std::vector<std::string> tokens(map_num);
-        for (int i = 0; i < map_num; ++i) {
-          if (!_reader_bits::readToken(line, tokens[i])) {
-            std::ostringstream msg;
-            msg << "Column not found (" << i + 1 << ")";
-            throw DataFormatError(msg.str().c_str());
-          }
-        }
-        if (line >> std::ws >> c)
-          throw DataFormatError("Extra character on the end of line");
-        
-        Node n;
-        if (!_use_nodes) {
-          n = _graph.addNode();
-          if (label_index != -1) 
-            _node_index.insert(std::make_pair(tokens[label_index], n));
-        } else {
-          if (label_index == -1) 
-            throw DataFormatError("Label map not found in file");
-          typename std::map<std::string, Node>::iterator it =
-            _node_index.find(tokens[label_index]);
-          if (it == _node_index.end()) {
-            std::ostringstream msg;
-            msg << "Node with label not found: " << tokens[label_index];
-            throw DataFormatError(msg.str().c_str());       
-          }
-          n = it->second;
-        }
-
-        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
-          _node_maps[i].second->set(n, tokens[map_index[i]]);
-        }
+        line.putback(c);
+
+        std::vector<std::string> tokens(map_num);
+        for (int i = 0; i < map_num; ++i) {
+          if (!_reader_bits::readToken(line, tokens[i])) {
+            std::ostringstream msg;
+            msg << "Column not found (" << i + 1 << ")";
+            throw DataFormatError(msg.str().c_str());
+          }
+        }
+        if (line >> std::ws >> c)
+          throw DataFormatError("Extra character on the end of line");
+
+        Node n;
+        if (!_use_nodes) {
+          n = _graph.addNode();
+          if (label_index != -1)
+            _node_index.insert(std::make_pair(tokens[label_index], n));
+        } else {
+          if (label_index == -1)
+            throw DataFormatError("Label map not found in file");
+          typename std::map<std::string, Node>::iterator it =
+            _node_index.find(tokens[label_index]);
+          if (it == _node_index.end()) {
+            std::ostringstream msg;
+            msg << "Node with label not found: " << tokens[label_index];
+            throw DataFormatError(msg.str().c_str());
+          }
+          n = it->second;
+        }
+
+        for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
+          _node_maps[i].second->set(n, tokens[map_index[i]]);
+        }
 
       }
       if (readSuccess()) {
-        line.putback(c);
+        line.putback(c);
       }
     }
@@ -1764 +1764 @@
       char c;
       if (!readLine() || !(line >> c) || c == '@') {
-        if (readSuccess() && line) line.putback(c);
-        if (!_edge_maps.empty()) 
-          throw DataFormatError("Cannot find map names");
-        return;
+        if (readSuccess() && line) line.putback(c);
+        if (!_edge_maps.empty())
+          throw DataFormatError("Cannot find map names");
+        return;
       }
       line.putback(c);
-      
+
       {
-        std::map<std::string, int> maps;
-        
-        std::string map;
-        int index = 0;
-        while (_reader_bits::readToken(line, map)) {
-          if (maps.find(map) != maps.end()) {
-            std::ostringstream msg;
-            msg << "Multiple occurence of edge map: " << map;
-            throw DataFormatError(msg.str().c_str());
-          }
-          maps.insert(std::make_pair(map, index));
-          ++index;
-        }
-        
-        for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
-          std::map<std::string, int>::iterator jt = 
-            maps.find(_edge_maps[i].first);
-          if (jt == maps.end()) {
-            std::ostringstream msg;
-            msg << "Map not found in file: " << _edge_maps[i].first;
-            throw DataFormatError(msg.str().c_str());
-          }
-          map_index[i] = jt->second;
-        }
-
-        {
-          std::map<std::string, int>::iterator jt = maps.find("label");
-          if (jt != maps.end()) {
-            label_index = jt->second;
-          } else {
-            label_index = -1;
-          }
-        }
-        map_num = maps.size();
+        std::map<std::string, int> maps;
+
+        std::string map;
+        int index = 0;
+        while (_reader_bits::readToken(line, map)) {
+          if (maps.find(map) != maps.end()) {
+            std::ostringstream msg;
+            msg << "Multiple occurence of edge map: " << map;
+            throw DataFormatError(msg.str().c_str());
+          }
+          maps.insert(std::make_pair(map, index));
+          ++index;
+        }
+
+        for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
+          std::map<std::string, int>::iterator jt =
+            maps.find(_edge_maps[i].first);
+          if (jt == maps.end()) {
+            std::ostringstream msg;
+            msg << "Map not found in file: " << _edge_maps[i].first;
+            throw DataFormatError(msg.str().c_str());
+          }
+          map_index[i] = jt->second;
+        }
+
+        {
+          std::map<std::string, int>::iterator jt = maps.find("label");
+          if (jt != maps.end()) {
+            label_index = jt->second;
+          } else {
+            label_index = -1;
+          }
+        }
+        map_num = maps.size();
       }
 
       while (readLine() && line >> c && c != '@') {
-        line.putback(c);
-
-        std::string source_token;
-        std::string target_token;
-
-        if (!_reader_bits::readToken(line, source_token))
-          throw DataFormatError("Node u not found");
-
-        if (!_reader_bits::readToken(line, target_token))
-          throw DataFormatError("Node v not found");
-        
-        std::vector<std::string> tokens(map_num);
-        for (int i = 0; i < map_num; ++i) {
-          if (!_reader_bits::readToken(line, tokens[i])) {
-            std::ostringstream msg;
-            msg << "Column not found (" << i + 1 << ")";
-            throw DataFormatError(msg.str().c_str());
-          }
-        }
-        if (line >> std::ws >> c)
-          throw DataFormatError("Extra character on the end of line");
-        
-        Edge e;
-        if (!_use_edges) {
+        line.putback(c);
+
+        std::string source_token;
+        std::string target_token;
+
+        if (!_reader_bits::readToken(line, source_token))
+          throw DataFormatError("Node u not found");
+
+        if (!_reader_bits::readToken(line, target_token))
+          throw DataFormatError("Node v not found");
+
+        std::vector<std::string> tokens(map_num);
+        for (int i = 0; i < map_num; ++i) {
+          if (!_reader_bits::readToken(line, tokens[i])) {
+            std::ostringstream msg;
+            msg << "Column not found (" << i + 1 << ")";
+            throw DataFormatError(msg.str().c_str());
+          }
+        }
+        if (line >> std::ws >> c)
+          throw DataFormatError("Extra character on the end of line");
+
+        Edge e;
+        if (!_use_edges) {
 
           typename NodeIndex::iterator it;
- 
+
           it = _node_index.find(source_token);
           if (it == _node_index.end()) {
@@ -1845 +1845 @@
 
           it = _node_index.find(target_token);
-          if (it == _node_index.end()) {       
-            std::ostringstream msg;            
+          if (it == _node_index.end()) {
+            std::ostringstream msg;
             msg << "Item not found: " << target_token;
             throw DataFormatError(msg.str().c_str());
-          }                                          
-          Node target = it->second;                            
-
-          e = _graph.addEdge(source, target);
-          if (label_index != -1) 
-            _edge_index.insert(std::make_pair(tokens[label_index], e));
-        } else {
-          if (label_index == -1) 
-            throw DataFormatError("Label map not found in file");
-          typename std::map<std::string, Edge>::iterator it =
-            _edge_index.find(tokens[label_index]);
-          if (it == _edge_index.end()) {
-            std::ostringstream msg;
-            msg << "Edge with label not found: " << tokens[label_index];
-            throw DataFormatError(msg.str().c_str());       
-          }
-          e = it->second;
-        }
-
-        for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
-          _edge_maps[i].second->set(e, tokens[map_index[i]]);
-        }
+          }
+          Node target = it->second;
+
+          e = _graph.addEdge(source, target);
+          if (label_index != -1)
+            _edge_index.insert(std::make_pair(tokens[label_index], e));
+        } else {
+          if (label_index == -1)
+            throw DataFormatError("Label map not found in file");
+          typename std::map<std::string, Edge>::iterator it =
+            _edge_index.find(tokens[label_index]);
+          if (it == _edge_index.end()) {
+            std::ostringstream msg;
+            msg << "Edge with label not found: " << tokens[label_index];
+            throw DataFormatError(msg.str().c_str());
+          }
+          e = it->second;
+        }
+
+        for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
+          _edge_maps[i].second->set(e, tokens[map_index[i]]);
+        }
 
       }
       if (readSuccess()) {
-        line.putback(c);
+        line.putback(c);
       }
     }
@@ -1884 +1884 @@
       char c;
       while (readLine() && line >> c && c != '@') {
-        line.putback(c);
-        
-        std::string attr, token;
-        if (!_reader_bits::readToken(line, attr))
-          throw DataFormatError("Attribute name not found");
-        if (!_reader_bits::readToken(line, token))
-          throw DataFormatError("Attribute value not found");
-        if (line >> c)
-          throw DataFormatError("Extra character on the end of line");    
-
-        {
-          std::set<std::string>::iterator it = read_attr.find(attr);
-          if (it != read_attr.end()) {
-            std::ostringstream msg;
-            msg << "Multiple occurence of attribute " << attr;
-            throw DataFormatError(msg.str().c_str());
-          }
-          read_attr.insert(attr);
-        }
-        
-        {
-          typename Attributes::iterator it = _attributes.lower_bound(attr);
-          while (it != _attributes.end() && it->first == attr) {
-            it->second->set(token);
-            ++it;
-          }
-        }
+        line.putback(c);
+
+        std::string attr, token;
+        if (!_reader_bits::readToken(line, attr))
+          throw DataFormatError("Attribute name not found");
+        if (!_reader_bits::readToken(line, token))
+          throw DataFormatError("Attribute value not found");
+        if (line >> c)
+          throw DataFormatError("Extra character on the end of line");
+
+        {
+          std::set<std::string>::iterator it = read_attr.find(attr);
+          if (it != read_attr.end()) {
+            std::ostringstream msg;
+            msg << "Multiple occurence of attribute " << attr;
+            throw DataFormatError(msg.str().c_str());
+          }
+          read_attr.insert(attr);
+        }
+
+        {
+          typename Attributes::iterator it = _attributes.lower_bound(attr);
+          while (it != _attributes.end() && it->first == attr) {
+            it->second->set(token);
+            ++it;
+          }
+        }
 
       }
       if (readSuccess()) {
-        line.putback(c);
+        line.putback(c);
       }
       for (typename Attributes::iterator it = _attributes.begin();
-           it != _attributes.end(); ++it) {
-        if (read_attr.find(it->first) == read_attr.end()) {
-          std::ostringstream msg;
-          msg << "Attribute not found in file: " << it->first;
-          throw DataFormatError(msg.str().c_str());
-        }       
+           it != _attributes.end(); ++it) {
+        if (read_attr.find(it->first) == read_attr.end()) {
+          std::ostringstream msg;
+          msg << "Attribute not found in file: " << it->first;
+          throw DataFormatError(msg.str().c_str());
+        }
       }
     }
@@ -1928 +1928 @@
   public:
 
-    /// \name Execution of the reader    
+    /// \name Execution of the reader
     /// @{
 
@@ -1935 +1935 @@
     /// This function starts the batch processing
     void run() {
-      
+
       LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
-      
+
       bool nodes_done = _skip_nodes;
       bool edges_done = _skip_edges;
       bool attributes_done = false;
 
-      line_num = 0;      
+      line_num = 0;
       readLine();
       skipSection();
 
       while (readSuccess()) {
-        try {
-          char c;
-          std::string section, caption;
-          line >> c;
-          _reader_bits::readToken(line, section);
-          _reader_bits::readToken(line, caption);
-
-          if (line >> c) 
-            throw DataFormatError("Extra character on the end of line");
-
-          if (section == "nodes" && !nodes_done) {
-            if (_nodes_caption.empty() || _nodes_caption == caption) {
-              readNodes();
-              nodes_done = true;
-            }
-          } else if ((section == "edges" || section == "arcs") && 
-                     !edges_done) {
-            if (_edges_caption.empty() || _edges_caption == caption) {
-              readEdges();
-              edges_done = true;
-            }
-          } else if (section == "attributes" && !attributes_done) {
-            if (_attributes_caption.empty() || _attributes_caption == caption) {
-              readAttributes();
-              attributes_done = true;
-            }
-          } else {
-            readLine();
-            skipSection();
-          }
-        } catch (DataFormatError& error) {
-          error.line(line_num);
-          throw;
-        }       
+        try {
+          char c;
+          std::string section, caption;
+          line >> c;
+          _reader_bits::readToken(line, section);
+          _reader_bits::readToken(line, caption);
+
+          if (line >> c)
+            throw DataFormatError("Extra character on the end of line");
+
+          if (section == "nodes" && !nodes_done) {
+            if (_nodes_caption.empty() || _nodes_caption == caption) {
+              readNodes();
+              nodes_done = true;
+            }
+          } else if ((section == "edges" || section == "arcs") &&
+                     !edges_done) {
+            if (_edges_caption.empty() || _edges_caption == caption) {
+              readEdges();
+              edges_done = true;
+            }
+          } else if (section == "attributes" && !attributes_done) {
+            if (_attributes_caption.empty() || _attributes_caption == caption) {
+              readAttributes();
+              attributes_done = true;
+            }
+          } else {
+            readLine();
+            skipSection();
+          }
+        } catch (DataFormatError& error) {
+          error.line(line_num);
+          throw;
+        }
       }
 
       if (!nodes_done) {
-        throw DataFormatError("Section @nodes not found");
+        throw DataFormatError("Section @nodes not found");
       }
 
       if (!edges_done) {
-        throw DataFormatError("Section @edges not found");
+        throw DataFormatError("Section @edges not found");
       }
 
       if (!attributes_done && !_attributes.empty()) {
-        throw DataFormatError("Section @attributes not found");
+        throw DataFormatError("Section @attributes not found");
       }
 
@@ -1998 +1998 @@
 
     /// @}
-    
+
   };
 
   /// \brief Return a \ref GraphReader class
-  /// 
+  ///
   /// This function just returns a \ref GraphReader class.
   /// \relates GraphReader
@@ -2012 +2012 @@
 
   /// \brief Return a \ref GraphReader class
-  /// 
+  ///
   /// This function just returns a \ref GraphReader class.
   /// \relates GraphReader
   template <typename Graph>
-  GraphReader<Graph> graphReader(const std::string& fn, 
-                                       Graph& graph) {
+  GraphReader<Graph> graphReader(const std::string& fn,
+                                       Graph& graph) {
     GraphReader<Graph> tmp(fn, graph);
     return tmp;
@@ -2023 +2023 @@
 
   /// \brief Return a \ref GraphReader class
-  /// 
+  ///
   /// This function just returns a \ref GraphReader class.
   /// \relates GraphReader
@@ -2037 +2037 @@
   SectionReader sectionReader(const std::string& fn);
   SectionReader sectionReader(const char* fn);
-  
+
   /// \ingroup lemon_io
   ///
   /// \brief Section reader class
   ///
-  /// In the \ref lgf-format "LGF" file extra sections can be placed, 
+  /// In the \ref lgf-format "LGF" file extra sections can be placed,
   /// which contain any data in arbitrary format. Such sections can be
-  /// read with this class. A reading rule can be added to the class 
+  /// read with this class. A reading rule can be added to the class
   /// with two different functions. With the \c sectionLines() function a
   /// functor can process the section line-by-line, while with the \c
@@ -2051 +2051 @@
   class SectionReader {
   private:
-    
+
     std::istream* _is;
     bool local_is;
@@ -2067 +2067 @@
     /// Construct a section reader, which reads from the given input
     /// stream.
-    SectionReader(std::istream& is) 
+    SectionReader(std::istream& is)
       : _is(&is), local_is(false) {}
 
@@ -2073 +2073 @@
     ///
     /// Construct a section reader, which reads from the given file.
-    SectionReader(const std::string& fn) 
+    SectionReader(const std::string& fn)
       : _is(new std::ifstream(fn.c_str())), local_is(true) {}
-    
+
     /// \brief Constructor
     ///
     /// Construct a section reader, which reads from the given file.
-    SectionReader(const char* fn) 
+    SectionReader(const char* fn)
       : _is(new std::ifstream(fn)), local_is(true) {}
 
     /// \brief Destructor
     ~SectionReader() {
-      for (Sections::iterator it = _sections.begin(); 
-           it != _sections.end(); ++it) {
-        delete it->second;
+      for (Sections::iterator it = _sections.begin();
+           it != _sections.end(); ++it) {
+        delete it->second;
       }
 
       if (local_is) {
-        delete _is;
+        delete _is;
       }
 
@@ -2101 +2101 @@
     friend SectionReader sectionReader(const char* fn);
 
-    SectionReader(SectionReader& other) 
+    SectionReader(SectionReader& other)
       : _is(other._is), local_is(other.local_is) {
 
       other._is = 0;
       other.local_is = false;
-      
+
       _sections.swap(other._sections);
     }
-    
+
     SectionReader& operator=(const SectionReader&);
 
@@ -2149 +2149 @@
     ///  // ...
     ///
-    ///  reader.sectionLines("numbers", NumberSection(vec));  
+    ///  reader.sectionLines("numbers", NumberSection(vec));
     ///\endcode
     template <typename Functor>
     SectionReader& sectionLines(const std::string& type, Functor functor) {
       LEMON_ASSERT(!type.empty(), "Type is empty.");
-      LEMON_ASSERT(_sections.find(type) == _sections.end(), 
-                   "Multiple reading of section.");
-      _sections.insert(std::make_pair(type, 
+      LEMON_ASSERT(_sections.find(type) == _sections.end(),
+                   "Multiple reading of section.");
+      _sections.insert(std::make_pair(type,
         new _reader_bits::LineSection<Functor>(functor)));
       return *this;
@@ -2172 +2172 @@
     SectionReader& sectionStream(const std::string& type, Functor functor) {
       LEMON_ASSERT(!type.empty(), "Type is empty.");
-      LEMON_ASSERT(_sections.find(type) == _sections.end(), 
-                   "Multiple reading of section.");
-      _sections.insert(std::make_pair(type, 
-         new _reader_bits::StreamSection<Functor>(functor)));
-      return *this;
-    }    
-    
+      LEMON_ASSERT(_sections.find(type) == _sections.end(),
+                   "Multiple reading of section.");
+      _sections.insert(std::make_pair(type,
+         new _reader_bits::StreamSection<Functor>(functor)));
+      return *this;
+    }
+
     /// @}
 
@@ -2186 +2186 @@
       std::string str;
       while(++line_num, std::getline(*_is, str)) {
-        line.clear(); line.str(str);
-        char c;
-        if (line >> std::ws >> c && c != '#') {
-          line.putback(c);
-          return true;
-        }
+        line.clear(); line.str(str);
+        char c;
+        if (line >> std::ws >> c && c != '#') {
+          line.putback(c);
+          return true;
+        }
       }
       return false;
@@ -2199 +2199 @@
       return static_cast<bool>(*_is);
     }
-    
+
     void skipSection() {
       char c;
       while (readSuccess() && line >> c && c != '@') {
-        readLine();
+        readLine();
       }
       line.putback(c);
@@ -2211 +2211 @@
 
 
-    /// \name Execution of the reader    
+    /// \name Execution of the reader
     /// @{
 
@@ -2218 +2218 @@
     /// This function starts the batch processing.
     void run() {
-      
+
       LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
-      
+
       std::set<std::string> extra_sections;
 
-      line_num = 0;      
+      line_num = 0;
       readLine();
       skipSection();
 
       while (readSuccess()) {
-        try {
-          char c;
-          std::string section, caption;
-          line >> c;
-          _reader_bits::readToken(line, section);
-          _reader_bits::readToken(line, caption);
-
-          if (line >> c) 
-            throw DataFormatError("Extra character on the end of line");
-
-          if (extra_sections.find(section) != extra_sections.end()) {
-            std::ostringstream msg;
-            msg << "Multiple occurence of section " << section;
-            throw DataFormatError(msg.str().c_str());
-          }
-          Sections::iterator it = _sections.find(section);
-          if (it != _sections.end()) {
-            extra_sections.insert(section);
-            it->second->process(*_is, line_num);
-          }
-          readLine();
-          skipSection();
-        } catch (DataFormatError& error) {
-          error.line(line_num);
-          throw;
-        }       
+        try {
+          char c;
+          std::string section, caption;
+          line >> c;
+          _reader_bits::readToken(line, section);
+          _reader_bits::readToken(line, caption);
+
+          if (line >> c)
+            throw DataFormatError("Extra character on the end of line");
+
+          if (extra_sections.find(section) != extra_sections.end()) {
+            std::ostringstream msg;
+            msg << "Multiple occurence of section " << section;
+            throw DataFormatError(msg.str().c_str());
+          }
+          Sections::iterator it = _sections.find(section);
+          if (it != _sections.end()) {
+            extra_sections.insert(section);
+            it->second->process(*_is, line_num);
+          }
+          readLine();
+          skipSection();
+        } catch (DataFormatError& error) {
+          error.line(line_num);
+          throw;
+        }
       }
       for (Sections::iterator it = _sections.begin();
-           it != _sections.end(); ++it) {
-        if (extra_sections.find(it->first) == extra_sections.end()) {
-          std::ostringstream os;
-          os << "Cannot find section: " << it->first;
-          throw DataFormatError(os.str().c_str());
-        }
+           it != _sections.end(); ++it) {
+        if (extra_sections.find(it->first) == extra_sections.end()) {
+          std::ostringstream os;
+          os << "Cannot find section: " << it->first;
+          throw DataFormatError(os.str().c_str());
+        }
       }
     }
 
     /// @}
-        
+
   };
 
   /// \brief Return a \ref SectionReader class
-  /// 
+  ///
   /// This function just returns a \ref SectionReader class.
   /// \relates SectionReader
@@ -2279 +2279 @@
 
   /// \brief Return a \ref SectionReader class
-  /// 
+  ///
   /// This function just returns a \ref SectionReader class.
   /// \relates SectionReader
@@ -2288 +2288 @@
 
   /// \brief Return a \ref SectionReader class
-  /// 
+  ///
   /// This function just returns a \ref SectionReader class.
   /// \relates SectionReader
@@ -2298 +2298 @@
   /// \ingroup lemon_io
   ///
-  /// \brief Reader for the contents of the \ref lgf-format "LGF" file 
+  /// \brief Reader for the contents of the \ref lgf-format "LGF" file
   ///
   /// This class can be used to read the sections, the map names and
@@ -2308 +2308 @@
   /// reading the graph.
   ///
-  ///\code 
-  /// LgfContents contents("graph.lgf"); 
+  ///\code
+  /// LgfContents contents("graph.lgf");
   /// contents.run();
   ///
@@ -2317 +2317 @@
   ///   return -1;
   /// }
-  /// std::cout << "The name of the default node section: " 
+  /// std::cout << "The name of the default node section: "
   ///           << contents.nodeSection(0) << std::endl;
-  /// std::cout << "The number of the arc maps: " 
+  /// std::cout << "The number of the arc maps: "
   ///           << contents.arcMaps(0).size() << std::endl;
-  /// std::cout << "The name of second arc map: " 
+  /// std::cout << "The name of second arc map: "
   ///           << contents.arcMaps(0)[1] << std::endl;
   ///\endcode
-  class LgfContents {    
+  class LgfContents {
   private:
 
@@ -2345 +2345 @@
     int line_num;
     std::istringstream line;
-    
+
   public:
 
@@ -2352 +2352 @@
     /// Construct an \e LGF contents reader, which reads from the given
     /// input stream.
-    LgfContents(std::istream& is) 
+    LgfContents(std::istream& is)
       : _is(&is), local_is(false) {}
 
@@ -2359 +2359 @@
     /// Construct an \e LGF contents reader, which reads from the given
     /// file.
-    LgfContents(const std::string& fn) 
+    LgfContents(const std::string& fn)
       : _is(new std::ifstream(fn.c_str())), local_is(true) {}
 
@@ -2368 +2368 @@
     LgfContents(const char* fn)
       : _is(new std::ifstream(fn)), local_is(true) {}
-    
+
     /// \brief Destructor
     ~LgfContents() {
@@ -2375 +2375 @@
 
   private:
-    
+
     LgfContents(const LgfContents&);
     LgfContents& operator=(const LgfContents&);
@@ -2392 +2392 @@
     }
 
-    /// \brief Returns the node section name at the given position. 
-    ///
-    /// Returns the node section name at the given position. 
+    /// \brief Returns the node section name at the given position.
+    ///
+    /// Returns the node section name at the given position.
     const std::string& nodeSection(int i) const {
       return _node_sections[i];
@@ -2408 +2408 @@
     /// @}
 
-    /// \name Arc/Edge sections 
+    /// \name Arc/Edge sections
     /// @{
 
@@ -2419 +2419 @@
     }
 
-    /// \brief Returns the arc/edge section name at the given position. 
-    ///
-    /// Returns the arc/edge section name at the given position. 
+    /// \brief Returns the arc/edge section name at the given position.
+    ///
+    /// Returns the arc/edge section name at the given position.
     /// \note It is synonym of \c edgeSection().
     const std::string& arcSection(int i) const {
@@ -2448 +2448 @@
     }
 
-    /// \brief Returns the section name at the given position. 
-    ///
-    /// Returns the section name at the given position. 
+    /// \brief Returns the section name at the given position.
+    ///
+    /// Returns the section name at the given position.
     /// \note It is synonym of \c arcSection().
     const std::string& edgeSection(int i) const {
@@ -2466 +2466 @@
     /// @}
 
-    /// \name Attribute sections   
+    /// \name Attribute sections
     /// @{
 
@@ -2476 +2476 @@
     }
 
-    /// \brief Returns the attribute section name at the given position. 
-    ///
-    /// Returns the attribute section name at the given position. 
+    /// \brief Returns the attribute section name at the given position.
+    ///
+    /// Returns the attribute section name at the given position.
     const std::string& attributeSectionNames(int i) const {
       return _attribute_sections[i];
@@ -2492 +2492 @@
     /// @}
 
-    /// \name Extra sections   
+    /// \name Extra sections
     /// @{
 
@@ -2502 +2502 @@
     }
 
-    /// \brief Returns the extra section type at the given position. 
-    ///
-    /// Returns the section type at the given position. 
+    /// \brief Returns the extra section type at the given position.
+    ///
+    /// Returns the section type at the given position.
     const std::string& extraSection(int i) const {
       return _extra_sections[i];
@@ -2516 +2516 @@
       std::string str;
       while(++line_num, std::getline(*_is, str)) {
-        line.clear(); line.str(str);
-        char c;
-        if (line >> std::ws >> c && c != '#') {
-          line.putback(c);
-          return true;
-        }
+        line.clear(); line.str(str);
+        char c;
+        if (line >> std::ws >> c && c != '#') {
+          line.putback(c);
+          return true;
+        }
       }
       return false;
@@ -2533 +2533 @@
       char c;
       while (readSuccess() && line >> c && c != '@') {
-        readLine();
+        readLine();
       }
       line.putback(c);
@@ -2541 +2541 @@
       char c;
       if (!readLine() || !(line >> c) || c == '@') {
-        if (readSuccess() && line) line.putback(c);
-        return;
+        if (readSuccess() && line) line.putback(c);
+        return;
       }
       line.putback(c);
       std::string map;
       while (_reader_bits::readToken(line, map)) {
-        maps.push_back(map);
+        maps.push_back(map);
       }
     }
@@ -2555 +2555 @@
       char c;
       while (readSuccess() && line >> c && c != '@') {
-        line.putback(c);
-        std::string attr;
-        _reader_bits::readToken(line, attr);
-        attrs.push_back(attr);
-        readLine();
+        line.putback(c);
+        std::string attr;
+        _reader_bits::readToken(line, attr);
+        attrs.push_back(attr);
+        readLine();
       }
       line.putback(c);
@@ -2566 +2566 @@
   public:
 
-    /// \name Execution of the contents reader    
+    /// \name Execution of the contents reader
     /// @{
 
@@ -2579 +2579 @@
       while (readSuccess()) {
 
-        char c;
-        line >> c;
-
-        std::string section, caption;
-        _reader_bits::readToken(line, section);
-        _reader_bits::readToken(line, caption);
-
-        if (section == "nodes") {
-          _node_sections.push_back(caption);
-          _node_maps.push_back(std::vector<std::string>());
-          readMaps(_node_maps.back());
-          readLine(); skipSection();
-        } else if (section == "arcs" || section == "edges") {
-          _edge_sections.push_back(caption);
-          _arc_sections.push_back(section == "arcs");
-          _edge_maps.push_back(std::vector<std::string>());
-          readMaps(_edge_maps.back());
-          readLine(); skipSection();
-        } else if (section == "attributes") {
-          _attribute_sections.push_back(caption);
-          _attributes.push_back(std::vector<std::string>());
-          readAttributes(_attributes.back());
-        } else {
-          _extra_sections.push_back(section);
-          readLine(); skipSection();
-        }
+        char c;
+        line >> c;
+
+        std::string section, caption;
+        _reader_bits::readToken(line, section);
+        _reader_bits::readToken(line, caption);
+
+        if (section == "nodes") {
+          _node_sections.push_back(caption);
+          _node_maps.push_back(std::vector<std::string>());
+          readMaps(_node_maps.back());
+          readLine(); skipSection();
+        } else if (section == "arcs" || section == "edges") {
+          _edge_sections.push_back(caption);
+          _arc_sections.push_back(section == "arcs");
+          _edge_maps.push_back(std::vector<std::string>());
+          readMaps(_edge_maps.back());
+          readLine(); skipSection();
+        } else if (section == "attributes") {
+          _attribute_sections.push_back(caption);
+          _attributes.push_back(std::vector<std::string>());
+          readAttributes(_attributes.back());
+        } else {
+          _extra_sections.push_back(section);
+          readLine(); skipSection();
+        }
       }
     }
 
     /// @}
-    
+
   };
 }

lemon/lgf_writer.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -44 +44 @@
     struct DefaultConverter {
       std::string operator()(const Value& value) {
-        std::ostringstream os;
-        os << value;
-        return os.str();
+        std::ostringstream os;
+        os << value;
+        return os.str();
       }
     };
@@ -63 +63 @@
     private:
       const Map& _map;
-      
+
     public:
       MapLess(const Map& map) : _map(map) {}
 
       bool operator()(const Item& left, const Item& right) {
-        return _map[left] < _map[right];
+        return _map[left] < _map[right];
       }
     };
@@ -82 +82 @@
       const Graph& _graph;
       const Map& _map;
-      
+
     public:
-      GraphArcMapLess(const Graph& graph, const Map& map) 
-        : _graph(graph), _map(map) {}
+      GraphArcMapLess(const Graph& graph, const Map& map)
+        : _graph(graph), _map(map) {}
 
       bool operator()(const Item& left, const Item& right) {
-        return _map[_graph.direct(left, _dir)] < 
-          _map[_graph.direct(right, _dir)];
+        return _map[_graph.direct(left, _dir)] <
+          _map[_graph.direct(right, _dir)];
       }
     };
 
-    template <typename _Item>    
+    template <typename _Item>
     class MapStorageBase {
     public:
@@ -106 +106 @@
     };
 
-    template <typename _Item, typename _Map, 
-              typename _Converter = DefaultConverter<typename _Map::Value> >
+    template <typename _Item, typename _Map,
+              typename _Converter = DefaultConverter<typename _Map::Value> >
     class MapStorage : public MapStorageBase<_Item> {
     public:
@@ -113 +113 @@
       typedef _Converter Converter;
       typedef _Item Item;
-      
+
     private:
       const Map& _map;
@@ -119 +119 @@
 
     public:
-      MapStorage(const Map& map, const Converter& converter = Converter()) 
-        : _map(map), _converter(converter) {}
+      MapStorage(const Map& map, const Converter& converter = Converter())
+        : _map(map), _converter(converter) {}
       virtual ~MapStorage() {}
 
       virtual std::string get(const Item& item) {
-        return _converter(_map[item]);
+        return _converter(_map[item]);
       }
       virtual void sort(std::vector<Item>& items) {
-        MapLess<Map> less(_map);
-        std::sort(items.begin(), items.end(), less);
+        MapLess<Map> less(_map);
+        std::sort(items.begin(), items.end(), less);
       }
     };
 
-    template <typename _Graph, bool _dir, typename _Map, 
-              typename _Converter = DefaultConverter<typename _Map::Value> >
+    template <typename _Graph, bool _dir, typename _Map,
+              typename _Converter = DefaultConverter<typename _Map::Value> >
     class GraphArcMapStorage : public MapStorageBase<typename _Graph::Edge> {
     public:
@@ -141 +141 @@
       typedef typename Graph::Edge Item;
       static const bool dir = _dir;
-      
+
     private:
       const Graph& _graph;
@@ -148 +148 @@
 
     public:
-      GraphArcMapStorage(const Graph& graph, const Map& map,  
-                         const Converter& converter = Converter()) 
-        : _graph(graph), _map(map), _converter(converter) {}
+      GraphArcMapStorage(const Graph& graph, const Map& map,
+                         const Converter& converter = Converter())
+        : _graph(graph), _map(map), _converter(converter) {}
       virtual ~GraphArcMapStorage() {}
 
       virtual std::string get(const Item& item) {
-        return _converter(_map[_graph.direct(item, dir)]);
+        return _converter(_map[_graph.direct(item, dir)]);
       }
       virtual void sort(std::vector<Item>& items) {
-        GraphArcMapLess<Graph, dir, Map> less(_graph, _map);
-        std::sort(items.begin(), items.end(), less);
+        GraphArcMapLess<Graph, dir, Map> less(_graph, _map);
+        std::sort(items.begin(), items.end(), less);
       }
     };
@@ -167 +167 @@
       virtual ~ValueStorageBase() {}
 
-      virtual std::string get() = 0;      
+      virtual std::string get() = 0;
     };
 
@@ -182 +182 @@
     public:
       ValueStorage(const Value& value, const Converter& converter = Converter())
-        : _value(value), _converter(converter) {}
+         : _value(value), _converter(converter) {}
 
       virtual std::string get() {
-        return _converter(_value);
+        return _converter(_value);
       }
     };
@@ -192 +192 @@
     struct MapLookUpConverter {
       const std::map<Value, std::string>& _map;
-      
-      MapLookUpConverter(const std::map<Value, std::string>& map) 
-        : _map(map) {}
-      
+
+      MapLookUpConverter(const std::map<Value, std::string>& map)
+        : _map(map) {}
+
       std::string operator()(const Value& str) {
-        typename std::map<Value, std::string>::const_iterator it = 
-          _map.find(str);
-        if (it == _map.end()) {
-          throw DataFormatError("Item not found");
-        }
-        return it->second;
+        typename std::map<Value, std::string>::const_iterator it =
+          _map.find(str);
+        if (it == _map.end()) {
+          throw DataFormatError("Item not found");
+        }
+        return it->second;
       }
     };
@@ -210 +210 @@
       const Graph& _graph;
       const std::map<typename Graph::Edge, std::string>& _map;
-      
-      GraphArcLookUpConverter(const Graph& graph, 
-                              const std::map<typename Graph::Edge, 
-                                             std::string>& map) 
-        : _graph(graph), _map(map) {}
-      
+
+      GraphArcLookUpConverter(const Graph& graph,
+                              const std::map<typename Graph::Edge,
+                                             std::string>& map)
+        : _graph(graph), _map(map) {}
+
       std::string operator()(const typename Graph::Arc& val) {
-        typename std::map<typename Graph::Edge, std::string>
-          ::const_iterator it = _map.find(val);
-        if (it == _map.end()) {
-          throw DataFormatError("Item not found");
-        }
-        return (_graph.direction(val) ? '+' : '-') + it->second;
+        typename std::map<typename Graph::Edge, std::string>
+          ::const_iterator it = _map.find(val);
+        if (it == _map.end()) {
+          throw DataFormatError("Item not found");
+        }
+        return (_graph.direction(val) ? '+' : '-') + it->second;
       }
     };
 
     inline bool isWhiteSpace(char c) {
-      return c == ' ' || c == '\t' || c == '\v' || 
-        c == '\n' || c == '\r' || c == '\f'; 
+      return c == ' ' || c == '\t' || c == '\v' ||
+        c == '\n' || c == '\r' || c == '\f';
     }
 
     inline bool isEscaped(char c) {
-      return c == '\\' || c == '\"' || c == '\'' || 
-        c == '\a' || c == '\b';
+      return c == '\\' || c == '\"' || c == '\'' ||
+        c == '\a' || c == '\b';
     }
 
@@ -239 +239 @@
       switch (c) {
       case '\\':
-        os << "\\\\";
-        return;
+        os << "\\\\";
+        return;
       case '\"':
-        os << "\\\"";
-        return;
+        os << "\\\"";
+        return;
       case '\a':
-        os << "\\a";
-        return;
+        os << "\\a";
+        return;
       case '\b':
-        os << "\\b";
-        return;
+        os << "\\b";
+        return;
       case '\f':
-        os << "\\f";
-        return;
+        os << "\\f";
+        return;
       case '\r':
-        os << "\\r";
-        return;
+        os << "\\r";
+        return;
       case '\n':
-        os << "\\n";
-        return;
+        os << "\\n";
+        return;
       case '\t':
-        os << "\\t";
-        return;
+        os << "\\t";
+        return;
       case '\v':
-        os << "\\v";
-        return;
+        os << "\\v";
+        return;
       default:
-        if (c < 0x20) {
-          std::ios::fmtflags flags = os.flags();
-          os << '\\' << std::oct << static_cast<int>(c);
-          os.flags(flags);
-        } else {
-          os << c;
-        }
-        return;
-      }     
+        if (c < 0x20) {
+          std::ios::fmtflags flags = os.flags();
+          os << '\\' << std::oct << static_cast<int>(c);
+          os.flags(flags);
+        } else {
+          os << c;
+        }
+        return;
+      }
     }
 
@@ -282 +282 @@
       char c;
       while (is.get(c)) {
-        if (isWhiteSpace(c) || isEscaped(c)) {
-          return true;
-        }
+        if (isWhiteSpace(c) || isEscaped(c)) {
+          return true;
+        }
       }
       return false;
     }
-    
+
     inline std::ostream& writeToken(std::ostream& os, const std::string& str) {
 
       if (requireEscape(str)) {
-        os << '\"';
-        for (std::string::const_iterator it = str.begin(); 
-             it != str.end(); ++it) {
-          writeEscape(os, *it);
-        }       
-        os << '\"';
+        os << '\"';
+        for (std::string::const_iterator it = str.begin();
+             it != str.end(); ++it) {
+          writeEscape(os, *it);
+        }
+        os << '\"';
       } else {
-        os << str;
+        os << str;
       }
       return os;
@@ -310 +310 @@
 
   template <typename Digraph>
-  DigraphWriter<Digraph> digraphWriter(std::ostream& os, 
-                                       const Digraph& digraph);
+  DigraphWriter<Digraph> digraphWriter(std::ostream& os,
+                                       const Digraph& digraph);
 
   template <typename Digraph>
-  DigraphWriter<Digraph> digraphWriter(const std::string& fn, 
-                                       const Digraph& digraph);
+  DigraphWriter<Digraph> digraphWriter(const std::string& fn,
+                                       const Digraph& digraph);
 
   template <typename Digraph>
-  DigraphWriter<Digraph> digraphWriter(const char *fn, 
-                                       const Digraph& digraph);
-  
+  DigraphWriter<Digraph> digraphWriter(const char *fn,
+                                       const Digraph& digraph);
+
   /// \ingroup lemon_io
-  ///  
+  ///
   /// \brief \ref lgf-format "LGF" writer for directed graphs
   ///
@@ -371 +371 @@
     typedef _Digraph Digraph;
     TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
-    
+
   private:
 
@@ -383 +383 @@
     std::string _arcs_caption;
     std::string _attributes_caption;
-    
+
     typedef std::map<Node, std::string> NodeIndex;
     NodeIndex _node_index;
@@ -389 +389 @@
     ArcIndex _arc_index;
 
-    typedef std::vector<std::pair<std::string, 
-      _writer_bits::MapStorageBase<Node>* > > NodeMaps;    
-    NodeMaps _node_maps; 
-
-    typedef std::vector<std::pair<std::string, 
+    typedef std::vector<std::pair<std::string,
+      _writer_bits::MapStorageBase<Node>* > > NodeMaps;
+    NodeMaps _node_maps;
+
+    typedef std::vector<std::pair<std::string,
       _writer_bits::MapStorageBase<Arc>* > >ArcMaps;
     ArcMaps _arc_maps;
 
-    typedef std::vector<std::pair<std::string, 
+    typedef std::vector<std::pair<std::string,
       _writer_bits::ValueStorageBase*> > Attributes;
     Attributes _attributes;
@@ -410 +410 @@
     /// Construct a directed graph writer, which writes to the given
     /// output stream.
-    DigraphWriter(std::ostream& is, const Digraph& digraph) 
+    DigraphWriter(std::ostream& is, const Digraph& digraph)
       : _os(&is), local_os(false), _digraph(digraph),
-        _skip_nodes(false), _skip_arcs(false) {}
+        _skip_nodes(false), _skip_arcs(false) {}
 
     /// \brief Constructor
@@ -418 +418 @@
     /// Construct a directed graph writer, which writes to the given
     /// output file.
-    DigraphWriter(const std::string& fn, const Digraph& digraph) 
+    DigraphWriter(const std::string& fn, const Digraph& digraph)
       : _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph),
-        _skip_nodes(false), _skip_arcs(false) {}
+        _skip_nodes(false), _skip_arcs(false) {}
 
     /// \brief Constructor
@@ -426 +426 @@
     /// Construct a directed graph writer, which writes to the given
     /// output file.
-    DigraphWriter(const char* fn, const Digraph& digraph) 
+    DigraphWriter(const char* fn, const Digraph& digraph)
       : _os(new std::ofstream(fn)), local_os(true), _digraph(digraph),
-        _skip_nodes(false), _skip_arcs(false) {}
+        _skip_nodes(false), _skip_arcs(false) {}
 
     /// \brief Destructor
     ~DigraphWriter() {
-      for (typename NodeMaps::iterator it = _node_maps.begin(); 
-           it != _node_maps.end(); ++it) {
-        delete it->second;
-      }
-
-      for (typename ArcMaps::iterator it = _arc_maps.begin(); 
-           it != _arc_maps.end(); ++it) {
-        delete it->second;
-      }
-
-      for (typename Attributes::iterator it = _attributes.begin(); 
-           it != _attributes.end(); ++it) {
-        delete it->second;
+      for (typename NodeMaps::iterator it = _node_maps.begin();
+           it != _node_maps.end(); ++it) {
+        delete it->second;
+      }
+
+      for (typename ArcMaps::iterator it = _arc_maps.begin();
+           it != _arc_maps.end(); ++it) {
+        delete it->second;
+      }
+
+      for (typename Attributes::iterator it = _attributes.begin();
+           it != _attributes.end(); ++it) {
+        delete it->second;
       }
 
       if (local_os) {
-        delete _os;
+        delete _os;
       }
     }
@@ -454 +454 @@
   private:
 
-    friend DigraphWriter<Digraph> digraphWriter<>(std::ostream& os, 
-                                                  const Digraph& digraph);
-    friend DigraphWriter<Digraph> digraphWriter<>(const std::string& fn, 
-                                                  const Digraph& digraph);   
-    friend DigraphWriter<Digraph> digraphWriter<>(const char *fn, 
-                                                  const Digraph& digraph);
-
-    DigraphWriter(DigraphWriter& other) 
+    friend DigraphWriter<Digraph> digraphWriter<>(std::ostream& os,
+                                                  const Digraph& digraph);
+    friend DigraphWriter<Digraph> digraphWriter<>(const std::string& fn,
+                                                  const Digraph& digraph);
+    friend DigraphWriter<Digraph> digraphWriter<>(const char *fn,
+                                                  const Digraph& digraph);
+
+    DigraphWriter(DigraphWriter& other)
       : _os(other._os), local_os(other.local_os), _digraph(other._digraph),
-        _skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
+        _skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
 
       other._os = 0;
@@ -479 +479 @@
       _attributes_caption = other._attributes_caption;
     }
-    
+
     DigraphWriter& operator=(const DigraphWriter&);
 
@@ -486 +486 @@
     /// \name Writing rules
     /// @{
-    
+
     /// \brief Node map writing rule
     ///
@@ -493 +493 @@
     DigraphWriter& nodeMap(const std::string& caption, const Map& map) {
       checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
-      _writer_bits::MapStorageBase<Node>* storage = 
-        new _writer_bits::MapStorage<Node, Map>(map);
+      _writer_bits::MapStorageBase<Node>* storage =
+        new _writer_bits::MapStorage<Node, Map>(map);
       _node_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -504 +504 @@
     /// writer.
     template <typename Map, typename Converter>
-    DigraphWriter& nodeMap(const std::string& caption, const Map& map, 
-                           const Converter& converter = Converter()) {
+    DigraphWriter& nodeMap(const std::string& caption, const Map& map,
+                           const Converter& converter = Converter()) {
       checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
-      _writer_bits::MapStorageBase<Node>* storage = 
-        new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
+      _writer_bits::MapStorageBase<Node>* storage =
+        new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
       _node_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -519 +519 @@
     DigraphWriter& arcMap(const std::string& caption, const Map& map) {
       checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
-      _writer_bits::MapStorageBase<Arc>* storage = 
-        new _writer_bits::MapStorage<Arc, Map>(map);
+      _writer_bits::MapStorageBase<Arc>* storage =
+        new _writer_bits::MapStorage<Arc, Map>(map);
       _arc_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -530 +530 @@
     /// writer.
     template <typename Map, typename Converter>
-    DigraphWriter& arcMap(const std::string& caption, const Map& map, 
-                          const Converter& converter = Converter()) {
+    DigraphWriter& arcMap(const std::string& caption, const Map& map,
+                          const Converter& converter = Converter()) {
       checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
-      _writer_bits::MapStorageBase<Arc>* storage = 
-        new _writer_bits::MapStorage<Arc, Map, Converter>(map, converter);
+      _writer_bits::MapStorageBase<Arc>* storage =
+        new _writer_bits::MapStorage<Arc, Map, Converter>(map, converter);
       _arc_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -544 +544 @@
     template <typename Value>
     DigraphWriter& attribute(const std::string& caption, const Value& value) {
-      _writer_bits::ValueStorageBase* storage = 
-        new _writer_bits::ValueStorage<Value>(value);
+      _writer_bits::ValueStorageBase* storage =
+        new _writer_bits::ValueStorage<Value>(value);
       _attributes.push_back(std::make_pair(caption, storage));
       return *this;
@@ -555 +555 @@
     /// writer.
     template <typename Value, typename Converter>
-    DigraphWriter& attribute(const std::string& caption, const Value& value, 
-                             const Converter& converter = Converter()) {
-      _writer_bits::ValueStorageBase* storage = 
-        new _writer_bits::ValueStorage<Value, Converter>(value, converter);
+    DigraphWriter& attribute(const std::string& caption, const Value& value,
+                             const Converter& converter = Converter()) {
+      _writer_bits::ValueStorageBase* storage =
+        new _writer_bits::ValueStorage<Value, Converter>(value, converter);
       _attributes.push_back(std::make_pair(caption, storage));
       return *this;
@@ -569 +569 @@
       typedef _writer_bits::MapLookUpConverter<Node> Converter;
       Converter converter(_node_index);
-      _writer_bits::ValueStorageBase* storage = 
-        new _writer_bits::ValueStorage<Node, Converter>(node, converter);
+      _writer_bits::ValueStorageBase* storage =
+        new _writer_bits::ValueStorage<Node, Converter>(node, converter);
       _attributes.push_back(std::make_pair(caption, storage));
       return *this;
@@ -581 +581 @@
       typedef _writer_bits::MapLookUpConverter<Arc> Converter;
       Converter converter(_arc_index);
-      _writer_bits::ValueStorageBase* storage = 
-        new _writer_bits::ValueStorage<Arc, Converter>(arc, converter);
+      _writer_bits::ValueStorageBase* storage =
+        new _writer_bits::ValueStorage<Arc, Converter>(arc, converter);
       _attributes.push_back(std::make_pair(caption, storage));
       return *this;
@@ -642 +642 @@
       _writer_bits::MapStorageBase<Node>* label = 0;
       for (typename NodeMaps::iterator it = _node_maps.begin();
-           it != _node_maps.end(); ++it) {
+           it != _node_maps.end(); ++it) {
         if (it->first == "label") {
-          label = it->second;
-          break;
-        }
+          label = it->second;
+          break;
+        }
       }
 
       *_os << "@nodes";
       if (!_nodes_caption.empty()) {
-        _writer_bits::writeToken(*_os << ' ', _nodes_caption);
+        _writer_bits::writeToken(*_os << ' ', _nodes_caption);
       }
       *_os << std::endl;
 
       if (label == 0) {
-        *_os << "label" << '\t';
+        *_os << "label" << '\t';
       }
       for (typename NodeMaps::iterator it = _node_maps.begin();
-           it != _node_maps.end(); ++it) {
-        _writer_bits::writeToken(*_os, it->first) << '\t';
+           it != _node_maps.end(); ++it) {
+        _writer_bits::writeToken(*_os, it->first) << '\t';
       }
       *_os << std::endl;
@@ -666 +666 @@
       std::vector<Node> nodes;
       for (NodeIt n(_digraph); n != INVALID; ++n) {
-        nodes.push_back(n);
-      }
-      
+        nodes.push_back(n);
+      }
+
       if (label == 0) {
-        IdMap<Digraph, Node> id_map(_digraph);
-        _writer_bits::MapLess<IdMap<Digraph, Node> > id_less(id_map);
-        std::sort(nodes.begin(), nodes.end(), id_less);
+        IdMap<Digraph, Node> id_map(_digraph);
+        _writer_bits::MapLess<IdMap<Digraph, Node> > id_less(id_map);
+        std::sort(nodes.begin(), nodes.end(), id_less);
       } else {
-        label->sort(nodes);
+        label->sort(nodes);
       }
 
       for (int i = 0; i < static_cast<int>(nodes.size()); ++i) {
-        Node n = nodes[i];
-        if (label == 0) {
-          std::ostringstream os;
-          os << _digraph.id(n);
-          _writer_bits::writeToken(*_os, os.str());
-          *_os << '\t';
-          _node_index.insert(std::make_pair(n, os.str()));
-        }
-        for (typename NodeMaps::iterator it = _node_maps.begin();
-             it != _node_maps.end(); ++it) {
-          std::string value = it->second->get(n);
-          _writer_bits::writeToken(*_os, value);
-          if (it->first == "label") {
-            _node_index.insert(std::make_pair(n, value));
-          }
-          *_os << '\t';
-        }
-        *_os << std::endl;
+        Node n = nodes[i];
+        if (label == 0) {
+          std::ostringstream os;
+          os << _digraph.id(n);
+          _writer_bits::writeToken(*_os, os.str());
+          *_os << '\t';
+          _node_index.insert(std::make_pair(n, os.str()));
+        }
+        for (typename NodeMaps::iterator it = _node_maps.begin();
+             it != _node_maps.end(); ++it) {
+          std::string value = it->second->get(n);
+          _writer_bits::writeToken(*_os, value);
+          if (it->first == "label") {
+            _node_index.insert(std::make_pair(n, value));
+          }
+          *_os << '\t';
+        }
+        *_os << std::endl;
       }
     }
@@ -702 +702 @@
       _writer_bits::MapStorageBase<Node>* label = 0;
       for (typename NodeMaps::iterator it = _node_maps.begin();
-           it != _node_maps.end(); ++it) {
+           it != _node_maps.end(); ++it) {
         if (it->first == "label") {
-          label = it->second;
-          break;
-        }
+          label = it->second;
+          break;
+        }
       }
 
       if (label == 0) {
-        for (NodeIt n(_digraph); n != INVALID; ++n) {
-          std::ostringstream os;
-          os << _digraph.id(n);
-          _node_index.insert(std::make_pair(n, os.str()));        
-        }       
+        for (NodeIt n(_digraph); n != INVALID; ++n) {
+          std::ostringstream os;
+          os << _digraph.id(n);
+          _node_index.insert(std::make_pair(n, os.str()));
+        }
       } else {
-        for (NodeIt n(_digraph); n != INVALID; ++n) {
-          std::string value = label->get(n);      
-          _node_index.insert(std::make_pair(n, value));
-        }
+        for (NodeIt n(_digraph); n != INVALID; ++n) {
+          std::string value = label->get(n);
+          _node_index.insert(std::make_pair(n, value));
+        }
       }
     }
@@ -726 +726 @@
       _writer_bits::MapStorageBase<Arc>* label = 0;
       for (typename ArcMaps::iterator it = _arc_maps.begin();
-           it != _arc_maps.end(); ++it) {
+           it != _arc_maps.end(); ++it) {
         if (it->first == "label") {
-          label = it->second;
-          break;
-        }
+          label = it->second;
+          break;
+        }
       }
 
       *_os << "@arcs";
       if (!_arcs_caption.empty()) {
-        _writer_bits::writeToken(*_os << ' ', _arcs_caption);
+        _writer_bits::writeToken(*_os << ' ', _arcs_caption);
       }
       *_os << std::endl;
@@ -741 +741 @@
       *_os << '\t' << '\t';
       if (label == 0) {
-        *_os << "label" << '\t';
+        *_os << "label" << '\t';
       }
       for (typename ArcMaps::iterator it = _arc_maps.begin();
-           it != _arc_maps.end(); ++it) {
-        _writer_bits::writeToken(*_os, it->first) << '\t';
+           it != _arc_maps.end(); ++it) {
+        _writer_bits::writeToken(*_os, it->first) << '\t';
       }
       *_os << std::endl;
@@ -751 +751 @@
       std::vector<Arc> arcs;
       for (ArcIt n(_digraph); n != INVALID; ++n) {
-        arcs.push_back(n);
-      }
-      
+        arcs.push_back(n);
+      }
+
       if (label == 0) {
-        IdMap<Digraph, Arc> id_map(_digraph);
-        _writer_bits::MapLess<IdMap<Digraph, Arc> > id_less(id_map);
-        std::sort(arcs.begin(), arcs.end(), id_less);
+        IdMap<Digraph, Arc> id_map(_digraph);
+        _writer_bits::MapLess<IdMap<Digraph, Arc> > id_less(id_map);
+        std::sort(arcs.begin(), arcs.end(), id_less);
       } else {
-        label->sort(arcs);
+        label->sort(arcs);
       }
 
       for (int i = 0; i < static_cast<int>(arcs.size()); ++i) {
-        Arc a = arcs[i];
-        _writer_bits::writeToken(*_os, _node_index.
-                                 find(_digraph.source(a))->second);
-        *_os << '\t';
-        _writer_bits::writeToken(*_os, _node_index.
-                                 find(_digraph.target(a))->second);
-        *_os << '\t';
-        if (label == 0) {
-          std::ostringstream os;
-          os << _digraph.id(a);
-          _writer_bits::writeToken(*_os, os.str());
-          *_os << '\t';
-          _arc_index.insert(std::make_pair(a, os.str()));
-        }
-        for (typename ArcMaps::iterator it = _arc_maps.begin();
-             it != _arc_maps.end(); ++it) {
-          std::string value = it->second->get(a);
-          _writer_bits::writeToken(*_os, value);
-          if (it->first == "label") {
-            _arc_index.insert(std::make_pair(a, value));
-          }
-          *_os << '\t';
-        }
-        *_os << std::endl;
+        Arc a = arcs[i];
+        _writer_bits::writeToken(*_os, _node_index.
+                                 find(_digraph.source(a))->second);
+        *_os << '\t';
+        _writer_bits::writeToken(*_os, _node_index.
+                                 find(_digraph.target(a))->second);
+        *_os << '\t';
+        if (label == 0) {
+          std::ostringstream os;
+          os << _digraph.id(a);
+          _writer_bits::writeToken(*_os, os.str());
+          *_os << '\t';
+          _arc_index.insert(std::make_pair(a, os.str()));
+        }
+        for (typename ArcMaps::iterator it = _arc_maps.begin();
+             it != _arc_maps.end(); ++it) {
+          std::string value = it->second->get(a);
+          _writer_bits::writeToken(*_os, value);
+          if (it->first == "label") {
+            _arc_index.insert(std::make_pair(a, value));
+          }
+          *_os << '\t';
+        }
+        *_os << std::endl;
       }
     }
@@ -793 +793 @@
       _writer_bits::MapStorageBase<Arc>* label = 0;
       for (typename ArcMaps::iterator it = _arc_maps.begin();
-           it != _arc_maps.end(); ++it) {
+           it != _arc_maps.end(); ++it) {
         if (it->first == "label") {
-          label = it->second;
-          break;
-        }
+          label = it->second;
+          break;
+        }
       }
 
       if (label == 0) {
-        for (ArcIt a(_digraph); a != INVALID; ++a) {
-          std::ostringstream os;
-          os << _digraph.id(a);
-          _arc_index.insert(std::make_pair(a, os.str()));         
-        }       
+        for (ArcIt a(_digraph); a != INVALID; ++a) {
+          std::ostringstream os;
+          os << _digraph.id(a);
+          _arc_index.insert(std::make_pair(a, os.str()));
+        }
       } else {
-        for (ArcIt a(_digraph); a != INVALID; ++a) {
-          std::string value = label->get(a);      
-          _arc_index.insert(std::make_pair(a, value));
-        }
+        for (ArcIt a(_digraph); a != INVALID; ++a) {
+          std::string value = label->get(a);
+          _arc_index.insert(std::make_pair(a, value));
+        }
       }
     }
@@ -818 +818 @@
       *_os << "@attributes";
       if (!_attributes_caption.empty()) {
-        _writer_bits::writeToken(*_os << ' ', _attributes_caption);
+        _writer_bits::writeToken(*_os << ' ', _attributes_caption);
       }
       *_os << std::endl;
       for (typename Attributes::iterator it = _attributes.begin();
-           it != _attributes.end(); ++it) {
-        _writer_bits::writeToken(*_os, it->first) << ' ';
-        _writer_bits::writeToken(*_os, it->second->get());
-        *_os << std::endl;
-      }
-    }
-    
+           it != _attributes.end(); ++it) {
+        _writer_bits::writeToken(*_os, it->first) << ' ';
+        _writer_bits::writeToken(*_os, it->second->get());
+        *_os << std::endl;
+      }
+    }
+
   public:
-    
-    /// \name Execution of the writer    
+
+    /// \name Execution of the writer
     /// @{
 
@@ -839 +839 @@
     void run() {
       if (!_skip_nodes) {
-        writeNodes();
+        writeNodes();
       } else {
-        createNodeIndex();
-      }
-      if (!_skip_arcs) {      
-        writeArcs();
+        createNodeIndex();
+      }
+      if (!_skip_arcs) {
+        writeArcs();
       } else {
-        createArcIndex();
+        createArcIndex();
       }
       writeAttributes();
@@ -862 +862 @@
 
   /// \brief Return a \ref DigraphWriter class
-  /// 
+  ///
   /// This function just returns a \ref DigraphWriter class.
   /// \relates DigraphWriter
   template <typename Digraph>
-  DigraphWriter<Digraph> digraphWriter(std::ostream& os, 
-                                       const Digraph& digraph) {
+  DigraphWriter<Digraph> digraphWriter(std::ostream& os,
+                                       const Digraph& digraph) {
     DigraphWriter<Digraph> tmp(os, digraph);
     return tmp;
@@ -873 +873 @@
 
   /// \brief Return a \ref DigraphWriter class
-  /// 
+  ///
   /// This function just returns a \ref DigraphWriter class.
   /// \relates DigraphWriter
   template <typename Digraph>
-  DigraphWriter<Digraph> digraphWriter(const std::string& fn, 
-                                       const Digraph& digraph) {
+  DigraphWriter<Digraph> digraphWriter(const std::string& fn,
+                                       const Digraph& digraph) {
     DigraphWriter<Digraph> tmp(fn, digraph);
     return tmp;
@@ -884 +884 @@
 
   /// \brief Return a \ref DigraphWriter class
-  /// 
+  ///
   /// This function just returns a \ref DigraphWriter class.
   /// \relates DigraphWriter
   template <typename Digraph>
-  DigraphWriter<Digraph> digraphWriter(const char* fn, 
-                                       const Digraph& digraph) {
+  DigraphWriter<Digraph> digraphWriter(const char* fn,
+                                       const Digraph& digraph) {
     DigraphWriter<Digraph> tmp(fn, digraph);
     return tmp;
@@ -898 +898 @@
 
   template <typename Graph>
-  GraphWriter<Graph> graphWriter(std::ostream& os, const Graph& graph);    
+  GraphWriter<Graph> graphWriter(std::ostream& os, const Graph& graph);
 
   template <typename Graph>
-  GraphWriter<Graph> graphWriter(const std::string& fn, const Graph& graph);   
+  GraphWriter<Graph> graphWriter(const std::string& fn, const Graph& graph);
 
   template <typename Graph>
-  GraphWriter<Graph> graphWriter(const char *fn, const Graph& graph);    
+  GraphWriter<Graph> graphWriter(const char *fn, const Graph& graph);
 
   /// \ingroup lemon_io
-  ///  
+  ///
   /// \brief \ref lgf-format "LGF" writer for directed graphs
   ///
@@ -927 +927 @@
     typedef _Graph Graph;
     TEMPLATE_GRAPH_TYPEDEFS(Graph);
-    
+
   private:
 
@@ -939 +939 @@
     std::string _edges_caption;
     std::string _attributes_caption;
-    
+
     typedef std::map<Node, std::string> NodeIndex;
     NodeIndex _node_index;
@@ -945 +945 @@
     EdgeIndex _edge_index;
 
-    typedef std::vector<std::pair<std::string, 
-      _writer_bits::MapStorageBase<Node>* > > NodeMaps;    
-    NodeMaps _node_maps; 
-
-    typedef std::vector<std::pair<std::string, 
+    typedef std::vector<std::pair<std::string,
+      _writer_bits::MapStorageBase<Node>* > > NodeMaps;
+    NodeMaps _node_maps;
+
+    typedef std::vector<std::pair<std::string,
       _writer_bits::MapStorageBase<Edge>* > >EdgeMaps;
     EdgeMaps _edge_maps;
 
-    typedef std::vector<std::pair<std::string, 
+    typedef std::vector<std::pair<std::string,
       _writer_bits::ValueStorageBase*> > Attributes;
     Attributes _attributes;
@@ -966 +966 @@
     /// Construct a directed graph writer, which writes to the given
     /// output stream.
-    GraphWriter(std::ostream& is, const Graph& graph) 
+    GraphWriter(std::ostream& is, const Graph& graph)
       : _os(&is), local_os(false), _graph(graph),
-        _skip_nodes(false), _skip_edges(false) {}
+        _skip_nodes(false), _skip_edges(false) {}
 
     /// \brief Constructor
@@ -974 +974 @@
     /// Construct a directed graph writer, which writes to the given
     /// output file.
-    GraphWriter(const std::string& fn, const Graph& graph) 
+    GraphWriter(const std::string& fn, const Graph& graph)
       : _os(new std::ofstream(fn.c_str())), local_os(true), _graph(graph),
-        _skip_nodes(false), _skip_edges(false) {}
+        _skip_nodes(false), _skip_edges(false) {}
 
     /// \brief Constructor
@@ -982 +982 @@
     /// Construct a directed graph writer, which writes to the given
     /// output file.
-    GraphWriter(const char* fn, const Graph& graph) 
+    GraphWriter(const char* fn, const Graph& graph)
       : _os(new std::ofstream(fn)), local_os(true), _graph(graph),
-        _skip_nodes(false), _skip_edges(false) {}
+        _skip_nodes(false), _skip_edges(false) {}
 
     /// \brief Destructor
     ~GraphWriter() {
-      for (typename NodeMaps::iterator it = _node_maps.begin(); 
-           it != _node_maps.end(); ++it) {
-        delete it->second;
-      }
-
-      for (typename EdgeMaps::iterator it = _edge_maps.begin(); 
-           it != _edge_maps.end(); ++it) {
-        delete it->second;
-      }
-
-      for (typename Attributes::iterator it = _attributes.begin(); 
-           it != _attributes.end(); ++it) {
-        delete it->second;
+      for (typename NodeMaps::iterator it = _node_maps.begin();
+           it != _node_maps.end(); ++it) {
+        delete it->second;
+      }
+
+      for (typename EdgeMaps::iterator it = _edge_maps.begin();
+           it != _edge_maps.end(); ++it) {
+        delete it->second;
+      }
+
+      for (typename Attributes::iterator it = _attributes.begin();
+           it != _attributes.end(); ++it) {
+        delete it->second;
       }
 
       if (local_os) {
-        delete _os;
-      }
-    }
-    
+        delete _os;
+      }
+    }
+
   private:
 
-    friend GraphWriter<Graph> graphWriter<>(std::ostream& os, 
-                                            const Graph& graph);    
-    friend GraphWriter<Graph> graphWriter<>(const std::string& fn, 
-                                            const Graph& graph);   
-    friend GraphWriter<Graph> graphWriter<>(const char *fn, 
-                                            const Graph& graph);    
-
-    GraphWriter(GraphWriter& other) 
+    friend GraphWriter<Graph> graphWriter<>(std::ostream& os,
+                                            const Graph& graph);
+    friend GraphWriter<Graph> graphWriter<>(const std::string& fn,
+                                            const Graph& graph);
+    friend GraphWriter<Graph> graphWriter<>(const char *fn,
+                                            const Graph& graph);
+
+    GraphWriter(GraphWriter& other)
       : _os(other._os), local_os(other.local_os), _graph(other._graph),
-        _skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) {
+        _skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) {
 
       other._os = 0;
@@ -1042 +1042 @@
     /// \name Writing rules
     /// @{
-    
+
     /// \brief Node map writing rule
     ///
@@ -1049 +1049 @@
     GraphWriter& nodeMap(const std::string& caption, const Map& map) {
       checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
-      _writer_bits::MapStorageBase<Node>* storage = 
-        new _writer_bits::MapStorage<Node, Map>(map);
+      _writer_bits::MapStorageBase<Node>* storage =
+        new _writer_bits::MapStorage<Node, Map>(map);
       _node_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1060 +1060 @@
     /// writer.
     template <typename Map, typename Converter>
-    GraphWriter& nodeMap(const std::string& caption, const Map& map, 
-                           const Converter& converter = Converter()) {
+    GraphWriter& nodeMap(const std::string& caption, const Map& map,
+                           const Converter& converter = Converter()) {
       checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
-      _writer_bits::MapStorageBase<Node>* storage = 
-        new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
+      _writer_bits::MapStorageBase<Node>* storage =
+        new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
       _node_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1075 +1075 @@
     GraphWriter& edgeMap(const std::string& caption, const Map& map) {
       checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
-      _writer_bits::MapStorageBase<Edge>* storage = 
-        new _writer_bits::MapStorage<Edge, Map>(map);
+      _writer_bits::MapStorageBase<Edge>* storage =
+        new _writer_bits::MapStorage<Edge, Map>(map);
       _edge_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1086 +1086 @@
     /// writer.
     template <typename Map, typename Converter>
-    GraphWriter& edgeMap(const std::string& caption, const Map& map, 
-                          const Converter& converter = Converter()) {
+    GraphWriter& edgeMap(const std::string& caption, const Map& map,
+                          const Converter& converter = Converter()) {
       checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
-      _writer_bits::MapStorageBase<Edge>* storage = 
-        new _writer_bits::MapStorage<Edge, Map, Converter>(map, converter);
+      _writer_bits::MapStorageBase<Edge>* storage =
+        new _writer_bits::MapStorage<Edge, Map, Converter>(map, converter);
       _edge_maps.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1101 +1101 @@
     GraphWriter& arcMap(const std::string& caption, const Map& map) {
       checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
-      _writer_bits::MapStorageBase<Edge>* forward_storage = 
-        new _writer_bits::GraphArcMapStorage<Graph, true, Map>(_graph, map);
+      _writer_bits::MapStorageBase<Edge>* forward_storage =
+        new _writer_bits::GraphArcMapStorage<Graph, true, Map>(_graph, map);
       _edge_maps.push_back(std::make_pair('+' + caption, forward_storage));
-      _writer_bits::MapStorageBase<Edge>* backward_storage = 
-        new _writer_bits::GraphArcMapStorage<Graph, false, Map>(_graph, map);
+      _writer_bits::MapStorageBase<Edge>* backward_storage =
+        new _writer_bits::GraphArcMapStorage<Graph, false, Map>(_graph, map);
       _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
       return *this;
@@ -1115 +1115 @@
     /// writer.
     template <typename Map, typename Converter>
-    GraphWriter& arcMap(const std::string& caption, const Map& map, 
-                          const Converter& converter = Converter()) {
+    GraphWriter& arcMap(const std::string& caption, const Map& map,
+                          const Converter& converter = Converter()) {
       checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
-      _writer_bits::MapStorageBase<Edge>* forward_storage = 
-        new _writer_bits::GraphArcMapStorage<Graph, true, Map, Converter>
-        (_graph, map, converter);
+      _writer_bits::MapStorageBase<Edge>* forward_storage =
+        new _writer_bits::GraphArcMapStorage<Graph, true, Map, Converter>
+        (_graph, map, converter);
       _edge_maps.push_back(std::make_pair('+' + caption, forward_storage));
-      _writer_bits::MapStorageBase<Edge>* backward_storage = 
-        new _writer_bits::GraphArcMapStorage<Graph, false, Map, Converter>
-        (_graph, map, converter);
+      _writer_bits::MapStorageBase<Edge>* backward_storage =
+        new _writer_bits::GraphArcMapStorage<Graph, false, Map, Converter>
+        (_graph, map, converter);
       _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
       return *this;
@@ -1134 +1134 @@
     template <typename Value>
     GraphWriter& attribute(const std::string& caption, const Value& value) {
-      _writer_bits::ValueStorageBase* storage = 
-        new _writer_bits::ValueStorage<Value>(value);
+      _writer_bits::ValueStorageBase* storage =
+        new _writer_bits::ValueStorage<Value>(value);
       _attributes.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1145 +1145 @@
     /// writer.
     template <typename Value, typename Converter>
-    GraphWriter& attribute(const std::string& caption, const Value& value, 
-                             const Converter& converter = Converter()) {
-      _writer_bits::ValueStorageBase* storage = 
-        new _writer_bits::ValueStorage<Value, Converter>(value, converter);
+    GraphWriter& attribute(const std::string& caption, const Value& value,
+                             const Converter& converter = Converter()) {
+      _writer_bits::ValueStorageBase* storage =
+        new _writer_bits::ValueStorage<Value, Converter>(value, converter);
       _attributes.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1159 +1159 @@
       typedef _writer_bits::MapLookUpConverter<Node> Converter;
       Converter converter(_node_index);
-      _writer_bits::ValueStorageBase* storage = 
-        new _writer_bits::ValueStorage<Node, Converter>(node, converter);
+      _writer_bits::ValueStorageBase* storage =
+        new _writer_bits::ValueStorage<Node, Converter>(node, converter);
       _attributes.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1171 +1171 @@
       typedef _writer_bits::MapLookUpConverter<Edge> Converter;
       Converter converter(_edge_index);
-      _writer_bits::ValueStorageBase* storage = 
-        new _writer_bits::ValueStorage<Edge, Converter>(edge, converter);
+      _writer_bits::ValueStorageBase* storage =
+        new _writer_bits::ValueStorage<Edge, Converter>(edge, converter);
       _attributes.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1183 +1183 @@
       typedef _writer_bits::GraphArcLookUpConverter<Graph> Converter;
       Converter converter(_graph, _edge_index);
-      _writer_bits::ValueStorageBase* storage = 
-        new _writer_bits::ValueStorage<Arc, Converter>(arc, converter);
+      _writer_bits::ValueStorageBase* storage =
+        new _writer_bits::ValueStorage<Arc, Converter>(arc, converter);
       _attributes.push_back(std::make_pair(caption, storage));
       return *this;
@@ -1244 +1244 @@
       _writer_bits::MapStorageBase<Node>* label = 0;
       for (typename NodeMaps::iterator it = _node_maps.begin();
-           it != _node_maps.end(); ++it) {
+           it != _node_maps.end(); ++it) {
         if (it->first == "label") {
-          label = it->second;
-          break;
-        }
+          label = it->second;
+          break;
+        }
       }
 
       *_os << "@nodes";
       if (!_nodes_caption.empty()) {
-        _writer_bits::writeToken(*_os << ' ', _nodes_caption);
+        _writer_bits::writeToken(*_os << ' ', _nodes_caption);
       }
       *_os << std::endl;
 
       if (label == 0) {
-        *_os << "label" << '\t';
+        *_os << "label" << '\t';
       }
       for (typename NodeMaps::iterator it = _node_maps.begin();
-           it != _node_maps.end(); ++it) {
-        _writer_bits::writeToken(*_os, it->first) << '\t';
+           it != _node_maps.end(); ++it) {
+        _writer_bits::writeToken(*_os, it->first) << '\t';
       }
       *_os << std::endl;
@@ -1268 +1268 @@
       std::vector<Node> nodes;
       for (NodeIt n(_graph); n != INVALID; ++n) {
-        nodes.push_back(n);
-      }
-      
+        nodes.push_back(n);
+      }
+
       if (label == 0) {
-        IdMap<Graph, Node> id_map(_graph);
-        _writer_bits::MapLess<IdMap<Graph, Node> > id_less(id_map);
-        std::sort(nodes.begin(), nodes.end(), id_less);
+        IdMap<Graph, Node> id_map(_graph);
+        _writer_bits::MapLess<IdMap<Graph, Node> > id_less(id_map);
+        std::sort(nodes.begin(), nodes.end(), id_less);
       } else {
-        label->sort(nodes);
+        label->sort(nodes);
       }
 
       for (int i = 0; i < static_cast<int>(nodes.size()); ++i) {
-        Node n = nodes[i];
-        if (label == 0) {
-          std::ostringstream os;
-          os << _graph.id(n);
-          _writer_bits::writeToken(*_os, os.str());
-          *_os << '\t';
-          _node_index.insert(std::make_pair(n, os.str()));
-        }
-        for (typename NodeMaps::iterator it = _node_maps.begin();
-             it != _node_maps.end(); ++it) {
-          std::string value = it->second->get(n);
-          _writer_bits::writeToken(*_os, value);
-          if (it->first == "label") {
-            _node_index.insert(std::make_pair(n, value));
-          }
-          *_os << '\t';
-        }
-        *_os << std::endl;
+        Node n = nodes[i];
+        if (label == 0) {
+          std::ostringstream os;
+          os << _graph.id(n);
+          _writer_bits::writeToken(*_os, os.str());
+          *_os << '\t';
+          _node_index.insert(std::make_pair(n, os.str()));
+        }
+        for (typename NodeMaps::iterator it = _node_maps.begin();
+             it != _node_maps.end(); ++it) {
+          std::string value = it->second->get(n);
+          _writer_bits::writeToken(*_os, value);
+          if (it->first == "label") {
+            _node_index.insert(std::make_pair(n, value));
+          }
+          *_os << '\t';
+        }
+        *_os << std::endl;
       }
     }
@@ -1304 +1304 @@
       _writer_bits::MapStorageBase<Node>* label = 0;
       for (typename NodeMaps::iterator it = _node_maps.begin();
-           it != _node_maps.end(); ++it) {
+           it != _node_maps.end(); ++it) {
         if (it->first == "label") {
-          label = it->second;
-          break;
-        }
+          label = it->second;
+          break;
+        }
       }
 
       if (label == 0) {
-        for (NodeIt n(_graph); n != INVALID; ++n) {
-          std::ostringstream os;
-          os << _graph.id(n);
-          _node_index.insert(std::make_pair(n, os.str()));        
-        }       
+        for (NodeIt n(_graph); n != INVALID; ++n) {
+          std::ostringstream os;
+          os << _graph.id(n);
+          _node_index.insert(std::make_pair(n, os.str()));
+        }
       } else {
-        for (NodeIt n(_graph); n != INVALID; ++n) {
-          std::string value = label->get(n);      
-          _node_index.insert(std::make_pair(n, value));
-        }
+        for (NodeIt n(_graph); n != INVALID; ++n) {
+          std::string value = label->get(n);
+          _node_index.insert(std::make_pair(n, value));
+        }
       }
     }
@@ -1328 +1328 @@
       _writer_bits::MapStorageBase<Edge>* label = 0;
       for (typename EdgeMaps::iterator it = _edge_maps.begin();
-           it != _edge_maps.end(); ++it) {
+           it != _edge_maps.end(); ++it) {
         if (it->first == "label") {
-          label = it->second;
-          break;
-        }
+          label = it->second;
+          break;
+        }
       }
 
       *_os << "@edges";
       if (!_edges_caption.empty()) {
-        _writer_bits::writeToken(*_os << ' ', _edges_caption);
+        _writer_bits::writeToken(*_os << ' ', _edges_caption);
       }
       *_os << std::endl;
@@ -1343 +1343 @@
       *_os << '\t' << '\t';
       if (label == 0) {
-        *_os << "label" << '\t';
+        *_os << "label" << '\t';
       }
       for (typename EdgeMaps::iterator it = _edge_maps.begin();
-           it != _edge_maps.end(); ++it) {
-        _writer_bits::writeToken(*_os, it->first) << '\t';
+           it != _edge_maps.end(); ++it) {
+        _writer_bits::writeToken(*_os, it->first) << '\t';
       }
       *_os << std::endl;
@@ -1353 +1353 @@
       std::vector<Edge> edges;
       for (EdgeIt n(_graph); n != INVALID; ++n) {
-        edges.push_back(n);
-      }
-      
+        edges.push_back(n);
+      }
+
       if (label == 0) {
-        IdMap<Graph, Edge> id_map(_graph);
-        _writer_bits::MapLess<IdMap<Graph, Edge> > id_less(id_map);
-        std::sort(edges.begin(), edges.end(), id_less);
+        IdMap<Graph, Edge> id_map(_graph);
+        _writer_bits::MapLess<IdMap<Graph, Edge> > id_less(id_map);
+        std::sort(edges.begin(), edges.end(), id_less);
       } else {
-        label->sort(edges);
+        label->sort(edges);
       }
 
       for (int i = 0; i < static_cast<int>(edges.size()); ++i) {
-        Edge e = edges[i];
-        _writer_bits::writeToken(*_os, _node_index.
-                                 find(_graph.u(e))->second);
-        *_os << '\t';
-        _writer_bits::writeToken(*_os, _node_index.
-                                 find(_graph.v(e))->second);
-        *_os << '\t';
-        if (label == 0) {
-          std::ostringstream os;
-          os << _graph.id(e);
-          _writer_bits::writeToken(*_os, os.str());
-          *_os << '\t';
-          _edge_index.insert(std::make_pair(e, os.str()));
-        }
-        for (typename EdgeMaps::iterator it = _edge_maps.begin();
-             it != _edge_maps.end(); ++it) {
-          std::string value = it->second->get(e);
-          _writer_bits::writeToken(*_os, value);
-          if (it->first == "label") {
-            _edge_index.insert(std::make_pair(e, value));
-          }
-          *_os << '\t';
-        }
-        *_os << std::endl;
+        Edge e = edges[i];
+        _writer_bits::writeToken(*_os, _node_index.
+                                 find(_graph.u(e))->second);
+        *_os << '\t';
+        _writer_bits::writeToken(*_os, _node_index.
+                                 find(_graph.v(e))->second);
+        *_os << '\t';
+        if (label == 0) {
+          std::ostringstream os;
+          os << _graph.id(e);
+          _writer_bits::writeToken(*_os, os.str());
+          *_os << '\t';
+          _edge_index.insert(std::make_pair(e, os.str()));
+        }
+        for (typename EdgeMaps::iterator it = _edge_maps.begin();
+             it != _edge_maps.end(); ++it) {
+          std::string value = it->second->get(e);
+          _writer_bits::writeToken(*_os, value);
+          if (it->first == "label") {
+            _edge_index.insert(std::make_pair(e, value));
+          }
+          *_os << '\t';
+        }
+        *_os << std::endl;
       }
     }
@@ -1395 +1395 @@
       _writer_bits::MapStorageBase<Edge>* label = 0;
       for (typename EdgeMaps::iterator it = _edge_maps.begin();
-           it != _edge_maps.end(); ++it) {
+           it != _edge_maps.end(); ++it) {
         if (it->first == "label") {
-          label = it->second;
-          break;
-        }
+          label = it->second;
+          break;
+        }
       }
 
       if (label == 0) {
-        for (EdgeIt e(_graph); e != INVALID; ++e) {
-          std::ostringstream os;
-          os << _graph.id(e);
-          _edge_index.insert(std::make_pair(e, os.str()));        
-        }       
+        for (EdgeIt e(_graph); e != INVALID; ++e) {
+          std::ostringstream os;
+          os << _graph.id(e);
+          _edge_index.insert(std::make_pair(e, os.str()));
+        }
       } else {
-        for (EdgeIt e(_graph); e != INVALID; ++e) {
-          std::string value = label->get(e);      
-          _edge_index.insert(std::make_pair(e, value));
-        }
+        for (EdgeIt e(_graph); e != INVALID; ++e) {
+          std::string value = label->get(e);
+          _edge_index.insert(std::make_pair(e, value));
+        }
       }
     }
@@ -1420 +1420 @@
       *_os << "@attributes";
       if (!_attributes_caption.empty()) {
-        _writer_bits::writeToken(*_os << ' ', _attributes_caption);
+        _writer_bits::writeToken(*_os << ' ', _attributes_caption);
       }
       *_os << std::endl;
       for (typename Attributes::iterator it = _attributes.begin();
-           it != _attributes.end(); ++it) {
-        _writer_bits::writeToken(*_os, it->first) << ' ';
-        _writer_bits::writeToken(*_os, it->second->get());
-        *_os << std::endl;
-      }
-    }
-    
+           it != _attributes.end(); ++it) {
+        _writer_bits::writeToken(*_os, it->first) << ' ';
+        _writer_bits::writeToken(*_os, it->second->get());
+        *_os << std::endl;
+      }
+    }
+
   public:
-    
-    /// \name Execution of the writer    
+
+    /// \name Execution of the writer
     /// @{
 
@@ -1441 +1441 @@
     void run() {
       if (!_skip_nodes) {
-        writeNodes();
+        writeNodes();
       } else {
-        createNodeIndex();
-      }
-      if (!_skip_edges) {      
-        writeEdges();
+        createNodeIndex();
+      }
+      if (!_skip_edges) {
+        writeEdges();
       } else {
-        createEdgeIndex();
+        createEdgeIndex();
       }
       writeAttributes();
@@ -1464 +1464 @@
 
   /// \brief Return a \ref GraphWriter class
-  /// 
+  ///
   /// This function just returns a \ref GraphWriter class.
   /// \relates GraphWriter
@@ -1474 +1474 @@
 
   /// \brief Return a \ref GraphWriter class
-  /// 
+  ///
   /// This function just returns a \ref GraphWriter class.
   /// \relates GraphWriter
@@ -1484 +1484 @@
 
   /// \brief Return a \ref GraphWriter class
-  /// 
+  ///
   /// This function just returns a \ref GraphWriter class.
   /// \relates GraphWriter

lemon/list_graph.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -38 +38 @@
       int prev, next;
     };
- 
+
     struct ArcT {
       int target, source;
@@ -54 +54 @@
 
     int first_free_arc;
-    
+
   public:
-    
+
     typedef ListDigraphBase Digraph;
-    
+
     class Node {
       friend class ListDigraphBase;
@@ -93 +93 @@
     ListDigraphBase()
       : nodes(), first_node(-1),
-        first_free_node(-1), arcs(), first_free_arc(-1) {}
-
-    
-    int maxNodeId() const { return nodes.size()-1; } 
+        first_free_node(-1), arcs(), first_free_arc(-1) {}
+
+
+    int maxNodeId() const { return nodes.size()-1; }
     int maxArcId() const { return arcs.size()-1; }
 
@@ -103 +103 @@
 
 
-    void first(Node& node) const { 
+    void first(Node& node) const {
       node.id = first_node;
     }
@@ -112 +112 @@
 
 
-    void first(Arc& arc) const { 
+    void first(Arc& arc) const {
       int n;
-      for(n = first_node; 
-          n!=-1 && nodes[n].first_in == -1; 
-          n = nodes[n].next) {}
+      for(n = first_node;
+          n!=-1 && nodes[n].first_in == -1;
+          n = nodes[n].next) {}
       arc.id = (n == -1) ? -1 : nodes[n].first_in;
     }
@@ -122 +122 @@
     void next(Arc& arc) const {
       if (arcs[arc.id].next_in != -1) {
-        arc.id = arcs[arc.id].next_in;
-      } else {
-        int n;
-        for(n = nodes[arcs[arc.id].target].next;
-            n!=-1 && nodes[n].first_in == -1; 
-            n = nodes[n].next) {}
-        arc.id = (n == -1) ? -1 : nodes[n].first_in;
-      }      
+        arc.id = arcs[arc.id].next_in;
+      } else {
+        int n;
+        for(n = nodes[arcs[arc.id].target].next;
+            n!=-1 && nodes[n].first_in == -1;
+            n = nodes[n].next) {}
+        arc.id = (n == -1) ? -1 : nodes[n].first_in;
+      }
     }
 
@@ -146 +146 @@
     }
 
-    
+
     static int id(Node v) { return v.id; }
     static int id(Arc e) { return e.id; }
@@ -153 +153 @@
     static Arc arcFromId(int id) { return Arc(id);}
 
-    bool valid(Node n) const { 
-      return n.id >= 0 && n.id < static_cast<int>(nodes.size()) && 
-        nodes[n.id].prev != -2;
-    }
-
-    bool valid(Arc a) const { 
-      return a.id >= 0 && a.id < static_cast<int>(arcs.size()) && 
-        arcs[a.id].prev_in != -2;
-    }
-
-    Node addNode() {     
+    bool valid(Node n) const {
+      return n.id >= 0 && n.id < static_cast<int>(nodes.size()) &&
+        nodes[n.id].prev != -2;
+    }
+
+    bool valid(Arc a) const {
+      return a.id >= 0 && a.id < static_cast<int>(arcs.size()) &&
+        arcs[a.id].prev_in != -2;
+    }
+
+    Node addNode() {
       int n;
-      
+
       if(first_free_node==-1) {
-        n = nodes.size();
-        nodes.push_back(NodeT());
-      } else {
-        n = first_free_node;
-        first_free_node = nodes[n].next;
-      }
-      
+        n = nodes.size();
+        nodes.push_back(NodeT());
+      } else {
+        n = first_free_node;
+        first_free_node = nodes[n].next;
+      }
+
       nodes[n].next = first_node;
       if(first_node != -1) nodes[first_node].prev = n;
       first_node = n;
       nodes[n].prev = -1;
-      
+
       nodes[n].first_in = nodes[n].first_out = -1;
-      
+
       return Node(n);
     }
-    
+
     Arc addArc(Node u, Node v) {
-      int n;      
+      int n;
 
       if (first_free_arc == -1) {
-        n = arcs.size();
-        arcs.push_back(ArcT());
-      } else {
-        n = first_free_arc;
-        first_free_arc = arcs[n].next_in;
-      }
-      
-      arcs[n].source = u.id; 
+        n = arcs.size();
+        arcs.push_back(ArcT());
+      } else {
+        n = first_free_arc;
+        first_free_arc = arcs[n].next_in;
+      }
+
+      arcs[n].source = u.id;
       arcs[n].target = v.id;
 
       arcs[n].next_out = nodes[u.id].first_out;
       if(nodes[u.id].first_out != -1) {
-        arcs[nodes[u.id].first_out].prev_out = n;
-      }
-      
+        arcs[nodes[u.id].first_out].prev_out = n;
+      }
+
       arcs[n].next_in = nodes[v.id].first_in;
       if(nodes[v.id].first_in != -1) {
-        arcs[nodes[v.id].first_in].prev_in = n;
-      }
-      
+        arcs[nodes[v.id].first_in].prev_in = n;
+      }
+
       arcs[n].prev_in = arcs[n].prev_out = -1;
-        
+
       nodes[u.id].first_out = nodes[v.id].first_in = n;
 
       return Arc(n);
     }
-    
+
     void erase(const Node& node) {
       int n = node.id;
-      
+
       if(nodes[n].next != -1) {
-        nodes[nodes[n].next].prev = nodes[n].prev;
-      }
-      
+        nodes[nodes[n].next].prev = nodes[n].prev;
+      }
+
       if(nodes[n].prev != -1) {
-        nodes[nodes[n].prev].next = nodes[n].next;
-      } else {
-        first_node = nodes[n].next;
-      }
-      
+        nodes[nodes[n].prev].next = nodes[n].next;
+      } else {
+        first_node = nodes[n].next;
+      }
+
       nodes[n].next = first_free_node;
       first_free_node = n;
@@ -233 +233 @@
 
     }
-    
+
     void erase(const Arc& arc) {
       int n = arc.id;
-      
+
       if(arcs[n].next_in!=-1) {
-        arcs[arcs[n].next_in].prev_in = arcs[n].prev_in;
+        arcs[arcs[n].next_in].prev_in = arcs[n].prev_in;
       }
 
       if(arcs[n].prev_in!=-1) {
-        arcs[arcs[n].prev_in].next_in = arcs[n].next_in;
-      } else {
-        nodes[arcs[n].target].first_in = arcs[n].next_in;
-      }
-
-      
+        arcs[arcs[n].prev_in].next_in = arcs[n].next_in;
+      } else {
+        nodes[arcs[n].target].first_in = arcs[n].next_in;
+      }
+
+
       if(arcs[n].next_out!=-1) {
-        arcs[arcs[n].next_out].prev_out = arcs[n].prev_out;
-      } 
+        arcs[arcs[n].next_out].prev_out = arcs[n].prev_out;
+      }
 
       if(arcs[n].prev_out!=-1) {
-        arcs[arcs[n].prev_out].next_out = arcs[n].next_out;
-      } else {
-        nodes[arcs[n].source].first_out = arcs[n].next_out;
-      }
-      
+        arcs[arcs[n].prev_out].next_out = arcs[n].next_out;
+      } else {
+        nodes[arcs[n].source].first_out = arcs[n].next_out;
+      }
+
       arcs[n].next_in = first_free_arc;
       first_free_arc = n;
@@ -270 +270 @@
 
   protected:
-    void changeTarget(Arc e, Node n) 
+    void changeTarget(Arc e, Node n)
     {
       if(arcs[e.id].next_in != -1)
-        arcs[arcs[e.id].next_in].prev_in = arcs[e.id].prev_in;
+        arcs[arcs[e.id].next_in].prev_in = arcs[e.id].prev_in;
       if(arcs[e.id].prev_in != -1)
-        arcs[arcs[e.id].prev_in].next_in = arcs[e.id].next_in;
+        arcs[arcs[e.id].prev_in].next_in = arcs[e.id].next_in;
       else nodes[arcs[e.id].target].first_in = arcs[e.id].next_in;
       if (nodes[n.id].first_in != -1) {
-        arcs[nodes[n.id].first_in].prev_in = e.id;
+        arcs[nodes[n.id].first_in].prev_in = e.id;
       }
       arcs[e.id].target = n.id;
@@ -285 +285 @@
       nodes[n.id].first_in = e.id;
     }
-    void changeSource(Arc e, Node n) 
+    void changeSource(Arc e, Node n)
     {
       if(arcs[e.id].next_out != -1)
-        arcs[arcs[e.id].next_out].prev_out = arcs[e.id].prev_out;
+        arcs[arcs[e.id].next_out].prev_out = arcs[e.id].prev_out;
       if(arcs[e.id].prev_out != -1)
-        arcs[arcs[e.id].prev_out].next_out = arcs[e.id].next_out;
+        arcs[arcs[e.id].prev_out].next_out = arcs[e.id].next_out;
       else nodes[arcs[e.id].source].first_out = arcs[e.id].next_out;
       if (nodes[n.id].first_out != -1) {
-        arcs[nodes[n.id].first_out].prev_out = e.id;
+        arcs[nodes[n.id].first_out].prev_out = e.id;
       }
       arcs[e.id].source = n.id;
@@ -308 +308 @@
   /// @{
 
-  ///A general directed graph structure. 
-
-  ///\ref ListDigraph is a simple and fast <em>directed graph</em> 
-  ///implementation based on static linked lists that are stored in 
-  ///\c std::vector structures.   
+  ///A general directed graph structure.
+
+  ///\ref ListDigraph is a simple and fast <em>directed graph</em>
+  ///implementation based on static linked lists that are stored in
+  ///\c std::vector structures.
   ///
   ///It conforms to the \ref concepts::Digraph "Digraph concept" and it
@@ -327 +327 @@
   private:
     ///ListDigraph is \e not copy constructible. Use copyDigraph() instead.
-    
+
     ///ListDigraph is \e not copy constructible. Use copyDigraph() instead.
     ///
@@ -342 +342 @@
 
     /// Constructor
-    
+
     /// Constructor.
     ///
@@ -348 +348 @@
 
     ///Add a new node to the digraph.
-    
+
     ///Add a new node to the digraph.
     ///\return the new node.
@@ -354 +354 @@
 
     ///Add a new arc to the digraph.
-    
+
     ///Add a new arc to the digraph with source node \c s
     ///and target node \c t.
     ///\return the new arc.
-    Arc addArc(const Node& s, const Node& t) { 
-      return Parent::addArc(s, t); 
+    Arc addArc(const Node& s, const Node& t) {
+      return Parent::addArc(s, t);
     }
 
@@ -365 +365 @@
 
     /// This function gives back true if the given node is valid,
-    /// ie. it is a real node of the graph.  
+    /// ie. it is a real node of the graph.
     ///
     /// \warning A Node pointing to a removed item
@@ -375 +375 @@
 
     /// This function gives back true if the given arc is valid,
-    /// ie. it is a real arc of the graph.  
+    /// ie. it is a real arc of the graph.
     ///
     /// \warning An Arc pointing to a removed item
@@ -392 +392 @@
     ///\warning This functionality cannot be used together with the Snapshot
     ///feature.
-    void changeTarget(Arc e, Node n) { 
-      Parent::changeTarget(e,n); 
+    void changeTarget(Arc e, Node n) {
+      Parent::changeTarget(e,n);
     }
     /// Change the source of \c e to \c n
@@ -405 +405 @@
     ///\warning This functionality cannot be used together with the Snapshot
     ///feature.
-    void changeSource(Arc e, Node n) { 
+    void changeSource(Arc e, Node n) {
       Parent::changeSource(e,n);
     }
@@ -457 +457 @@
     ///\warning This functionality cannot be used together with the Snapshot
     ///feature.
-    void contract(Node a, Node b, bool r = true) 
+    void contract(Node a, Node b, bool r = true)
     {
       for(OutArcIt e(*this,b);e!=INVALID;) {
-        OutArcIt f=e;
-        ++f;
-        if(r && target(e)==a) erase(e);
-        else changeSource(e,a);
-        e=f;
+        OutArcIt f=e;
+        ++f;
+        if(r && target(e)==a) erase(e);
+        else changeSource(e,a);
+        e=f;
       }
       for(InArcIt e(*this,b);e!=INVALID;) {
-        InArcIt f=e;
-        ++f;
-        if(r && source(e)==a) erase(e);
-        else changeTarget(e,a);
-        e=f;
+        InArcIt f=e;
+        ++f;
+        if(r && source(e)==a) erase(e);
+        else changeTarget(e,a);
+        e=f;
       }
       erase(b);
@@ -486 +486 @@
     ///\note The <tt>ArcIt</tt>s referencing a moved arc remain
     ///valid. However <tt>InArcIt</tt>s and <tt>OutArcIt</tt>s may
-    ///be invalidated.  
+    ///be invalidated.
     ///
     ///\warning This functionality cannot be used together with the
@@ -495 +495 @@
       Node b = addNode();
       for(OutArcIt e(*this,n);e!=INVALID;) {
-        OutArcIt f=e;
-        ++f;
-        changeSource(e,b);
-        e=f;
+         OutArcIt f=e;
+        ++f;
+        changeSource(e,b);
+        e=f;
       }
       if (connect) addArc(n,b);
       return b;
     }
-      
+
     ///Split an arc.
 
@@ -520 +520 @@
       return b;
     }
-      
+
     /// \brief Class to make a snapshot of the digraph and restore
     /// it later.
@@ -530 +530 @@
     ///
     /// \warning Arc and node deletions and other modifications (e.g.
-    /// contracting, splitting, reversing arcs or nodes) cannot be 
-    /// restored. These events invalidate the snapshot. 
+    /// contracting, splitting, reversing arcs or nodes) cannot be
+    /// restored. These events invalidate the snapshot.
     class Snapshot {
     protected:
@@ -546 +546 @@
         using NodeNotifier::ObserverBase::detach;
         using NodeNotifier::ObserverBase::attached;
-        
+
       protected:
-        
+
         virtual void add(const Node& node) {
           snapshot.addNode(node);
@@ -568 +568 @@
           Node node;
           std::vector<Node> nodes;
-          for (notifier()->first(node); node != INVALID; 
+          for (notifier()->first(node); node != INVALID;
                notifier()->next(node)) {
             nodes.push_back(node);
@@ -578 +578 @@
         virtual void clear() {
           Node node;
-          for (notifier()->first(node); node != INVALID; 
+          for (notifier()->first(node); node != INVALID;
                notifier()->next(node)) {
             snapshot.eraseNode(node);
@@ -596 +596 @@
         using ArcNotifier::ObserverBase::detach;
         using ArcNotifier::ObserverBase::attached;
-        
+
       protected:
 
@@ -618 +618 @@
           Arc arc;
           std::vector<Arc> arcs;
-          for (notifier()->first(arc); arc != INVALID; 
+          for (notifier()->first(arc); arc != INVALID;
                notifier()->next(arc)) {
             arcs.push_back(arc);
@@ -628 +628 @@
         virtual void clear() {
           Arc arc;
-          for (notifier()->first(arc); arc != INVALID; 
+          for (notifier()->first(arc); arc != INVALID;
                notifier()->next(arc)) {
             snapshot.eraseArc(arc);
@@ -636 +636 @@
         Snapshot& snapshot;
       };
-      
+
       ListDigraph *digraph;
 
@@ -647 +647 @@
 
       void addNode(const Node& node) {
-        added_nodes.push_front(node);        
+        added_nodes.push_front(node);
       }
       void eraseNode(const Node& node) {
-        std::list<Node>::iterator it = 
+        std::list<Node>::iterator it =
           std::find(added_nodes.begin(), added_nodes.end(), node);
         if (it == added_nodes.end()) {
@@ -662 +662 @@
 
       void addArc(const Arc& arc) {
-        added_arcs.push_front(arc);        
+        added_arcs.push_front(arc);
       }
       void eraseArc(const Arc& arc) {
-        std::list<Arc>::iterator it = 
+        std::list<Arc>::iterator it =
           std::find(added_arcs.begin(), added_arcs.end(), arc);
         if (it == added_arcs.end()) {
           clear();
-          node_observer_proxy.detach(); 
+          node_observer_proxy.detach();
           throw ArcNotifier::ImmediateDetach();
         } else {
           added_arcs.erase(it);
-        }        
+        }
       }
 
       void attach(ListDigraph &_digraph) {
-        digraph = &_digraph;
-        node_observer_proxy.attach(digraph->notifier(Node()));
+        digraph = &_digraph;
+        node_observer_proxy.attach(digraph->notifier(Node()));
         arc_observer_proxy.attach(digraph->notifier(Arc()));
       }
-            
+
       void detach() {
-        node_observer_proxy.detach();
-        arc_observer_proxy.detach();
+        node_observer_proxy.detach();
+        arc_observer_proxy.detach();
       }
 
@@ -693 +693 @@
       void clear() {
         added_nodes.clear();
-        added_arcs.clear();        
+        added_arcs.clear();
       }
 
@@ -702 +702 @@
       /// Default constructor.
       /// To actually make a snapshot you must call save().
-      Snapshot() 
-        : digraph(0), node_observer_proxy(*this), 
+      Snapshot()
+        : digraph(0), node_observer_proxy(*this),
           arc_observer_proxy(*this) {}
-      
+
       /// \brief Constructor that immediately makes a snapshot.
-      ///      
+      ///
       /// This constructor immediately makes a snapshot of the digraph.
       /// \param _digraph The digraph we make a snapshot of.
-      Snapshot(ListDigraph &_digraph) 
-        : node_observer_proxy(*this), 
+      Snapshot(ListDigraph &_digraph)
+        : node_observer_proxy(*this),
           arc_observer_proxy(*this) {
-        attach(_digraph);
-      }
-      
+        attach(_digraph);
+      }
+
       /// \brief Make a snapshot.
       ///
@@ -730 +730 @@
         attach(_digraph);
       }
-      
+
       /// \brief Undo the changes until the last snapshot.
-      // 
+      //
       /// Undo the changes until the last snapshot created by save().
       void restore() {
-        detach();
-        for(std::list<Arc>::iterator it = added_arcs.begin(); 
+        detach();
+        for(std::list<Arc>::iterator it = added_arcs.begin();
             it != added_arcs.end(); ++it) {
-          digraph->erase(*it);
-        }
-        for(std::list<Node>::iterator it = added_nodes.begin(); 
+          digraph->erase(*it);
+        }
+        for(std::list<Node>::iterator it = added_nodes.begin();
             it != added_nodes.end(); ++it) {
-          digraph->erase(*it);
-        }
+          digraph->erase(*it);
+        }
         clear();
       }
@@ -754 +754 @@
       }
     };
-    
+
   };
 
@@ -767 +767 @@
       int prev, next;
     };
- 
+
     struct ArcT {
       int target;
@@ -782 +782 @@
 
     int first_free_arc;
-    
+
   public:
-    
+
     typedef ListGraphBase Digraph;
 
@@ -790 +790 @@
     class Arc;
     class Edge;
-    
+
     class Node {
       friend class ListGraphBase;
@@ -842 +842 @@
     ListGraphBase()
       : nodes(), first_node(-1),
-        first_free_node(-1), arcs(), first_free_arc(-1) {}
-
-    
-    int maxNodeId() const { return nodes.size()-1; } 
+        first_free_node(-1), arcs(), first_free_arc(-1) {}
+
+
+    int maxNodeId() const { return nodes.size()-1; }
     int maxEdgeId() const { return arcs.size() / 2 - 1; }
     int maxArcId() const { return arcs.size()-1; }
@@ -863 +863 @@
     }
 
-    void first(Node& node) const { 
+    void first(Node& node) const {
       node.id = first_node;
     }
@@ -871 +871 @@
     }
 
-    void first(Arc& e) const { 
+    void first(Arc& e) const {
       int n = first_node;
       while (n != -1 && nodes[n].first_out == -1) {
@@ -881 +881 @@
     void next(Arc& e) const {
       if (arcs[e.id].next_out != -1) {
-        e.id = arcs[e.id].next_out;
-      } else {
-        int n = nodes[arcs[e.id ^ 1].target].next;
+        e.id = arcs[e.id].next_out;
+      } else {
+        int n = nodes[arcs[e.id ^ 1].target].next;
         while(n != -1 && nodes[n].first_out == -1) {
           n = nodes[n].next;
         }
-        e.id = (n == -1) ? -1 : nodes[n].first_out;
-      }      
-    }
-
-    void first(Edge& e) const { 
+        e.id = (n == -1) ? -1 : nodes[n].first_out;
+      }
+    }
+
+    void first(Edge& e) const {
       int n = first_node;
       while (n != -1) {
@@ -901 +901 @@
           e.id /= 2;
           return;
-        } 
+        }
         n = nodes[n].next;
       }
@@ -916 +916 @@
         e.id /= 2;
         return;
-      } 
+      }
       n = nodes[n].next;
       while (n != -1) {
@@ -926 +926 @@
           e.id /= 2;
           return;
-        } 
+        }
         n = nodes[n].next;
       }
@@ -968 +968 @@
       }
     }
-    
+
     static int id(Node v) { return v.id; }
     static int id(Arc e) { return e.id; }
@@ -977 +977 @@
     static Edge edgeFromId(int id) { return Edge(id);}
 
-    bool valid(Node n) const { 
-      return n.id >= 0 && n.id < static_cast<int>(nodes.size()) && 
-        nodes[n.id].prev != -2;
-    }
-
-    bool valid(Arc a) const { 
-      return a.id >= 0 && a.id < static_cast<int>(arcs.size()) && 
-        arcs[a.id].prev_out != -2;
-    }
-
-    bool valid(Edge e) const { 
-      return e.id >= 0 && 2 * e.id < static_cast<int>(arcs.size()) && 
-        arcs[2 * e.id].prev_out != -2;
-    }
-
-    Node addNode() {     
+    bool valid(Node n) const {
+      return n.id >= 0 && n.id < static_cast<int>(nodes.size()) &&
+        nodes[n.id].prev != -2;
+    }
+
+    bool valid(Arc a) const {
+      return a.id >= 0 && a.id < static_cast<int>(arcs.size()) &&
+        arcs[a.id].prev_out != -2;
+    }
+
+    bool valid(Edge e) const {
+      return e.id >= 0 && 2 * e.id < static_cast<int>(arcs.size()) &&
+        arcs[2 * e.id].prev_out != -2;
+    }
+
+    Node addNode() {
       int n;
-      
+
       if(first_free_node==-1) {
-        n = nodes.size();
-        nodes.push_back(NodeT());
-      } else {
-        n = first_free_node;
-        first_free_node = nodes[n].next;
-      }
-      
+        n = nodes.size();
+        nodes.push_back(NodeT());
+      } else {
+        n = first_free_node;
+        first_free_node = nodes[n].next;
+      }
+
       nodes[n].next = first_node;
       if (first_node != -1) nodes[first_node].prev = n;
       first_node = n;
       nodes[n].prev = -1;
-      
+
       nodes[n].first_out = -1;
-      
+
       return Node(n);
     }
-    
+
     Edge addEdge(Node u, Node v) {
-      int n;      
+      int n;
 
       if (first_free_arc == -1) {
-        n = arcs.size();
-        arcs.push_back(ArcT());
-        arcs.push_back(ArcT());
-      } else {
-        n = first_free_arc;
-        first_free_arc = arcs[n].next_out;
-      }
-      
+        n = arcs.size();
+        arcs.push_back(ArcT());
+        arcs.push_back(ArcT());
+      } else {
+        n = first_free_arc;
+        first_free_arc = arcs[n].next_out;
+      }
+
       arcs[n].target = u.id;
       arcs[n | 1].target = v.id;
@@ -1030 +1030 @@
       arcs[n].next_out = nodes[v.id].first_out;
       if (nodes[v.id].first_out != -1) {
-        arcs[nodes[v.id].first_out].prev_out = n;
-      }      
+        arcs[nodes[v.id].first_out].prev_out = n;
+      }
       arcs[n].prev_out = -1;
       nodes[v.id].first_out = n;
-      
+
       arcs[n | 1].next_out = nodes[u.id].first_out;
       if (nodes[u.id].first_out != -1) {
-        arcs[nodes[u.id].first_out].prev_out = (n | 1);
-      }
-      arcs[n | 1].prev_out = -1;      
+        arcs[nodes[u.id].first_out].prev_out = (n | 1);
+      }
+      arcs[n | 1].prev_out = -1;
       nodes[u.id].first_out = (n | 1);
 
       return Edge(n / 2);
     }
-    
+
     void erase(const Node& node) {
       int n = node.id;
-      
+
       if(nodes[n].next != -1) {
-        nodes[nodes[n].next].prev = nodes[n].prev;
-      }
-      
+        nodes[nodes[n].next].prev = nodes[n].prev;
+      }
+
       if(nodes[n].prev != -1) {
-        nodes[nodes[n].prev].next = nodes[n].next;
-      } else {
-        first_node = nodes[n].next;
-      }
-      
+        nodes[nodes[n].prev].next = nodes[n].next;
+      } else {
+        first_node = nodes[n].next;
+      }
+
       nodes[n].next = first_free_node;
       first_free_node = n;
       nodes[n].prev = -2;
     }
-    
+
     void erase(const Edge& edge) {
       int n = edge.id * 2;
-      
+
       if (arcs[n].next_out != -1) {
-        arcs[arcs[n].next_out].prev_out = arcs[n].prev_out;
-      } 
+        arcs[arcs[n].next_out].prev_out = arcs[n].prev_out;
+      }
 
       if (arcs[n].prev_out != -1) {
-        arcs[arcs[n].prev_out].next_out = arcs[n].next_out;
-      } else {
-        nodes[arcs[n | 1].target].first_out = arcs[n].next_out;
+        arcs[arcs[n].prev_out].next_out = arcs[n].next_out;
+      } else {
+        nodes[arcs[n | 1].target].first_out = arcs[n].next_out;
       }
 
       if (arcs[n | 1].next_out != -1) {
-        arcs[arcs[n | 1].next_out].prev_out = arcs[n | 1].prev_out;
-      } 
+        arcs[arcs[n | 1].next_out].prev_out = arcs[n | 1].prev_out;
+      }
 
       if (arcs[n | 1].prev_out != -1) {
-        arcs[arcs[n | 1].prev_out].next_out = arcs[n | 1].next_out;
-      } else {
-        nodes[arcs[n].target].first_out = arcs[n | 1].next_out;
-      }
-      
+        arcs[arcs[n | 1].prev_out].next_out = arcs[n | 1].next_out;
+      } else {
+        nodes[arcs[n].target].first_out = arcs[n | 1].next_out;
+      }
+
       arcs[n].next_out = first_free_arc;
-      first_free_arc = n;      
+      first_free_arc = n;
       arcs[n].prev_out = -2;
       arcs[n | 1].prev_out = -2;
@@ -1103 +1103 @@
     void changeTarget(Edge e, Node n) {
       if(arcs[2 * e.id].next_out != -1) {
-        arcs[arcs[2 * e.id].next_out].prev_out = arcs[2 * e.id].prev_out;
+        arcs[arcs[2 * e.id].next_out].prev_out = arcs[2 * e.id].prev_out;
       }
       if(arcs[2 * e.id].prev_out != -1) {
-        arcs[arcs[2 * e.id].prev_out].next_out = 
+        arcs[arcs[2 * e.id].prev_out].next_out =
           arcs[2 * e.id].next_out;
       } else {
-        nodes[arcs[(2 * e.id) | 1].target].first_out = 
+        nodes[arcs[(2 * e.id) | 1].target].first_out =
           arcs[2 * e.id].next_out;
       }
 
       if (nodes[n.id].first_out != -1) {
-        arcs[nodes[n.id].first_out].prev_out = 2 * e.id;
+        arcs[nodes[n.id].first_out].prev_out = 2 * e.id;
       }
       arcs[(2 * e.id) | 1].target = n.id;
@@ -1124 +1124 @@
     void changeSource(Edge e, Node n) {
       if(arcs[(2 * e.id) | 1].next_out != -1) {
-        arcs[arcs[(2 * e.id) | 1].next_out].prev_out = 
+        arcs[arcs[(2 * e.id) | 1].next_out].prev_out =
           arcs[(2 * e.id) | 1].prev_out;
       }
       if(arcs[(2 * e.id) | 1].prev_out != -1) {
-        arcs[arcs[(2 * e.id) | 1].prev_out].next_out = 
+        arcs[arcs[(2 * e.id) | 1].prev_out].next_out =
           arcs[(2 * e.id) | 1].next_out;
       } else {
-        nodes[arcs[2 * e.id].target].first_out = 
+        nodes[arcs[2 * e.id].target].first_out =
           arcs[(2 * e.id) | 1].next_out;
       }
 
       if (nodes[n.id].first_out != -1) {
-        arcs[nodes[n.id].first_out].prev_out = ((2 * e.id) | 1);
+        arcs[nodes[n.id].first_out].prev_out = ((2 * e.id) | 1);
       }
       arcs[2 * e.id].target = n.id;
@@ -1154 +1154 @@
   ///A general undirected graph structure.
 
-  ///\ref ListGraph is a simple and fast <em>undirected graph</em> 
-  ///implementation based on static linked lists that are stored in 
-  ///\c std::vector structures. 
+  ///\ref ListGraph is a simple and fast <em>undirected graph</em>
+  ///implementation based on static linked lists that are stored in
+  ///\c std::vector structures.
   ///
   ///It conforms to the \ref concepts::Graph "Graph concept" and it
@@ -1183 +1183 @@
   public:
     /// Constructor
-    
+
     /// Constructor.
     ///
@@ -1203 +1203 @@
     /// and target node \c t.
     /// \return the new edge.
-    Edge addEdge(const Node& s, const Node& t) { 
-      return Parent::addEdge(s, t); 
+    Edge addEdge(const Node& s, const Node& t) {
+      return Parent::addEdge(s, t);
     }
     /// Node validity check
 
     /// This function gives back true if the given node is valid,
-    /// ie. it is a real node of the graph.  
+    /// ie. it is a real node of the graph.
     ///
     /// \warning A Node pointing to a removed item
@@ -1218 +1218 @@
 
     /// This function gives back true if the given arc is valid,
-    /// ie. it is a real arc of the graph.  
+    /// ie. it is a real arc of the graph.
     ///
     /// \warning An Arc pointing to a removed item
@@ -1227 +1227 @@
 
     /// This function gives back true if the given edge is valid,
-    /// ie. it is a real arc of the graph.  
+    /// ie. it is a real arc of the graph.
     ///
     /// \warning A Edge pointing to a removed item
@@ -1243 +1243 @@
     ///\warning This functionality cannot be used together with the
     ///Snapshot feature.
-    void changeSource(Edge e, Node n) { 
-      Parent::changeSource(e,n); 
-    }    
+    void changeSource(Edge e, Node n) {
+      Parent::changeSource(e,n);
+    }
     /// \brief Change the target of \c e to \c n
     ///
@@ -1255 +1255 @@
     ///\warning This functionality cannot be used together with the
     ///Snapshot feature.
-    void changeTarget(Edge e, Node n) { 
-      Parent::changeTarget(e,n); 
+    void changeTarget(Edge e, Node n) {
+      Parent::changeTarget(e,n);
     }
     /// \brief Change the source of \c e to \c n
     ///
-    /// This function changes the source of \c e to \c n. 
+    /// This function changes the source of \c e to \c n.
     /// It also changes the proper node of the represented edge.
     ///
@@ -1269 +1269 @@
     ///\warning This functionality cannot be used together with the
     ///Snapshot feature.
-    void changeSource(Arc e, Node n) { 
+    void changeSource(Arc e, Node n) {
       if (Parent::direction(e)) {
         Parent::changeSource(e,n);
       } else {
         Parent::changeTarget(e,n);
-      } 
+      }
     }
     /// \brief Change the target of \c e to \c n
     ///
-    /// This function changes the target of \c e to \c n. 
+    /// This function changes the target of \c e to \c n.
     /// It also changes the proper node of the represented edge.
     ///
@@ -1287 +1287 @@
     ///\warning This functionality cannot be used together with the
     ///Snapshot feature.
-    void changeTarget(Arc e, Node n) { 
+    void changeTarget(Arc e, Node n) {
       if (Parent::direction(e)) {
         Parent::changeTarget(e,n);
       } else {
         Parent::changeSource(e,n);
-      } 
+      }
     }
     /// \brief Contract two nodes.
@@ -1309 +1309 @@
     void contract(Node a, Node b, bool r = true) {
       for(IncEdgeIt e(*this, b); e!=INVALID;) {
-        IncEdgeIt f = e; ++f;
-        if (r && runningNode(e) == a) {
-          erase(e);
-        } else if (source(e) == b) {
-          changeSource(e, a);
-        } else {
-          changeTarget(e, a);
-        }
-        e = f;
+        IncEdgeIt f = e; ++f;
+        if (r && runningNode(e) == a) {
+          erase(e);
+        } else if (source(e) == b) {
+          changeSource(e, a);
+        } else {
+          changeTarget(e, a);
+        }
+        e = f;
       }
       erase(b);
@@ -1332 +1332 @@
     ///
     /// \warning Edge and node deletions and other modifications
-    /// (e.g. changing nodes of edges, contracting nodes) cannot be 
+    /// (e.g. changing nodes of edges, contracting nodes) cannot be
     /// restored. These events invalidate the snapshot.
     class Snapshot {
@@ -1348 +1348 @@
         using NodeNotifier::ObserverBase::detach;
         using NodeNotifier::ObserverBase::attached;
-        
+
       protected:
-        
+
         virtual void add(const Node& node) {
           snapshot.addNode(node);
@@ -1370 +1370 @@
           Node node;
           std::vector<Node> nodes;
-          for (notifier()->first(node); node != INVALID; 
+          for (notifier()->first(node); node != INVALID;
                notifier()->next(node)) {
             nodes.push_back(node);
@@ -1380 +1380 @@
         virtual void clear() {
           Node node;
-          for (notifier()->first(node); node != INVALID; 
+          for (notifier()->first(node); node != INVALID;
                notifier()->next(node)) {
             snapshot.eraseNode(node);
@@ -1398 +1398 @@
         using EdgeNotifier::ObserverBase::detach;
         using EdgeNotifier::ObserverBase::attached;
-        
+
       protected:
 
@@ -1420 +1420 @@
           Edge edge;
           std::vector<Edge> edges;
-          for (notifier()->first(edge); edge != INVALID; 
+          for (notifier()->first(edge); edge != INVALID;
                notifier()->next(edge)) {
             edges.push_back(edge);
@@ -1430 +1430 @@
         virtual void clear() {
           Edge edge;
-          for (notifier()->first(edge); edge != INVALID; 
+          for (notifier()->first(edge); edge != INVALID;
                notifier()->next(edge)) {
             snapshot.eraseEdge(edge);
@@ -1449 +1449 @@
 
       void addNode(const Node& node) {
-        added_nodes.push_front(node);        
+        added_nodes.push_front(node);
       }
       void eraseNode(const Node& node) {
-        std::list<Node>::iterator it = 
+        std::list<Node>::iterator it =
           std::find(added_nodes.begin(), added_nodes.end(), node);
         if (it == added_nodes.end()) {
@@ -1464 +1464 @@
 
       void addEdge(const Edge& edge) {
-        added_edges.push_front(edge);        
+        added_edges.push_front(edge);
       }
       void eraseEdge(const Edge& edge) {
-        std::list<Edge>::iterator it = 
+        std::list<Edge>::iterator it =
           std::find(added_edges.begin(), added_edges.end(), edge);
         if (it == added_edges.end()) {
@@ -1479 +1479 @@
 
       void attach(ListGraph &_graph) {
-        graph = &_graph;
-        node_observer_proxy.attach(graph->notifier(Node()));
+        graph = &_graph;
+        node_observer_proxy.attach(graph->notifier(Node()));
         edge_observer_proxy.attach(graph->notifier(Edge()));
       }
-            
+
       void detach() {
-        node_observer_proxy.detach();
-        edge_observer_proxy.detach();
+        node_observer_proxy.detach();
+        edge_observer_proxy.detach();
       }
 
@@ -1495 +1495 @@
       void clear() {
         added_nodes.clear();
-        added_edges.clear();        
+        added_edges.clear();
       }
 
@@ -1504 +1504 @@
       /// Default constructor.
       /// To actually make a snapshot you must call save().
-      Snapshot() 
-        : graph(0), node_observer_proxy(*this), 
+      Snapshot()
+        : graph(0), node_observer_proxy(*this),
           edge_observer_proxy(*this) {}
-      
+
       /// \brief Constructor that immediately makes a snapshot.
-      ///      
+      ///
       /// This constructor immediately makes a snapshot of the graph.
       /// \param _graph The graph we make a snapshot of.
-      Snapshot(ListGraph &_graph) 
-        : node_observer_proxy(*this), 
+      Snapshot(ListGraph &_graph)
+        : node_observer_proxy(*this),
           edge_observer_proxy(*this) {
-        attach(_graph);
-      }
-      
+        attach(_graph);
+      }
+
       /// \brief Make a snapshot.
       ///
@@ -1532 +1532 @@
         attach(_graph);
       }
-      
+
       /// \brief Undo the changes until the last snapshot.
-      // 
+      //
       /// Undo the changes until the last snapshot created by save().
       void restore() {
-        detach();
-        for(std::list<Edge>::iterator it = added_edges.begin(); 
+        detach();
+        for(std::list<Edge>::iterator it = added_edges.begin();
             it != added_edges.end(); ++it) {
-          graph->erase(*it);
-        }
-        for(std::list<Node>::iterator it = added_nodes.begin(); 
+          graph->erase(*it);
+        }
+        for(std::list<Node>::iterator it = added_nodes.begin();
             it != added_nodes.end(); ++it) {
-          graph->erase(*it);
-        }
+          graph->erase(*it);
+        }
         clear();
       }
@@ -1557 +1557 @@
     };
   };
-  
-  /// @}  
+
+  /// @}
 } //namespace lemon
-  
+
 
 #endif

lemon/maps.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -405 +405 @@
       typename Map::iterator it = _map.lower_bound(k);
       if (it != _map.end() && !_map.key_comp()(k, it->first))
-        return it->second;
+        return it->second;
       else
-        return _map.insert(it, std::make_pair(k, _value))->second;
+        return _map.insert(it, std::make_pair(k, _value))->second;
     }
 
@@ -414 +414 @@
       typename Map::const_iterator it = _map.find(k);
       if (it != _map.end())
-        return it->second;
+        return it->second;
       else
-        return _value;
+        return _value;
     }
 
@@ -423 +423 @@
       typename Map::iterator it = _map.lower_bound(k);
       if (it != _map.end() && !_map.key_comp()(k, it->first))
-        it->second = v;
+        it->second = v;
       else
-        _map.insert(it, std::make_pair(k, v));
+        _map.insert(it, std::make_pair(k, v));
     }
 
@@ -545 +545 @@
   /// \todo Check the requirements.
   template<typename M1, typename M2, typename F,
-           typename V = typename F::result_type>
+           typename V = typename F::result_type>
   class CombineMap : public MapBase<typename M1::Key, V> {
     const M1 &_m1;
@@ -616 +616 @@
   /// \sa MapToFunctor
   template<typename F,
-           typename K = typename F::argument_type,
-           typename V = typename F::result_type>
+           typename K = typename F::argument_type,
+           typename V = typename F::result_type>
   class FunctorToMap : public MapBase<K, V> {
     F _f;
@@ -1318 +1318 @@
 
   /// @}
-  
+
   // Logical maps and map adaptors:
 
@@ -1716 +1716 @@
 #else
   template <typename It,
-            typename Ke=typename _maps_bits::IteratorTraits<It>::Value>
+            typename Ke=typename _maps_bits::IteratorTraits<It>::Value>
 #endif
   class LoggerBoolMap {
@@ -1742 +1742 @@
     void set(const Key& key, Value value) {
       if (value) {
-        *_end++ = key;
+        *_end++ = key;
       }
     }
@@ -1750 +1750 @@
     Iterator _end;
   };
-  
+
   /// Returns a \ref LoggerBoolMap class
 

lemon/math.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -34 +34 @@
   /// \addtogroup misc
   /// @{
-  
+
   /// The Euler constant
   const long double E       = 2.7182818284590452353602874713526625L;
@@ -55 +55 @@
   /// 1/sqrt(2)
   const long double SQRT1_2 = 0.7071067811865475244008443621048490L;
-  
+
 
   /// @}

lemon/path.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -94 +94 @@
       ArcIt(Invalid) : path(0), idx(-1) {}
       /// \brief Initializate the iterator to the first arc of path
-      ArcIt(const Path &_path) 
+      ArcIt(const Path &_path)
         : path(&_path), idx(_path.empty() ? -1 : 0) {}
 
     private:
 
-      ArcIt(const Path &_path, int _idx) 
+      ArcIt(const Path &_path, int _idx)
         : path(&_path), idx(_idx) {}
 
@@ -110 +110 @@
 
       /// \brief Next arc
-      ArcIt& operator++() { 
+      ArcIt& operator++() {
         ++idx;
-        if (idx >= path->length()) idx = -1; 
-        return *this; 
+        if (idx >= path->length()) idx = -1;
+        return *this;
       }
 
@@ -285 +285 @@
       ArcIt(Invalid) : path(0), idx(-1) {}
       /// \brief Initializate the constructor to the first arc of path
-      ArcIt(const SimplePath &_path) 
+      ArcIt(const SimplePath &_path)
         : path(&_path), idx(_path.empty() ? -1 : 0) {}
 
@@ -291 +291 @@
 
       /// Constructor with starting point
-      ArcIt(const SimplePath &_path, int _idx) 
+      ArcIt(const SimplePath &_path, int _idx)
         : idx(_idx), path(&_path) {}
 
@@ -302 +302 @@
 
       /// Next arc
-      ArcIt& operator++() { 
+      ArcIt& operator++() {
         ++idx;
-        if (idx >= path->length()) idx = -1; 
-        return *this; 
+        if (idx >= path->length()) idx = -1;
+        return *this;
       }
 
@@ -414 +414 @@
   protected:
 
-    // the std::list<> is incompatible 
+    // the std::list<> is incompatible
     // hard to create invalid iterator
     struct Node {
@@ -426 +426 @@
 
   public:
- 
+
     /// \brief Default constructor
     ///
@@ -471 +471 @@
       ArcIt(Invalid) : path(0), node(0) {}
       /// \brief Initializate the constructor to the first arc of path
-      ArcIt(const ListPath &_path) 
+      ArcIt(const ListPath &_path)
         : path(&_path), node(_path.first) {}
 
     protected:
 
-      ArcIt(const ListPath &_path, Node *_node) 
+      ArcIt(const ListPath &_path, Node *_node)
         : path(&_path), node(_node) {}
 
@@ -488 +488 @@
 
       /// Next arc
-      ArcIt& operator++() { 
+      ArcIt& operator++() {
         node = node->next;
-        return *this; 
+        return *this;
       }
 
@@ -758 +758 @@
     /// Default constructor
     StaticPath() : len(0), arcs(0) {}
-    
+
     /// \brief Template copy constructor
     ///
@@ -797 +797 @@
       ArcIt(Invalid) : path(0), idx(-1) {}
       /// Initializate the constructor to the first arc of path
-      ArcIt(const StaticPath &_path) 
+      ArcIt(const StaticPath &_path)
         : path(&_path), idx(_path.empty() ? -1 : 0) {}
 
@@ -803 +803 @@
 
       /// Constructor with starting point
-      ArcIt(const StaticPath &_path, int _idx) 
+      ArcIt(const StaticPath &_path, int _idx)
         : idx(_idx), path(&_path) {}
 
@@ -814 +814 @@
 
       /// Next arc
-      ArcIt& operator++() { 
+      ArcIt& operator++() {
         ++idx;
-        if (idx >= path->length()) idx = -1; 
-        return *this; 
+        if (idx >= path->length()) idx = -1;
+        return *this;
       }
 
@@ -910 +910 @@
     template <typename Path>
     struct RevPathTagIndicator<
-      Path, 
+      Path,
       typename enable_if<typename Path::RevPathTag, void>::type
       > {
@@ -923 +923 @@
     template <typename Path>
     struct BuildTagIndicator<
-      Path, 
+      Path,
       typename enable_if<typename Path::BuildTag, void>::type
     > {
@@ -930 +930 @@
 
     template <typename Target, typename Source,
-              bool buildEnable = BuildTagIndicator<Target>::value, 
-              bool revEnable = RevPathTagIndicator<Source>::value>
+              bool buildEnable = BuildTagIndicator<Target>::value,
+              bool revEnable = RevPathTagIndicator<Source>::value>
     struct PathCopySelector {
       static void copy(Target& target, const Source& source) {
@@ -982 +982 @@
   ///
   /// This function checks that the target of each arc is the same
-  /// as the source of the next one. 
-  /// 
+  /// as the source of the next one.
+  ///
   template <typename Digraph, typename Path>
   bool checkPath(const Digraph& digraph, const Path& path) {
@@ -1035 +1035 @@
     typedef typename Path::Digraph Digraph;
     typedef typename Digraph::Node Node;
-    
+
     /// Default constructor
     PathNodeIt() {}
     /// Invalid constructor
-    PathNodeIt(Invalid) 
+    PathNodeIt(Invalid)
       : _digraph(0), _it(INVALID), _nd(INVALID) {}
     /// Constructor
-    PathNodeIt(const Digraph& digraph, const Path& path) 
+    PathNodeIt(const Digraph& digraph, const Path& path)
       : _digraph(&digraph), _it(path) {
       _nd = (_it != INVALID ? _digraph->source(_it) : INVALID);
     }
     /// Constructor
-    PathNodeIt(const Digraph& digraph, const Path& path, const Node& src) 
+    PathNodeIt(const Digraph& digraph, const Path& path, const Node& src)
       : _digraph(&digraph), _it(path), _nd(src) {}
 
@@ -1059 +1059 @@
       if (_it == INVALID) _nd = INVALID;
       else {
-        _nd = _digraph->target(_it);
-        ++_it;
+        _nd = _digraph->target(_it);
+        ++_it;
       }
       return *this;
@@ -1066 +1066 @@
 
     /// Comparison operator
-    bool operator==(const PathNodeIt& n) const { 
-      return _it == n._it && _nd == n._nd; 
+    bool operator==(const PathNodeIt& n) const {
+      return _it == n._it && _nd == n._nd;
     }
     /// Comparison operator
-    bool operator!=(const PathNodeIt& n) const { 
-      return _it != n._it || _nd != n._nd; 
+    bool operator!=(const PathNodeIt& n) const {
+      return _it != n._it || _nd != n._nd;
     }
     /// Comparison operator
-    bool operator<(const PathNodeIt& n) const { 
+    bool operator<(const PathNodeIt& n) const {
       return (_it < n._it && _nd != INVALID);
     }
-    
+
   };
-  
+
   ///@}
 

lemon/random.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008

lemon/random.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -22 +22 @@
  *
  * See the appropriate copyright notice below.
- * 
+ *
  * Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
- * All rights reserved.                          
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37 +37 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * 3. The names of its contributors may not be used to endorse or promote 
- *    products derived from this software without specific prior written 
+ * 3. The names of its contributors may not be used to endorse or promote
+ *    products derived from this software without specific prior written
  *    permission.
  *
@@ -88 +88 @@
 
   namespace _random_bits {
-    
+
     template <typename _Word, int _bits = std::numeric_limits<_Word>::digits>
     struct RandomTraits {};
@@ -100 +100 @@
       static const int length = 624;
       static const int shift = 397;
-      
+
       static const Word mul = 0x6c078965u;
       static const Word arrayInit = 0x012BD6AAu;
@@ -168 +168 @@
           0x12345u, 0x23456u, 0x34567u, 0x45678u
         };
-    
+
         initState(seedArray, seedArray + 4);
       }
@@ -176 +176 @@
         static const Word mul = RandomTraits<Word>::mul;
 
-        current = state; 
+        current = state;
 
         Word *curr = state + length - 1;
@@ -202 +202 @@
         num = length > end - begin ? length : end - begin;
         while (num--) {
-          curr[0] = (curr[0] ^ ((curr[1] ^ (curr[1] >> (bits - 2))) * mul1)) 
+          curr[0] = (curr[0] ^ ((curr[1] ^ (curr[1] >> (bits - 2))) * mul1))
             + *it + cnt;
           ++it; ++cnt;
@@ -224 +224 @@
           }
         }
-        
+
         state[length - 1] = Word(1) << (bits - 1);
       }
-      
+
       void copyState(const RandomCore& other) {
         std::copy(other.state, other.state + length, state);
@@ -242 +242 @@
     private:
 
-  
+
       void fillState() {
         static const Word mask[2] = { 0x0ul, RandomTraits<Word>::mask };
@@ -248 +248 @@
         static const Word hiMask = RandomTraits<Word>::hiMask;
 
-        current = state + length; 
+        current = state + length;
 
         register Word *curr = state + length - 1;
         register long num;
-      
+
         num = length - shift;
         while (num--) {
@@ -270 +270 @@
       }
 
-  
+
       Word *current;
       Word state[length];
-      
-    };
-
-
-    template <typename Result, 
+
+    };
+
+
+    template <typename Result,
               int shift = (std::numeric_limits<Result>::digits + 1) / 2>
     struct Masker {
@@ -285 +285 @@
       }
     };
-    
+
     template <typename Result>
     struct Masker<Result, 1> {
@@ -293 +293 @@
     };
 
-    template <typename Result, typename Word, 
-              int rest = std::numeric_limits<Result>::digits, int shift = 0, 
+    template <typename Result, typename Word,
+              int rest = std::numeric_limits<Result>::digits, int shift = 0,
               bool last = rest <= std::numeric_limits<Word>::digits>
     struct IntConversion {
       static const int bits = std::numeric_limits<Word>::digits;
-    
+
       static Result convert(RandomCore<Word>& rnd) {
         return static_cast<Result>(rnd() >> (bits - rest)) << shift;
       }
-      
-    }; 
-
-    template <typename Result, typename Word, int rest, int shift> 
+
+    };
+
+    template <typename Result, typename Word, int rest, int shift>
     struct IntConversion<Result, Word, rest, shift, false> {
       static const int bits = std::numeric_limits<Word>::digits;
 
       static Result convert(RandomCore<Word>& rnd) {
-        return (static_cast<Result>(rnd()) << shift) | 
+        return (static_cast<Result>(rnd()) << shift) |
           IntConversion<Result, Word, rest - bits, shift + bits>::convert(rnd);
       }
@@ -317 +317 @@
 
     template <typename Result, typename Word,
-              bool one_word = (std::numeric_limits<Word>::digits < 
-                               std::numeric_limits<Result>::digits) >
+              bool one_word = (std::numeric_limits<Word>::digits <
+                               std::numeric_limits<Result>::digits) >
     struct Mapping {
       static Result map(RandomCore<Word>& rnd, const Result& bound) {
@@ -325 +325 @@
         Result num;
         do {
-          num = IntConversion<Result, Word>::convert(rnd) & mask; 
+          num = IntConversion<Result, Word>::convert(rnd) & mask;
         } while (num > max);
         return num;
@@ -351 +351 @@
         res *= res;
         if ((exp & 1) == 1) res *= static_cast<Result>(2.0);
-        return res; 
+        return res;
       }
     };
@@ -361 +361 @@
         res *= res;
         if ((exp & 1) == 1) res *= static_cast<Result>(0.5);
-        return res; 
+        return res;
       }
     };
@@ -368 +368 @@
     struct ShiftMultiplier<Result, 0, true> {
       static const Result multiplier() {
-        return static_cast<Result>(1.0); 
+        return static_cast<Result>(1.0);
       }
     };
@@ -375 +375 @@
     struct ShiftMultiplier<Result, -20, true> {
       static const Result multiplier() {
-        return static_cast<Result>(1.0/1048576.0); 
-      }
-    };
-    
+        return static_cast<Result>(1.0/1048576.0);
+      }
+    };
+
     template <typename Result>
     struct ShiftMultiplier<Result, -32, true> {
       static const Result multiplier() {
-        return static_cast<Result>(1.0/424967296.0); 
+        return static_cast<Result>(1.0/424967296.0);
       }
     };
@@ -389 +389 @@
     struct ShiftMultiplier<Result, -53, true> {
       static const Result multiplier() {
-        return static_cast<Result>(1.0/9007199254740992.0); 
+        return static_cast<Result>(1.0/9007199254740992.0);
       }
     };
@@ -396 +396 @@
     struct ShiftMultiplier<Result, -64, true> {
       static const Result multiplier() {
-        return static_cast<Result>(1.0/18446744073709551616.0); 
+        return static_cast<Result>(1.0/18446744073709551616.0);
       }
     };
@@ -408 +408 @@
 
     template <typename Result, typename Word,
-              int rest = std::numeric_limits<Result>::digits, int shift = 0, 
+              int rest = std::numeric_limits<Result>::digits, int shift = 0,
               bool last = rest <= std::numeric_limits<Word>::digits>
-    struct RealConversion{ 
+    struct RealConversion{
       static const int bits = std::numeric_limits<Word>::digits;
 
@@ -420 +420 @@
 
     template <typename Result, typename Word, int rest, int shift>
-    struct RealConversion<Result, Word, rest, shift, false> { 
+    struct RealConversion<Result, Word, rest, shift, false> {
       static const int bits = std::numeric_limits<Word>::digits;
 
@@ -459 +459 @@
       Word buffer;
       int num;
-      
+
       BoolProducer() : num(0) {}
 
@@ -530 +530 @@
     // Architecture word
     typedef unsigned long Word;
-    
+
     _random_bits::RandomCore<Word> core;
     _random_bits::BoolProducer<Word> bool_producer;
-    
+
 
   public:
@@ -555 +555 @@
     /// to the architecture word type.
     template <typename Number>
-    Random(Number seed) { 
+    Random(Number seed) {
       _random_bits::Initializer<Number, Word>::init(core, seed);
     }
@@ -565 +565 @@
     /// architecture word type.
     template <typename Iterator>
-    Random(Iterator begin, Iterator end) { 
+    Random(Iterator begin, Iterator end) {
       typedef typename std::iterator_traits<Iterator>::value_type Number;
       _random_bits::Initializer<Number, Word>::init(core, begin, end);
@@ -598 +598 @@
     /// converted to the architecture word type.
     template <typename Number>
-    void seed(Number seed) { 
+    void seed(Number seed) {
       _random_bits::Initializer<Number, Word>::init(core, seed);
     }
@@ -608 +608 @@
     /// architecture word type.
     template <typename Iterator>
-    void seed(Iterator begin, Iterator end) { 
+    void seed(Iterator begin, Iterator end) {
       typedef typename std::iterator_traits<Iterator>::value_type Number;
       _random_bits::Initializer<Number, Word>::init(core, begin, end);
@@ -626 +626 @@
       return false;
     }
-    
+
     /// \brief Seeding from file
     ///
@@ -641 +641 @@
     /// \return True when the seeding successes.
 #ifndef WIN32
-    bool seedFromFile(const std::string& file = "/dev/urandom", int offset = 0) 
+    bool seedFromFile(const std::string& file = "/dev/urandom", int offset = 0)
 #else
-    bool seedFromFile(const std::string& file = "", int offset = 0) 
+    bool seedFromFile(const std::string& file = "", int offset = 0)
 #endif
     {
@@ -661 +661 @@
     /// random sequence.
     /// \return Currently always true.
-    bool seedFromTime() {       
+    bool seedFromTime() {
 #ifndef WIN32
       timeval tv;
@@ -697 +697 @@
     /// It returns a random real number from the range [0, b).
     template <typename Number>
-    Number real(Number b) { 
-      return real<Number>() * b; 
+    Number real(Number b) {
+      return real<Number>() * b;
     }
 
@@ -705 +705 @@
     /// It returns a random real number from the range [a, b).
     template <typename Number>
-    Number real(Number a, Number b) { 
-      return real<Number>() * (b - a) + a; 
+    Number real(Number a, Number b) {
+      return real<Number>() * (b - a) + a;
     }
 
@@ -726 +726 @@
     /// It returns a random real number from the range [0, b).
     template <typename Number>
-    Number operator()(Number b) { 
-      return real<Number>() * b; 
+    Number operator()(Number b) {
+      return real<Number>() * b;
     }
 
@@ -734 +734 @@
     /// It returns a random real number from the range [a, b).
     template <typename Number>
-    Number operator()(Number a, Number b) { 
-      return real<Number>() * (b - a) + a; 
+    Number operator()(Number a, Number b) {
+      return real<Number>() * (b - a) + a;
     }
 
@@ -785 +785 @@
     template <typename Number>
     Number integer() {
-      static const int nb = std::numeric_limits<Number>::digits + 
+      static const int nb = std::numeric_limits<Number>::digits +
         (std::numeric_limits<Number>::is_signed ? 1 : 0);
       return _random_bits::IntConversion<Number, Word, nb>::convert(core);
@@ -793 +793 @@
       return integer<int>();
     }
-    
+
     /// \brief Returns a random bool
     ///
@@ -807 +807 @@
     ///\name Non-uniform distributions
     ///
-    
+
     ///@{
-    
+
     /// \brief Returns a random bool
     ///
@@ -823 +823 @@
     /// transformation is used to generate a random normal distribution.
     /// \todo Consider using the "ziggurat" method instead.
-    double gauss() 
+    double gauss()
     {
       double V1,V2,S;
       do {
-        V1=2*real<double>()-1;
-        V2=2*real<double>()-1;
-        S=V1*V1+V2*V2;
+        V1=2*real<double>()-1;
+        V2=2*real<double>()-1;
+        S=V1*V1+V2*V2;
       } while(S>=1);
       return std::sqrt(-2*std::log(S)/S)*V1;
@@ -855 +855 @@
 
     /// This function generates a gamma distribution random number.
-    /// 
+    ///
     ///\param k shape parameter (<tt>k>0</tt> integer)
-    double gamma(int k) 
+    double gamma(int k)
     {
       double s = 0;
@@ -863 +863 @@
       return s;
     }
-    
+
     /// Gamma distribution with given shape and scale parameter
 
     /// This function generates a gamma distribution random number.
-    /// 
+    ///
     ///\param k shape parameter (<tt>k>0</tt>)
     ///\param theta scale parameter
@@ -877 +877 @@
       const double v0=E/(E-delta);
       do {
-        double V0=1.0-real<double>();
-        double V1=1.0-real<double>();
-        double V2=1.0-real<double>();
-        if(V2<=v0) 
-          {
-            xi=std::pow(V1,1.0/delta);
-            nu=V0*std::pow(xi,delta-1.0);
-          }
-        else 
-          {
-            xi=1.0-std::log(V1);
-            nu=V0*std::exp(-xi);
-          }
+        double V0=1.0-real<double>();
+        double V1=1.0-real<double>();
+        double V2=1.0-real<double>();
+        if(V2<=v0)
+          {
+            xi=std::pow(V1,1.0/delta);
+            nu=V0*std::pow(xi,delta-1.0);
+          }
+        else
+          {
+            xi=1.0-std::log(V1);
+            nu=V0*std::exp(-xi);
+          }
       } while(nu>std::pow(xi,delta-1.0)*std::exp(-xi));
       return theta*(xi+gamma(int(std::floor(k))));
     }
-    
+
     /// Weibull distribution
 
     /// This function generates a Weibull distribution random number.
-    /// 
+    ///
     ///\param k shape parameter (<tt>k>0</tt>)
     ///\param lambda scale parameter (<tt>lambda>0</tt>)
@@ -904 +904 @@
     {
       return lambda*pow(-std::log(1.0-real<double>()),1.0/k);
-    }  
-      
+    }
+
     /// Pareto distribution
 
     /// This function generates a Pareto distribution random number.
-    /// 
+    ///
     ///\param k shape parameter (<tt>k>0</tt>)
     ///\param x_min location parameter (<tt>x_min>0</tt>)
@@ -916 +916 @@
     {
       return exponential(gamma(k,1.0/x_min))+x_min;
-    }  
-      
+    }
+
     /// Poisson distribution
 
     /// This function generates a Poisson distribution random number with
     /// parameter \c lambda.
-    /// 
+    ///
     /// The probability mass function of this distribusion is
     /// \f[ \frac{e^{-\lambda}\lambda^k}{k!} \f]
@@ -928 +928 @@
     /// ''Seminumerical Algorithms'' (1969). Its running time is linear in the
     /// return value.
-    
+
     int poisson(double lambda)
     {
@@ -935 +935 @@
       double p = 1.0;
       do {
-        k++;
-        p*=real<double>();
+        k++;
+        p*=real<double>();
       } while (p>=l);
       return k-1;
-    }  
-      
+    }
+
     ///@}
-    
+
     ///\name Two dimensional distributions
     ///
 
     ///@{
-    
+
     /// Uniform distribution on the full unit circle
 
     /// Uniform distribution on the full unit circle.
     ///
-    dim2::Point<double> disc() 
+    dim2::Point<double> disc()
     {
       double V1,V2;
       do {
-        V1=2*real<double>()-1;
-        V2=2*real<double>()-1;
-        
+        V1=2*real<double>()-1;
+        V2=2*real<double>()-1;
+
       } while(V1*V1+V2*V2>=1);
       return dim2::Point<double>(V1,V2);
@@ -974 +974 @@
       double V1,V2,S;
       do {
-        V1=2*real<double>()-1;
-        V2=2*real<double>()-1;
-        S=V1*V1+V2*V2;
+        V1=2*real<double>()-1;
+        V2=2*real<double>()-1;
+        S=V1*V1+V2*V2;
       } while(S>=1);
       double W=std::sqrt(-2*std::log(S)/S);
@@ -985 +985 @@
     /// This function provides a turning symmetric two-dimensional distribution.
     /// The x-coordinate is of conditionally exponential distribution
-    /// with the condition that x is positive and y=0. If x is negative and 
+    /// with the condition that x is positive and y=0. If x is negative and
     /// y=0 then, -x is of exponential distribution. The same is true for the
     /// y-coordinate.
-    dim2::Point<double> exponential2() 
+    dim2::Point<double> exponential2()
     {
       double V1,V2,S;
       do {
-        V1=2*real<double>()-1;
-        V2=2*real<double>()-1;
-        S=V1*V1+V2*V2;
+        V1=2*real<double>()-1;
+        V2=2*real<double>()-1;
+        S=V1*V1+V2*V2;
       } while(S>=1);
       double W=-std::log(S)/S;
@@ -1000 +1000 @@
     }
 
-    ///@}    
+    ///@}
   };
 

lemon/smart_graph.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -46 +46 @@
   protected:
 
-    struct NodeT 
+    struct NodeT
     {
-      int first_in, first_out;      
+      int first_in, first_out;
       NodeT() {}
     };
-    struct ArcT 
+    struct ArcT
     {
-      int target, source, next_in, next_out;      
-      ArcT() {}  
+      int target, source, next_in, next_out;
+      ArcT() {}
     };
 
     std::vector<NodeT> nodes;
     std::vector<ArcT> arcs;
-        
+
   public:
 
@@ -70 +70 @@
 
     SmartDigraphBase() : nodes(), arcs() { }
-    SmartDigraphBase(const SmartDigraphBase &_g) 
+    SmartDigraphBase(const SmartDigraphBase &_g)
       : nodes(_g.nodes), arcs(_g.arcs) { }
-    
+
     typedef True NodeNumTag;
     typedef True EdgeNumTag;
@@ -83 +83 @@
 
     Node addNode() {
-      int n = nodes.size();     
+      int n = nodes.size();
       nodes.push_back(NodeT());
       nodes[n].first_in = -1;
@@ -89 +89 @@
       return Node(n);
     }
-    
+
     Arc addArc(Node u, Node v) {
-      int n = arcs.size(); 
+      int n = arcs.size();
       arcs.push_back(ArcT());
-      arcs[n].source = u._id; 
+      arcs[n].source = u._id;
       arcs[n].target = v._id;
       arcs[n].next_out = nodes[u._id].first_out;
@@ -116 +116 @@
     static Arc arcFromId(int id) { return Arc(id);}
 
-    bool valid(Node n) const { 
-      return n._id >= 0 && n._id < static_cast<int>(nodes.size()); 
-    }
-    bool valid(Arc a) const { 
-      return a._id >= 0 && a._id < static_cast<int>(arcs.size()); 
+    bool valid(Node n) const {
+      return n._id >= 0 && n._id < static_cast<int>(nodes.size());
+    }
+    bool valid(Arc a) const {
+      return a._id >= 0 && a._id < static_cast<int>(arcs.size());
     }
 
@@ -137 +137 @@
       bool operator<(const Node i) const {return _id < i._id;}
     };
-    
+
 
     class Arc {
@@ -181 +181 @@
       arc._id = nodes[node._id].first_in;
     }
-    
+
     void nextIn(Arc& arc) const {
       arc._id = arcs[arc._id].next_in;
@@ -223 +223 @@
 
   public:
-    
+
     /// Constructor
-    
+
     /// Constructor.
     ///
     SmartDigraph() {};
-    
+
     ///Add a new node to the digraph.
-    
+
     /// \return the new node.
     ///
     Node addNode() { return Parent::addNode(); }
-    
+
     ///Add a new arc to the digraph.
-    
+
     ///Add a new arc to the digraph with source node \c s
     ///and target node \c t.
     ///\return the new arc.
-    Arc addArc(const Node& s, const Node& t) { 
-      return Parent::addArc(s, t); 
+    Arc addArc(const Node& s, const Node& t) {
+      return Parent::addArc(s, t);
     }
 
@@ -270 +270 @@
     ///
     /// This function gives back true if the given node is valid,
-    /// ie. it is a real node of the graph.  
+    /// ie. it is a real node of the graph.
     ///
     /// \warning A removed node (using Snapshot) could become valid again
@@ -279 +279 @@
     ///
     /// This function gives back true if the given arc is valid,
-    /// ie. it is a real arc of the graph.  
+    /// ie. it is a real arc of the graph.
     ///
     /// \warning A removed arc (using Snapshot) could become valid again
@@ -286 +286 @@
 
     ///Clear the digraph.
-    
+
     ///Erase all the nodes and arcs from the digraph.
     ///
@@ -294 +294 @@
 
     ///Split a node.
-    
+
     ///This function splits a node. First a new node is added to the digraph,
     ///then the source of each outgoing arc of \c n is moved to this new node.
@@ -319 +319 @@
 
   public:
-    
+
     class Snapshot;
 
@@ -328 +328 @@
       while(s.arc_num<arcs.size()) {
         Arc arc = arcFromId(arcs.size()-1);
-        Parent::notifier(Arc()).erase(arc);
-        nodes[arcs.back().source].first_out=arcs.back().next_out;
-        nodes[arcs.back().target].first_in=arcs.back().next_in;
-        arcs.pop_back();
+        Parent::notifier(Arc()).erase(arc);
+        nodes[arcs.back().source].first_out=arcs.back().next_out;
+        nodes[arcs.back().target].first_in=arcs.back().next_in;
+        arcs.pop_back();
       }
       while(s.node_num<nodes.size()) {
         Node node = nodeFromId(nodes.size()-1);
-        Parent::notifier(Node()).erase(node);
-        nodes.pop_back();
-      }
-    }    
+        Parent::notifier(Node()).erase(node);
+        nodes.pop_back();
+      }
+    }
 
   public:
@@ -356 +356 @@
     ///not the restored digraph or no change. Because the runtime performance
     ///the validity of the snapshot is not stored.
-    class Snapshot 
+    class Snapshot
     {
       SmartDigraph *_graph;
@@ -365 +365 @@
     public:
       ///Default constructor.
-      
+
       ///Default constructor.
       ///To actually make a snapshot you must call save().
@@ -371 +371 @@
       Snapshot() : _graph(0) {}
       ///Constructor that immediately makes a snapshot
-      
+
       ///This constructor immediately makes a snapshot of the digraph.
       ///\param _g The digraph we make a snapshot of.
       Snapshot(SmartDigraph &graph) : _graph(&graph) {
-        node_num=_graph->nodes.size();
-        arc_num=_graph->arcs.size();
+        node_num=_graph->nodes.size();
+        arc_num=_graph->arcs.size();
       }
 
@@ -386 +386 @@
       ///call, the previous snapshot gets lost.
       ///\param _g The digraph we make the snapshot of.
-      void save(SmartDigraph &graph) 
+      void save(SmartDigraph &graph)
       {
-        _graph=&graph;
-        node_num=_graph->nodes.size();
-        arc_num=_graph->arcs.size();
+        _graph=&graph;
+        node_num=_graph->nodes.size();
+        arc_num=_graph->arcs.size();
       }
 
       ///Undo the changes until a snapshot.
-      
+
       ///Undo the changes until a snapshot created by save().
       ///
@@ -402 +402 @@
       void restore()
       {
-        _graph->restoreSnapshot(*this);
+        _graph->restoreSnapshot(*this);
       }
     };
@@ -415 +415 @@
       int first_out;
     };
- 
+
     struct ArcT {
       int target;
@@ -425 +425 @@
 
     int first_free_arc;
-    
-  public:
-    
+
+  public:
+
     typedef SmartGraphBase Digraph;
 
@@ -433 +433 @@
     class Arc;
     class Edge;
-    
+
     class Node {
       friend class SmartGraphBase;
@@ -486 +486 @@
       : nodes(), arcs() {}
 
-    
-    int maxNodeId() const { return nodes.size()-1; } 
+
+    int maxNodeId() const { return nodes.size()-1; }
     int maxEdgeId() const { return arcs.size() / 2 - 1; }
     int maxArcId() const { return arcs.size()-1; }
@@ -505 +505 @@
     }
 
-    void first(Node& node) const { 
+    void first(Node& node) const {
       node._id = nodes.size() - 1;
     }
@@ -513 +513 @@
     }
 
-    void first(Arc& arc) const { 
+    void first(Arc& arc) const {
       arc._id = arcs.size() - 1;
     }
@@ -521 +521 @@
     }
 
-    void first(Edge& arc) const { 
+    void first(Edge& arc) const {
       arc._id = arcs.size() / 2 - 1;
     }
@@ -562 +562 @@
       } else {
         arc._id = -1;
-        d = true;      
-      }
-    }
-    
+        d = true;
+      }
+    }
+
     static int id(Node v) { return v._id; }
     static int id(Arc e) { return e._id; }
@@ -574 +574 @@
     static Edge edgeFromId(int id) { return Edge(id);}
 
-    bool valid(Node n) const { 
-      return n._id >= 0 && n._id < static_cast<int>(nodes.size()); 
-    }
-    bool valid(Arc a) const { 
+    bool valid(Node n) const {
+      return n._id >= 0 && n._id < static_cast<int>(nodes.size());
+    }
+    bool valid(Arc a) const {
       return a._id >= 0 && a._id < static_cast<int>(arcs.size());
     }
-    bool valid(Edge e) const { 
-      return e._id >= 0 && 2 * e._id < static_cast<int>(arcs.size()); 
-    }
-
-    Node addNode() {     
+    bool valid(Edge e) const {
+      return e._id >= 0 && 2 * e._id < static_cast<int>(arcs.size());
+    }
+
+    Node addNode() {
       int n = nodes.size();
       nodes.push_back(NodeT());
       nodes[n].first_out = -1;
-      
+
       return Node(n);
     }
-    
+
     Edge addEdge(Node u, Node v) {
       int n = arcs.size();
       arcs.push_back(ArcT());
       arcs.push_back(ArcT());
-      
+
       arcs[n].target = u._id;
       arcs[n | 1].target = v._id;
@@ -603 +603 @@
       nodes[v._id].first_out = n;
 
-      arcs[n | 1].next_out = nodes[u._id].first_out;    
+      arcs[n | 1].next_out = nodes[u._id].first_out;
       nodes[u._id].first_out = (n | 1);
 
       return Edge(n / 2);
     }
-    
+
     void clear() {
       arcs.clear();
@@ -626 +626 @@
   /// that <b> it does support only limited (only stack-like)
   /// node and arc deletions</b>.
-  /// Except from this it conforms to 
+  /// Except from this it conforms to
   /// the \ref concepts::Graph "Graph concept".
   ///
@@ -656 +656 @@
 
     /// Constructor
-    
+
     /// Constructor.
     ///
@@ -662 +662 @@
 
     ///Add a new node to the graph.
-    
+
     /// \return the new node.
     ///
     Node addNode() { return Parent::addNode(); }
-    
+
     ///Add a new edge to the graph.
-    
+
     ///Add a new edge to the graph with node \c s
     ///and \c t.
     ///\return the new edge.
-    Edge addEdge(const Node& s, const Node& t) { 
-      return Parent::addEdge(s, t); 
+    Edge addEdge(const Node& s, const Node& t) {
+      return Parent::addEdge(s, t);
     }
 
@@ -679 +679 @@
     ///
     /// This function gives back true if the given node is valid,
-    /// ie. it is a real node of the graph.  
+    /// ie. it is a real node of the graph.
     ///
     /// \warning A removed node (using Snapshot) could become valid again
@@ -688 +688 @@
     ///
     /// This function gives back true if the given arc is valid,
-    /// ie. it is a real arc of the graph.  
+    /// ie. it is a real arc of the graph.
     ///
     /// \warning A removed arc (using Snapshot) could become valid again
@@ -697 +697 @@
     ///
     /// This function gives back true if the given edge is valid,
-    /// ie. it is a real edge of the graph.  
+    /// ie. it is a real edge of the graph.
     ///
     /// \warning A removed edge (using Snapshot) could become valid again
@@ -704 +704 @@
 
     ///Clear the graph.
-    
+
     ///Erase all the nodes and edges from the graph.
     ///
@@ -712 +712 @@
 
   public:
-    
+
     class Snapshot;
 
@@ -729 +729 @@
         int n=arcs.size()-1;
         Edge arc=edgeFromId(n/2);
-        Parent::notifier(Edge()).erase(arc);
+        Parent::notifier(Edge()).erase(arc);
         std::vector<Arc> dir;
         dir.push_back(arcFromId(n));
         dir.push_back(arcFromId(n-1));
-        Parent::notifier(Arc()).erase(dir);
-        nodes[arcs[n].target].first_out=arcs[n].next_out;
-        nodes[arcs[n-1].target].first_out=arcs[n-1].next_out;
-        arcs.pop_back();
-        arcs.pop_back();
+        Parent::notifier(Arc()).erase(dir);
+        nodes[arcs[n].target].first_out=arcs[n].next_out;
+        nodes[arcs[n-1].target].first_out=arcs[n-1].next_out;
+        arcs.pop_back();
+        arcs.pop_back();
       }
       while(s.node_num<nodes.size()) {
         int n=nodes.size()-1;
         Node node = nodeFromId(n);
-        Parent::notifier(Node()).erase(node);
-        nodes.pop_back();
-      }
-    }    
+        Parent::notifier(Node()).erase(node);
+        nodes.pop_back();
+      }
+    }
 
   public:
@@ -764 +764 @@
     ///not the restored digraph or no change. Because the runtime performance
     ///the validity of the snapshot is not stored.
-    class Snapshot 
+    class Snapshot
     {
       SmartGraph *_graph;
@@ -773 +773 @@
     public:
       ///Default constructor.
-      
+
       ///Default constructor.
       ///To actually make a snapshot you must call save().
@@ -779 +779 @@
       Snapshot() : _graph(0) {}
       ///Constructor that immediately makes a snapshot
-      
+
       ///This constructor immediately makes a snapshot of the digraph.
       ///\param g The digraph we make a snapshot of.
@@ -793 +793 @@
       ///call, the previous snapshot gets lost.
       ///\param g The digraph we make the snapshot of.
-      void save(SmartGraph &graph) 
+      void save(SmartGraph &graph)
       {
         graph.saveSnapshot(*this);
@@ -799 +799 @@
 
       ///Undo the changes until a snapshot.
-      
+
       ///Undo the changes until a snapshot created by save().
       ///
@@ -811 +811 @@
     };
   };
-  
+
 } //namespace lemon
 

lemon/time_measure.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -65 +65 @@
     double cstime;
     double rtime;
-  
-    void _reset() { 
+
+    void _reset() {
       utime = stime = cutime = cstime = rtime = 0;
     }
@@ -97 +97 @@
       FILETIME create, exit, kernel, user;
       if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) {
-        utime = ch * user.dwHighDateTime + cl * user.dwLowDateTime;
-        stime = ch * kernel.dwHighDateTime + cl * kernel.dwLowDateTime;
-        cutime = 0;
-        cstime = 0;
+        utime = ch * user.dwHighDateTime + cl * user.dwLowDateTime;
+        stime = ch * kernel.dwHighDateTime + cl * kernel.dwLowDateTime;
+        cutime = 0;
+        cstime = 0;
       } else {
-        rtime = 0;
-        utime = 0;
-        stime = 0;
-        cutime = 0;
-        cstime = 0;
+        rtime = 0;
+        utime = 0;
+        stime = 0;
+        cutime = 0;
+        cstime = 0;
       }
-#endif      
-    }
-  
+#endif
+    }
+
     /// Constructor initializing with zero
     TimeStamp()
@@ -116 +116 @@
     ///Constructor initializing with the current time values of the process
     TimeStamp(void *) { stamp();}
-  
+
     ///Set every time value to zero
     TimeStamp &reset() {_reset();return *this;}
@@ -191 +191 @@
       return t-*this;
     }
-  
+
     friend std::ostream& operator<<(std::ostream& os,const TimeStamp &t);
-  
+
     ///Gives back the user time of the process
     double userTime() const
@@ -206 +206 @@
     ///Gives back the user time of the process' children
 
-    ///\note On <tt>WIN32</tt> platform this value is not calculated. 
+    ///\note On <tt>WIN32</tt> platform this value is not calculated.
     ///
     double cUserTime() const
@@ -214 +214 @@
     ///Gives back the user time of the process' children
 
-    ///\note On <tt>WIN32</tt> platform this value is not calculated. 
+    ///\note On <tt>WIN32</tt> platform this value is not calculated.
     ///
     double cSystemTime() const
@@ -224 +224 @@
   };
 
-  TimeStamp operator*(double b,const TimeStamp &t) 
+  TimeStamp operator*(double b,const TimeStamp &t)
   {
     return t*b;
   }
-  
+
   ///Prints the time counters
 
@@ -300 +300 @@
     TimeStamp start_time; //This is the relativ start-time if the timer
                           //is _running, the collected _running time otherwise.
-    
+
     void _reset() {if(_running) start_time.stamp(); else start_time.reset();}
-  
-  public: 
+
+  public:
     ///Constructor.
 
@@ -332 +332 @@
 
     ///Start the time counters
-    
+
     ///This function starts the time counters.
     ///
@@ -338 +338 @@
     ///until the same amount of \ref stop() is called.
     ///\sa stop()
-    void start() 
+    void start()
     {
       if(_running) _running++;
       else {
-        _running=1;
-        TimeStamp t;
-        t.stamp();
-        start_time=t-start_time;
+        _running=1;
+        TimeStamp t;
+        t.stamp();
+        start_time=t-start_time;
       }
     }
 
-    
+
     ///Stop the time counters
 
@@ -355 +355 @@
     ///once, then the same number of stop() execution is necessary the really
     ///stop the timer.
-    /// 
+    ///
     ///\sa halt()
     ///\sa start()
@@ -361 +361 @@
     ///\sa reset()
 
-    void stop() 
+    void stop()
     {
       if(_running && !--_running) {
-        TimeStamp t;
-        t.stamp();
-        start_time=t-start_time;
+        TimeStamp t;
+        t.stamp();
+        start_time=t-start_time;
       }
     }
@@ -384 +384 @@
     ///\sa reset()
 
-    void halt() 
+    void halt()
     {
       if(_running) {
-        _running=0;
-        TimeStamp t;
-        t.stamp();
-        start_time=t-start_time;
+        _running=0;
+        TimeStamp t;
+        t.stamp();
+        start_time=t-start_time;
       }
     }
@@ -403 +403 @@
     ///zero).
     int running()  { return _running; }
-    
-    
+
+
     ///Restart the time counters
 
@@ -410 +410 @@
     ///a reset() and a start() calls.
     ///
-    void restart() 
+    void restart()
     {
       reset();
       start();
     }
-    
+
     ///@}
 
@@ -434 +434 @@
     ///Gives back the ellapsed user time of the process' children
 
-    ///\note On <tt>WIN32</tt> platform this value is not calculated. 
+    ///\note On <tt>WIN32</tt> platform this value is not calculated.
     ///
     double cUserTime() const
@@ -442 +442 @@
     ///Gives back the ellapsed user time of the process' children
 
-    ///\note On <tt>WIN32</tt> platform this value is not calculated. 
+    ///\note On <tt>WIN32</tt> platform this value is not calculated.
     ///
     double cSystemTime() const
@@ -488 +488 @@
   ///\sa NoTimeReport
   ///\todo There is no test case for this
-  class TimeReport : public Timer 
+  class TimeReport : public Timer
   {
     std::string _title;
@@ -499 +499 @@
     ///\param run Sets whether the timer should start immediately.
 
-    TimeReport(std::string title,std::ostream &os=std::cerr,bool run=true) 
+    TimeReport(std::string title,std::ostream &os=std::cerr,bool run=true)
       : Timer(run), _title(title), _os(os){}
     ///\e Prints the ellapsed time on destruction.
-    ~TimeReport() 
+    ~TimeReport()
     {
       _os << _title << *this << std::endl;
     }
   };
-      
+
   ///'Do nothing' version of \ref TimeReport
 
@@ -528 +528 @@
     void start() {}
     void stop() {}
-    void halt() {} 
+    void halt() {}
     int running() { return 0; }
     void restart() {}
@@ -537 +537 @@
     double realTime() const { return 0; }
   };
-      
+
   ///Tool to measure the running time more exactly.
-  
+
   ///This function calls \c f several times and returns the average
   ///running time. The number of the executions will be choosen in such a way
@@ -551 +551 @@
   ///        total running time will be written into <tt>*full_time</tt>.
   ///\return The average running time of \c f.
-  
+
   template<class F>
   TimeStamp runningTimeTest(F f,double min_time=10,unsigned int *num = NULL,
@@ -567 +567 @@
     return full/total;
   }
-  
-  /// @}  
+
+  /// @}
 
 

lemon/tolerance.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -32 +32 @@
   /// \addtogroup misc
   /// @{
-  
+
   ///\brief A class to provide a basic way to
   ///handle the comparison of numbers that are obtained
@@ -41 +41 @@
   ///as a result of a probably inexact computation.
   ///
-  ///This is an abstract class, it should be specialized for all 
-  ///numerical data types. These specialized classes like 
+  ///This is an abstract class, it should be specialized for all
+  ///numerical data types. These specialized classes like
   ///Tolerance<double> may offer additional tuning parameters.
   ///
@@ -306 +306 @@
     static Value zero() {return 0;}
   };
-  
+
 
   ///Long integer specialization of Tolerance.

lemon/unionfind.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -39 +39 @@
   /// \brief A \e Union-Find data structure implementation
   ///
-  /// The class implements the \e Union-Find data structure. 
+  /// The class implements the \e Union-Find data structure.
   /// The union operation uses rank heuristic, while
   /// the find operation uses path compression.
-  /// This is a very simple but efficient implementation, providing 
+  /// This is a very simple but efficient implementation, providing
   /// only four methods: join (union), find, insert and size.
   /// For more features see the \ref UnionFindEnum class.
@@ -51 +51 @@
   ///
   /// \pre You need to add all the elements by the \ref insert()
-  /// method.  
+  /// method.
   template <typename _ItemIntMap>
   class UnionFind {
@@ -112 +112 @@
     /// \brief Inserts a new element into the structure.
     ///
-    /// This method inserts a new element into the data structure. 
+    /// This method inserts a new element into the data structure.
     ///
     /// The method returns the index of the new component.
@@ -124 +124 @@
     /// \brief Joining the components of element \e a and element \e b.
     ///
-    /// This is the \e union operation of the Union-Find structure. 
+    /// This is the \e union operation of the Union-Find structure.
     /// Joins the component of element \e a and component of
     /// element \e b. If \e a and \e b are in the same component then
@@ -132 +132 @@
       int kb = repIndex(index[b]);
 
-      if ( ka == kb ) 
-        return false;
+      if ( ka == kb )
+        return false;
 
       if (items[ka] < items[kb]) {
-        items[ka] += items[kb];
-        items[kb] = ka;
+        items[ka] += items[kb];
+        items[kb] = ka;
       } else {
-        items[kb] += items[ka];
-        items[ka] = kb;
+        items[kb] += items[ka];
+        items[ka] = kb;
       }
       return true;
@@ -174 +174 @@
   class UnionFindEnum {
   public:
-    
+
     typedef _ItemIntMap ItemIntMap;
     typedef typename ItemIntMap::Key Item;
 
   private:
-    
+
     ItemIntMap& index;
 
@@ -203 +203 @@
       int next, prev;
     };
-    
+
     std::vector<ClassT> classes;
     int firstClass, firstFreeClass;
@@ -209 +209 @@
     int newClass() {
       if (firstFreeClass == -1) {
-        int cdx = classes.size();
-        classes.push_back(ClassT());
-        return cdx;
+        int cdx = classes.size();
+        classes.push_back(ClassT());
+        return cdx;
       } else {
-        int cdx = firstFreeClass;
-        firstFreeClass = classes[firstFreeClass].next;
-        return cdx;
+        int cdx = firstFreeClass;
+        firstFreeClass = classes[firstFreeClass].next;
+        return cdx;
       }
     }
@@ -221 +221 @@
     int newItem() {
       if (firstFreeItem == -1) {
-        int idx = items.size();
-        items.push_back(ItemT());
-        return idx;
+        int idx = items.size();
+        items.push_back(ItemT());
+        return idx;
       } else {
-        int idx = firstFreeItem;
-        firstFreeItem = items[firstFreeItem].next;
-        return idx;
+        int idx = firstFreeItem;
+        firstFreeItem = items[firstFreeItem].next;
+        return idx;
       }
     }
@@ -268 +268 @@
       items[items[idx].prev].next = items[idx].next;
       items[items[idx].next].prev = items[idx].prev;
-      
+
       items[idx].next = firstFreeItem;
       firstFreeItem = idx;
@@ -279 +279 @@
       items[ak].prev = items[bk].prev;
       items[bk].prev = tmp;
-        
+
     }
 
@@ -289 +289 @@
       classes[cls].prev = -1;
       firstClass = cls;
-    } 
+    }
 
     void unlaceClass(int cls) {
@@ -300 +300 @@
         classes[classes[cls].next].prev = classes[cls].prev;
       }
-      
+
       classes[cls].next = firstFreeClass;
       firstFreeClass = cls;
-    } 
+    }
 
   public:
 
-    UnionFindEnum(ItemIntMap& _index) 
-      : index(_index), items(), firstFreeItem(-1), 
-        firstClass(-1), firstFreeClass(-1) {}
-    
+    UnionFindEnum(ItemIntMap& _index)
+      : index(_index), items(), firstFreeItem(-1),
+        firstClass(-1), firstFreeClass(-1) {}
+
     /// \brief Inserts the given element into a new component.
     ///
@@ -333 +333 @@
 
       firstClass = cdx;
-      
+
       return cdx;
     }
@@ -340 +340 @@
     ///
     /// This methods inserts the element \e a into the component of the
-    /// element \e comp. 
+    /// element \e comp.
     void insert(const Item& item, int cls) {
       int rdx = classes[cls].firstItem;
@@ -373 +373 @@
     /// \brief Joining the component of element \e a and element \e b.
     ///
-    /// This is the \e union operation of the Union-Find structure. 
+    /// This is the \e union operation of the Union-Find structure.
     /// Joins the component of element \e a and component of
     /// element \e b. If \e a and \e b are in the same component then
@@ -383 +383 @@
 
       if (ak == bk) {
-        return -1;
+        return -1;
       }
 
@@ -392 +392 @@
 
       if (classes[acx].size > classes[bcx].size) {
-        classes[acx].size += classes[bcx].size;
-        items[bk].parent = ak;
+        classes[acx].size += classes[bcx].size;
+        items[bk].parent = ak;
         unlaceClass(bcx);
-        rcx = acx;
+        rcx = acx;
       } else {
-        classes[bcx].size += classes[acx].size;
-        items[ak].parent = bk;
+        classes[bcx].size += classes[acx].size;
+        items[ak].parent = bk;
         unlaceClass(acx);
-        rcx = bcx;
+        rcx = bcx;
       }
       spliceItems(ak, bk);
@@ -414 +414 @@
     }
 
-    /// \brief Splits up the component. 
+    /// \brief Splits up the component.
     ///
     /// Splitting the component into singleton components (component
@@ -424 +424 @@
         int next = items[idx].next;
 
-        singletonItem(idx);
-
-        int cdx = newClass();        
+        singletonItem(idx);
+
+        int cdx = newClass();
         items[idx].parent = ~cdx;
 
-        laceClass(cdx);
-        classes[cdx].size = 1;
-        classes[cdx].firstItem = idx;
-        
+        laceClass(cdx);
+        classes[cdx].size = 1;
+        classes[cdx].firstItem = idx;
+
         idx = next;
       }
@@ -440 +440 @@
 
       classes[~(items[idx].parent)].size = 1;
-      
+
     }
 
@@ -458 +458 @@
       int cdx = classIndex(idx);
       if (idx == fdx) {
-        unlaceClass(cdx);
-        items[idx].next = firstFreeItem;
-        firstFreeItem = idx;
-        return;
+        unlaceClass(cdx);
+        items[idx].next = firstFreeItem;
+        firstFreeItem = idx;
+        return;
       } else {
-        classes[cdx].firstItem = fdx;
-        --classes[cdx].size;
-        items[fdx].parent = ~cdx;
-
-        unlaceItem(idx);
-        idx = items[fdx].next;
-        while (idx != fdx) {
-          items[idx].parent = fdx;
-          idx = items[idx].next;
-        }
-          
+        classes[cdx].firstItem = fdx;
+        --classes[cdx].size;
+        items[fdx].parent = ~cdx;
+
+        unlaceItem(idx);
+        idx = items[fdx].next;
+        while (idx != fdx) {
+          items[idx].parent = fdx;
+          idx = items[idx].next;
+        }
+
       }
 
@@ -515 +515 @@
       /// Constructor to get invalid iterator
       ClassIt(Invalid) : unionFind(0), cdx(-1) {}
-      
+
       /// \brief Increment operator
       ///
@@ -523 +523 @@
         return *this;
       }
-      
+
       /// \brief Conversion operator
       ///
@@ -534 +534 @@
       ///
       /// Equality operator
-      bool operator==(const ClassIt& i) { 
+      bool operator==(const ClassIt& i) {
         return i.cdx == cdx;
       }
@@ -541 +541 @@
       ///
       /// Inequality operator
-      bool operator!=(const ClassIt& i) { 
+      bool operator!=(const ClassIt& i) {
         return i.cdx != cdx;
       }
-      
+
     private:
       const UnionFindEnum* unionFind;
@@ -578 +578 @@
       /// Constructor to get invalid iterator
       ItemIt(Invalid) : unionFind(0), idx(-1) {}
-      
+
       /// \brief Increment operator
       ///
@@ -587 +587 @@
         return *this;
       }
-      
+
       /// \brief Conversion operator
       ///
@@ -598 +598 @@
       ///
       /// Equality operator
-      bool operator==(const ItemIt& i) { 
+      bool operator==(const ItemIt& i) {
         return i.idx == idx;
       }
@@ -605 +605 @@
       ///
       /// Inequality operator
-      bool operator!=(const ItemIt& i) { 
+      bool operator!=(const ItemIt& i) {
         return i.idx != idx;
       }
-      
+
     private:
       const UnionFindEnum* unionFind;
@@ -631 +631 @@
   class ExtendFindEnum {
   public:
-    
+
     typedef _ItemIntMap ItemIntMap;
     typedef typename ItemIntMap::Key Item;
 
   private:
-    
+
     ItemIntMap& index;
 
@@ -659 +659 @@
     int newClass() {
       if (firstFreeClass != -1) {
-        int cdx = firstFreeClass;
-        firstFreeClass = classes[cdx].next;
-        return cdx;
+        int cdx = firstFreeClass;
+        firstFreeClass = classes[cdx].next;
+        return cdx;
       } else {
-        classes.push_back(ClassT());
-        return classes.size() - 1;
+        classes.push_back(ClassT());
+        return classes.size() - 1;
       }
     }
@@ -670 +670 @@
     int newItem() {
       if (firstFreeItem != -1) {
-        int idx = firstFreeItem;
-        firstFreeItem = items[idx].next;
-        return idx;
+        int idx = firstFreeItem;
+        firstFreeItem = items[idx].next;
+        return idx;
       } else {
-        items.push_back(ItemT());
-        return items.size() - 1;
+        items.push_back(ItemT());
+        return items.size() - 1;
       }
     }
@@ -682 +682 @@
 
     /// \brief Constructor
-    ExtendFindEnum(ItemIntMap& _index) 
-      : index(_index), items(), firstFreeItem(-1), 
-        classes(), firstClass(-1), firstFreeClass(-1) {}
-    
+    ExtendFindEnum(ItemIntMap& _index)
+      : index(_index), items(), firstFreeItem(-1),
+        classes(), firstClass(-1), firstFreeClass(-1) {}
+
     /// \brief Inserts the given element into a new component.
     ///
@@ -695 +695 @@
       classes[cdx].next = firstClass;
       if (firstClass != -1) {
-        classes[firstClass].prev = cdx;
+        classes[firstClass].prev = cdx;
       }
       firstClass = cdx;
-      
+
       int idx = newItem();
       items[idx].item = item;
@@ -708 +708 @@
 
       index.set(item, idx);
-      
+
       return cdx;
     }
@@ -751 +751 @@
       return items[classes[cls].firstItem].item;
     }
-    
+
     /// \brief Removes the given element from the structure.
     ///
@@ -762 +762 @@
       int idx = index[item];
       int cdx = items[idx].cls;
-      
+
       if (idx == items[idx].next) {
-        if (classes[cdx].prev != -1) {
-          classes[classes[cdx].prev].next = classes[cdx].next; 
-        } else {
-          firstClass = classes[cdx].next;
-        }
-        if (classes[cdx].next != -1) {
-          classes[classes[cdx].next].prev = classes[cdx].prev; 
-        }
-        classes[cdx].next = firstFreeClass;
-        firstFreeClass = cdx;
+        if (classes[cdx].prev != -1) {
+          classes[classes[cdx].prev].next = classes[cdx].next;
+        } else {
+          firstClass = classes[cdx].next;
+        }
+        if (classes[cdx].next != -1) {
+          classes[classes[cdx].next].prev = classes[cdx].prev;
+        }
+        classes[cdx].next = firstFreeClass;
+        firstFreeClass = cdx;
       } else {
-        classes[cdx].firstItem = items[idx].next;
-        items[items[idx].next].prev = items[idx].prev;
-        items[items[idx].prev].next = items[idx].next;
+        classes[cdx].firstItem = items[idx].next;
+        items[items[idx].next].prev = items[idx].prev;
+        items[items[idx].prev].next = items[idx].next;
       }
       items[idx].next = firstFreeItem;
       firstFreeItem = idx;
-        
-    }    
-
-    
+
+    }
+
+
     /// \brief Removes the component of the given element from the structure.
     ///
@@ -797 +797 @@
 
       if (classes[cdx].prev != -1) {
-        classes[classes[cdx].prev].next = classes[cdx].next; 
+        classes[classes[cdx].prev].next = classes[cdx].next;
       } else {
-        firstClass = classes[cdx].next;
+        firstClass = classes[cdx].next;
       }
       if (classes[cdx].next != -1) {
-        classes[classes[cdx].next].prev = classes[cdx].prev; 
+        classes[classes[cdx].next].prev = classes[cdx].prev;
       }
       classes[cdx].next = firstFreeClass;
@@ -825 +825 @@
       /// Constructor to get invalid iterator
       ClassIt(Invalid) : extendFind(0), cdx(-1) {}
-      
+
       /// \brief Increment operator
       ///
@@ -833 +833 @@
         return *this;
       }
-      
+
       /// \brief Conversion operator
       ///
@@ -844 +844 @@
       ///
       /// Equality operator
-      bool operator==(const ClassIt& i) { 
+      bool operator==(const ClassIt& i) {
         return i.cdx == cdx;
       }
@@ -851 +851 @@
       ///
       /// Inequality operator
-      bool operator!=(const ClassIt& i) { 
+      bool operator!=(const ClassIt& i) {
         return i.cdx != cdx;
       }
-      
+
     private:
       const ExtendFindEnum* extendFind;
@@ -888 +888 @@
       /// Constructor to get invalid iterator
       ItemIt(Invalid) : extendFind(0), idx(-1) {}
-      
+
       /// \brief Increment operator
       ///
@@ -894 +894 @@
       ItemIt& operator++() {
         idx = extendFind->items[idx].next;
-        if (fdx == idx) idx = -1;
+        if (fdx == idx) idx = -1;
         return *this;
       }
-      
+
       /// \brief Conversion operator
       ///
@@ -908 +908 @@
       ///
       /// Equality operator
-      bool operator==(const ItemIt& i) { 
+      bool operator==(const ItemIt& i) {
         return i.idx == idx;
       }
@@ -915 +915 @@
       ///
       /// Inequality operator
-      bool operator!=(const ItemIt& i) { 
+      bool operator!=(const ItemIt& i) {
         return i.idx != idx;
       }
-      
+
     private:
       const ExtendFindEnum* extendFind;
@@ -950 +950 @@
   /// method.
   ///
-  template <typename _Value, typename _ItemIntMap, 
+  template <typename _Value, typename _ItemIntMap,
             typename _Comp = std::less<_Value> >
   class HeapUnionFind {
   public:
-    
+
     typedef _Value Value;
     typedef typename _ItemIntMap::Key Item;
@@ -1055 +1055 @@
       id = nodes[id].next;
       while (depth--) {
-        id = nodes[id].left;      
+        id = nodes[id].left;
       }
       return id;
@@ -1133 +1133 @@
       nodes[kd].right = nodes[id].prev;
       nodes[nodes[id].prev].next = -1;
-      
+
       nodes[jd].left = id;
       nodes[id].prev = -1;
@@ -1142 +1142 @@
         id = nodes[id].next;
         ++num;
-      }      
+      }
       nodes[kd].size -= num;
       nodes[jd].size = num;
@@ -1166 +1166 @@
       int jd = ~(classes[id].parent);
       while (nodes[jd].left != -1) {
-        int kd = nodes[jd].left;
-        if (nodes[jd].size == 1) {
-          if (nodes[jd].parent < 0) {
-            classes[id].parent = ~kd;
-            classes[id].depth -= 1;
-            nodes[kd].parent = ~id;
-            deleteNode(jd);
-            jd = kd;
-          } else {
-            int pd = nodes[jd].parent;
-            if (nodes[nodes[jd].next].size < cmax) {
-              pushLeft(nodes[jd].next, nodes[jd].left);
-              if (less(nodes[jd].left, nodes[jd].next)) {
-                nodes[nodes[jd].next].prio = nodes[nodes[jd].left].prio;
-                nodes[nodes[jd].next].item = nodes[nodes[jd].left].item;
-              } 
-              popLeft(pd);
-              deleteNode(jd);
-              jd = pd;
-            } else {
-              int ld = nodes[nodes[jd].next].left;
-              popLeft(nodes[jd].next);
-              pushRight(jd, ld);
-              if (less(ld, nodes[jd].left)) {
-                nodes[jd].item = nodes[ld].item;
-                nodes[jd].prio = nodes[jd].prio;
-              }
-              if (nodes[nodes[jd].next].item == nodes[ld].item) {
-                setPrio(nodes[jd].next);
-              }
-              jd = nodes[jd].left;
-            }
-          }
-        } else {
-          jd = nodes[jd].left;
-        }
-      }
-    }    
+        int kd = nodes[jd].left;
+        if (nodes[jd].size == 1) {
+          if (nodes[jd].parent < 0) {
+            classes[id].parent = ~kd;
+            classes[id].depth -= 1;
+            nodes[kd].parent = ~id;
+            deleteNode(jd);
+            jd = kd;
+          } else {
+            int pd = nodes[jd].parent;
+            if (nodes[nodes[jd].next].size < cmax) {
+              pushLeft(nodes[jd].next, nodes[jd].left);
+              if (less(nodes[jd].left, nodes[jd].next)) {
+                nodes[nodes[jd].next].prio = nodes[nodes[jd].left].prio;
+                nodes[nodes[jd].next].item = nodes[nodes[jd].left].item;
+              }
+              popLeft(pd);
+              deleteNode(jd);
+              jd = pd;
+            } else {
+              int ld = nodes[nodes[jd].next].left;
+              popLeft(nodes[jd].next);
+              pushRight(jd, ld);
+              if (less(ld, nodes[jd].left)) {
+                nodes[jd].item = nodes[ld].item;
+                nodes[jd].prio = nodes[jd].prio;
+              }
+              if (nodes[nodes[jd].next].item == nodes[ld].item) {
+                setPrio(nodes[jd].next);
+              }
+              jd = nodes[jd].left;
+            }
+          }
+        } else {
+          jd = nodes[jd].left;
+        }
+      }
+    }
 
     void repairRight(int id) {
       int jd = ~(classes[id].parent);
       while (nodes[jd].right != -1) {
-        int kd = nodes[jd].right;
-        if (nodes[jd].size == 1) {
-          if (nodes[jd].parent < 0) {
-            classes[id].parent = ~kd;
-            classes[id].depth -= 1;
-            nodes[kd].parent = ~id;
-            deleteNode(jd);
-            jd = kd;
-          } else {
-            int pd = nodes[jd].parent;
-            if (nodes[nodes[jd].prev].size < cmax) {
-              pushRight(nodes[jd].prev, nodes[jd].right);
-              if (less(nodes[jd].right, nodes[jd].prev)) {
-                nodes[nodes[jd].prev].prio = nodes[nodes[jd].right].prio;
-                nodes[nodes[jd].prev].item = nodes[nodes[jd].right].item;
-              } 
-              popRight(pd);
-              deleteNode(jd);
-              jd = pd;
-            } else {
-              int ld = nodes[nodes[jd].prev].right;
-              popRight(nodes[jd].prev);
-              pushLeft(jd, ld);
-              if (less(ld, nodes[jd].right)) {
-                nodes[jd].item = nodes[ld].item;
-                nodes[jd].prio = nodes[jd].prio;
-              }
-              if (nodes[nodes[jd].prev].item == nodes[ld].item) {
-                setPrio(nodes[jd].prev);
-              }
-              jd = nodes[jd].right;
-            }
-          }
-        } else {
-          jd = nodes[jd].right;
-        }
+        int kd = nodes[jd].right;
+        if (nodes[jd].size == 1) {
+          if (nodes[jd].parent < 0) {
+            classes[id].parent = ~kd;
+            classes[id].depth -= 1;
+            nodes[kd].parent = ~id;
+            deleteNode(jd);
+            jd = kd;
+          } else {
+            int pd = nodes[jd].parent;
+            if (nodes[nodes[jd].prev].size < cmax) {
+              pushRight(nodes[jd].prev, nodes[jd].right);
+              if (less(nodes[jd].right, nodes[jd].prev)) {
+                nodes[nodes[jd].prev].prio = nodes[nodes[jd].right].prio;
+                nodes[nodes[jd].prev].item = nodes[nodes[jd].right].item;
+              }
+              popRight(pd);
+              deleteNode(jd);
+              jd = pd;
+            } else {
+              int ld = nodes[nodes[jd].prev].right;
+              popRight(nodes[jd].prev);
+              pushLeft(jd, ld);
+              if (less(ld, nodes[jd].right)) {
+                nodes[jd].item = nodes[ld].item;
+                nodes[jd].prio = nodes[jd].prio;
+              }
+              if (nodes[nodes[jd].prev].item == nodes[ld].item) {
+                setPrio(nodes[jd].prev);
+              }
+              jd = nodes[jd].right;
+            }
+          }
+        } else {
+          jd = nodes[jd].right;
+        }
       }
     }
@@ -1277 +1277 @@
     /// \brief Constructs the union-find.
     ///
-    /// Constructs the union-find.  
+    /// Constructs the union-find.
     /// \brief _index The index map of the union-find. The data
     /// structure uses internally for store references.
-    HeapUnionFind(ItemIntMap& _index) 
-      : index(_index), first_class(-1), 
-        first_free_class(-1), first_free_node(-1) {}
+    HeapUnionFind(ItemIntMap& _index)
+      : index(_index), first_class(-1),
+        first_free_class(-1), first_free_node(-1) {}
 
     /// \brief Insert a new node into a new component.
@@ -1304 +1304 @@
       nodes[id].item = item;
       index[item] = id;
-      
+
       int class_id = newClass();
       classes[class_id].parent = ~id;
@@ -1311 +1311 @@
       classes[class_id].left = -1;
       classes[class_id].right = -1;
-      
+
       if (first_class != -1) {
         classes[first_class].prev = class_id;
@@ -1320 +1320 @@
 
       nodes[id].parent = ~class_id;
-      
+
       return class_id;
     }
@@ -1333 +1333 @@
       return findClass(index[item]);
     }
-    
+
     /// \brief Joins the classes.
     ///
@@ -1372 +1372 @@
         }
         classes[classes[l].prev].next = classes[l].next;
-        
+
         classes[l].prev = -1;
         classes[l].next = -1;
@@ -1378 +1378 @@
         classes[l].depth = leftNode(l);
         classes[l].parent = class_id;
-        
+
       }
 
@@ -1456 +1456 @@
               pushLeft(new_parent, ~(classes[l].parent));
               setPrio(new_parent);
-              
+
               classes[r].parent = ~new_parent;
               classes[r].depth += 1;
@@ -1471 +1471 @@
             classes[l].depth = classes[r].depth;
           } else {
-            if (classes[l].depth != 0 && 
-                nodes[~(classes[l].parent)].size + 
+            if (classes[l].depth != 0 &&
+                nodes[~(classes[l].parent)].size +
                 nodes[~(classes[r].parent)].size <= cmax) {
               splice(~(classes[l].parent), ~(classes[r].parent));
               deleteNode(~(classes[r].parent));
               if (less(~(classes[r].parent), ~(classes[l].parent))) {
-                nodes[~(classes[l].parent)].prio = 
+                nodes[~(classes[l].parent)].prio =
                   nodes[~(classes[r].parent)].prio;
-                nodes[~(classes[l].parent)].item = 
+                nodes[~(classes[l].parent)].item =
                   nodes[~(classes[r].parent)].item;
               }
@@ -1488 +1488 @@
               pushRight(new_parent, ~(classes[r].parent));
               setPrio(new_parent);
-            
+
               classes[l].parent = ~new_parent;
               classes[l].depth += 1;
@@ -1543 +1543 @@
         classes[first_class].prev = classes[id].right;
         first_class = classes[id].left;
-        
+
         if (classes[id].next != -1) {
           classes[classes[id].next].prev = classes[id].prev;
         }
         classes[classes[id].prev].next = classes[id].next;
-        
+
         deleteClass(id);
       }
@@ -1558 +1558 @@
             l = nodes[l].parent;
           }
-          int r = l;    
+          int r = l;
           while (nodes[l].parent >= 0) {
             l = nodes[l].parent;
@@ -1581 +1581 @@
           repairRight(~(nodes[l].parent));
           repairLeft(cs[i]);
-          
+
           *out++ = cs[i];
         }
@@ -1604 +1604 @@
       }
     }
-      
+
     /// \brief Increase the priority of the current item.
     ///
@@ -1631 +1631 @@
       }
     }
-    
+
     /// \brief Gives back the minimum priority of the class.
     ///
@@ -1647 +1647 @@
 
     /// \brief Gives back a representant item of the class.
-    /// 
+    ///
     /// The representant is indpendent from the priorities of the
-    /// items. 
+    /// items.
     /// \return Gives back a representant item of the class.
     const Item& classRep(int id) const {
@@ -1675 +1675 @@
       const HeapUnionFind* _huf;
       int _id, _lid;
-      
+
     public:
 
-      /// \brief Default constructor 
-      ///
-      /// Default constructor 
+      /// \brief Default constructor
+      ///
+      /// Default constructor
       ItemIt() {}
 
@@ -1696 +1696 @@
           _id = _huf->leftNode(id);
           _lid = -1;
-        } 
-      }
-      
+        }
+      }
+
       /// \brief Increment operator
       ///
@@ -1713 +1713 @@
         return _huf->nodes[_id].item;
       }
-      
+
       /// \brief Equality operator
       ///
       /// Equality operator
-      bool operator==(const ItemIt& i) { 
+      bool operator==(const ItemIt& i) {
         return i._id == _id;
       }
@@ -1724 +1724 @@
       ///
       /// Inequality operator
-      bool operator!=(const ItemIt& i) { 
+      bool operator!=(const ItemIt& i) {
         return i._id != _id;
       }
@@ -1731 +1731 @@
       ///
       /// Equality operator
-      bool operator==(Invalid) { 
+      bool operator==(Invalid) {
         return _id == _lid;
       }
@@ -1738 +1738 @@
       ///
       /// Inequality operator
-      bool operator!=(Invalid) { 
+      bool operator!=(Invalid) {
         return _id != _lid;
       }
-      
+
     };
 
     /// \brief Class iterator
     ///
-    /// The iterator stores 
+    /// The iterator stores
     class ClassIt {
     private:
@@ -1755 +1755 @@
     public:
 
-      ClassIt(const HeapUnionFind& huf) 
+      ClassIt(const HeapUnionFind& huf)
         : _huf(&huf), _id(huf.first_class) {}
 
-      ClassIt(const HeapUnionFind& huf, int cls) 
+      ClassIt(const HeapUnionFind& huf, int cls)
         : _huf(&huf), _id(huf.classes[cls].left) {}
 
       ClassIt(Invalid) : _huf(0), _id(-1) {}
-      
+
       const ClassIt& operator++() {
         _id = _huf->classes[_id].next;
-        return *this;
+        return *this;
       }
 
@@ -1771 +1771 @@
       ///
       /// Equality operator
-      bool operator==(const ClassIt& i) { 
+      bool operator==(const ClassIt& i) {
         return i._id == _id;
       }
@@ -1778 +1778 @@
       ///
       /// Inequality operator
-      bool operator!=(const ClassIt& i) { 
+      bool operator!=(const ClassIt& i) {
         return i._id != _id;
-      }      
-      
+      }
+
       operator int() const {
-        return _id;
-      }
-            
+        return _id;
+      }
+
     };
 

test/bfs_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -28 +28 @@
 using namespace lemon;
 
-void checkBfsCompile() 
+void checkBfsCompile()
 {
   typedef concepts::Digraph Digraph;
   typedef Bfs<Digraph> BType;
-  
+
   Digraph G;
   Digraph::Node n;
@@ -41 +41 @@
   BType::PredMap p(G);
   //  BType::PredNodeMap pn(G);
-  
+
   BType bfs_test(G);
-  
+
   bfs_test.run(n);
-  
+
   l  = bfs_test.dist(n);
   e  = bfs_test.predArc(n);
@@ -57 +57 @@
 }
 
-void checkBfsFunctionCompile() 
+void checkBfsFunctionCompile()
 {
   typedef int VType;
@@ -63 +63 @@
   typedef Digraph::Arc Arc;
   typedef Digraph::Node Node;
-   
+
   Digraph g;
   bfs(g,Node()).run();
@@ -82 +82 @@
   Node s, t;
   PetStruct<Digraph> ps = addPetersen(G, 5);
-   
+
   s=ps.outer[2];
   t=ps.inner[0];
-  
+
   Bfs<Digraph> bfs_test(G);
   bfs_test.run(s);
-  
+
   check(bfs_test.dist(t)==3,"Bfs found a wrong path." << bfs_test.dist(t));
 
@@ -96 +96 @@
   check(pathSource(G, p) == s,"path() found a wrong path.");
   check(pathTarget(G, p) == t,"path() found a wrong path.");
-  
+
 
   for(ArcIt e(G); e==INVALID; ++e) {
@@ -102 +102 @@
     Node v=G.target(e);
     check( !bfs_test.reached(u) ||
-           (bfs_test.dist(v) > bfs_test.dist(u)+1),
-           "Wrong output.");
+           (bfs_test.dist(v) > bfs_test.dist(u)+1),
+           "Wrong output.");
   }
 
@@ -113 +113 @@
       check(u==bfs_test.predNode(v),"Wrong tree.");
       check(bfs_test.dist(v) - bfs_test.dist(u) == 1,
-            "Wrong distance. Difference: " 
-            << std::abs(bfs_test.dist(v) - bfs_test.dist(u) 
-                        - 1));
+            "Wrong distance. Difference: "
+            << std::abs(bfs_test.dist(v) - bfs_test.dist(u)
+                        - 1));
     }
   }

test/counter_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -76 +76 @@
 void init(std::vector<int>& v) {
   v[0] = 10; v[1] = 60; v[2] = 20; v[3] = 90; v[4] = 100;
-  v[5] = 80; v[6] = 40; v[7] = 30; v[8] = 50; v[9] = 70; 
+  v[5] = 80; v[6] = 40; v[7] = 30; v[8] = 50; v[9] = 70;
 }
 
@@ -83 +83 @@
   counterTest<Counter>();
   counterTest<NoCounter>();
-  
+
   std::vector<int> x(10);
   init(x); bubbleSort(x);

test/dfs_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -28 +28 @@
 using namespace lemon;
 
-void checkDfsCompile() 
+void checkDfsCompile()
 {
   typedef concepts::Digraph Digraph;
   typedef Dfs<Digraph> DType;
-  
+
   Digraph G;
   Digraph::Node n;
@@ -41 +41 @@
   DType::PredMap p(G);
   //  DType::PredNodeMap pn(G);
-  
+
   DType dfs_test(G);
-  
+
   dfs_test.run(n);
-  
+
   l  = dfs_test.dist(n);
   e  = dfs_test.predArc(n);
@@ -57 +57 @@
 }
 
-void checkDfsFunctionCompile() 
+void checkDfsFunctionCompile()
 {
   typedef int VType;
@@ -63 +63 @@
   typedef Digraph::Arc Arc;
   typedef Digraph::Node Node;
-   
+
   Digraph g;
   dfs(g,Node()).run();
@@ -72 +72 @@
     .reachedMap(concepts::ReadWriteMap<Node,bool>())
     .processedMap(concepts::WriteMap<Node,bool>())
-    .run(Node()); 
+    .run(Node());
 }
 
@@ -82 +82 @@
   Node s, t;
   PetStruct<Digraph> ps = addPetersen(G, 5);
-   
+
   s=ps.outer[2];
   t=ps.inner[0];
-  
+
   Dfs<Digraph> dfs_test(G);
-  dfs_test.run(s);  
-  
+  dfs_test.run(s);
+
   Path<Digraph> p = dfs_test.path(t);
   check(p.length() == dfs_test.dist(t),"path() found a wrong path.");
@@ -94 +94 @@
   check(pathSource(G, p) == s,"path() found a wrong path.");
   check(pathTarget(G, p) == t,"path() found a wrong path.");
-  
+
   for(NodeIt v(G); v!=INVALID; ++v) {
     check(dfs_test.reached(v),"Each node should be reached.");
@@ -102 +102 @@
       check(u==dfs_test.predNode(v),"Wrong tree.");
       check(dfs_test.dist(v) - dfs_test.dist(u) == 1,
-            "Wrong distance. (" << dfs_test.dist(u) << "->" 
-            <<dfs_test.dist(v) << ')');
+            "Wrong distance. (" << dfs_test.dist(u) << "->"
+            <<dfs_test.dist(v) << ')');
     }
   }

test/digraph_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -34 +34 @@
     checkConcept<BaseDigraphComponent, BaseDigraphComponent >();
 
-    checkConcept<IDableDigraphComponent<>, 
+    checkConcept<IDableDigraphComponent<>,
       IDableDigraphComponent<> >();
 
-    checkConcept<IterableDigraphComponent<>, 
+    checkConcept<IterableDigraphComponent<>,
       IterableDigraphComponent<> >();
 
-    checkConcept<MappableDigraphComponent<>, 
+    checkConcept<MappableDigraphComponent<>,
       MappableDigraphComponent<> >();
   }

test/dijkstra_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -29 +29 @@
 using namespace lemon;
 
-void checkDijkstraCompile() 
+void checkDijkstraCompile()
 {
   typedef int VType;
@@ -35 +35 @@
   typedef concepts::ReadMap<Digraph::Arc,VType> LengthMap;
   typedef Dijkstra<Digraph, LengthMap> DType;
-  
+
   Digraph G;
   Digraph::Node n;
@@ -61 +61 @@
 }
 
-void checkDijkstraFunctionCompile() 
+void checkDijkstraFunctionCompile()
 {
   typedef int VType;
@@ -68 +68 @@
   typedef Digraph::Node Node;
   typedef concepts::ReadMap<Digraph::Arc,VType> LengthMap;
-   
+
   Digraph g;
   dijkstra(g,LengthMap(),Node()).run();
@@ -79 +79 @@
 
 template <class Digraph>
-void checkDijkstra() {    
+void checkDijkstra() {
   TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
   typedef typename Digraph::template ArcMap<int> LengthMap;
@@ -87 +87 @@
   LengthMap length(G);
   PetStruct<Digraph> ps = addPetersen(G, 5);
-   
+
   for(int i=0;i<5;i++) {
     length[ps.outcir[i]]=4;
@@ -95 +95 @@
   s=ps.outer[0];
   t=ps.inner[1];
-  
-  Dijkstra<Digraph, LengthMap> 
-        dijkstra_test(G, length);
+
+  Dijkstra<Digraph, LengthMap>
+        dijkstra_test(G, length);
   dijkstra_test.run(s);
-  
+
   check(dijkstra_test.dist(t)==13,"Dijkstra found a wrong path.");
 
@@ -107 +107 @@
   check(pathSource(G, p) == s,"path() found a wrong path.");
   check(pathTarget(G, p) == t,"path() found a wrong path.");
-  
+
   for(ArcIt e(G); e!=INVALID; ++e) {
     Node u=G.source(e);
     Node v=G.target(e);
     check( !dijkstra_test.reached(u) || (dijkstra_test.dist(v) - dijkstra_test.dist(u) <= length[e]),
-           "dist(target)-dist(source)-arc_length= " << dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]);
+           "dist(target)-dist(source)-arc_length= " << dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]);
   }
 
@@ -122 +122 @@
       check(u==dijkstra_test.predNode(v),"Wrong tree.");
       check(dijkstra_test.dist(v) - dijkstra_test.dist(u) == length[e],
-            "Wrong distance! Difference: " << std::abs(dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]));
+            "Wrong distance! Difference: " << std::abs(dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]));
     }
   }
-  
+
   {
     NullMap<Node,Arc> myPredMap;

test/dim_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008

test/error_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -59 +59 @@
 
 static int cnt = 0;
-void my_assert_handler(const char*, int, const char*, 
-                       const char*, const char*) {
+void my_assert_handler(const char*, int, const char*,
+                       const char*, const char*) {
   ++cnt;
 }

test/graph_copy_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -123 +123 @@
     }
   }
-  
+
   ListGraph to;
   ListGraph::NodeMap<int> tnm(to);
@@ -161 +161 @@
     check(ecr[er[it]] == it, "Wrong copy.");
     check(fem[it] == tem[er[it]], "Wrong copy.");
-    check(nr[from.u(it)] == to.u(er[it]) || nr[from.u(it)] == to.v(er[it]), 
-          "Wrong copy.");
-    check(nr[from.v(it)] == to.u(er[it]) || nr[from.v(it)] == to.v(er[it]), 
-          "Wrong copy.");
-    check((from.u(it) != from.v(it)) == (to.u(er[it]) != to.v(er[it])), 
-          "Wrong copy.");
+    check(nr[from.u(it)] == to.u(er[it]) || nr[from.u(it)] == to.v(er[it]),
+          "Wrong copy.");
+    check(nr[from.v(it)] == to.u(er[it]) || nr[from.v(it)] == to.v(er[it]),
+          "Wrong copy.");
+    check((from.u(it) != from.v(it)) == (to.u(er[it]) != to.v(er[it])),
+          "Wrong copy.");
   }
 
@@ -189 +189 @@
   graph_copy_test();
 
-  return 0; 
+  return 0;
 }

test/graph_maps_test.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -72 +72 @@
     for (int i = 0; i < num; ++i) {
       for (int j = 0; j < i; ++j) {
-        arcs.push_back(graph.addArc(nodes[i], nodes[j]));
+        arcs.push_back(graph.addArc(nodes[i], nodes[j]));
       }
     }
@@ -85 +85 @@
     for (int i = 0; i < num; ++i) {
       for (int j = i + 1; j < num; ++j) {
-        arcs.push_back(graph.addArc(nodes[i], nodes[j]));
-        map[arcs.back()] = 23;
+        arcs.push_back(graph.addArc(nodes[i], nodes[j]));
+        map[arcs.back()] = 23;
         check(map[arcs.back()] == 23, "Wrong operator[].");
       }
@@ -114 +114 @@
     for (int i = 0; i < num; ++i) {
       for (int j = 0; j < i; ++j) {
-        edges.push_back(graph.addEdge(nodes[i], nodes[j]));
+        edges.push_back(graph.addEdge(nodes[i], nodes[j]));
       }
     }
@@ -127 +127 @@
     for (int i = 0; i < num; ++i) {
       for (int j = i + 1; j < num; ++j) {
-        edges.push_back(graph.addEdge(nodes[i], nodes[j]));
-        map[edges.back()] = 23;
+        edges.push_back(graph.addEdge(nodes[i], nodes[j]));
+        map[edges.back()] = 23;
         check(map[edges.back()] == 23, "Wrong operator[].");
       }

test/graph_test.cc

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -34 +34 @@
     checkConcept<BaseGraphComponent, BaseGraphComponent >();
 
-    checkConcept<IDableGraphComponent<>, 
+    checkConcept<IDableGraphComponent<>,
       IDableGraphComponent<> >();
 
-    checkConcept<IterableGraphComponent<>, 
+    checkConcept<IterableGraphComponent<>,
       IterableGraphComponent<> >();
 
-    checkConcept<MappableGraphComponent<>, 
+    checkConcept<MappableGraphComponent<>,
       MappableGraphComponent<> >();
   }
@@ -135 +135 @@
 //     }
 //   }
-  
+
 //   for (int i = 0; i < w; ++i) {
 //     for (int j = 0; j < h - 1; ++j) {
@@ -155 +155 @@
 //     for (int i = 0; i < w - 1; ++i) {
 //       check(g.source(g.right(g(i, j))) == g(i, j), "Wrong right");
-//       check(g.target(g.right(g(i, j))) == g(i + 1, j), "Wrong right");      
-//     }
-//     check(g.right(g(w - 1, j)) == INVALID, "Wrong right");    
+//       check(g.target(g.right(g(i, j))) == g(i + 1, j), "Wrong right");
+//     }
+//     check(g.right(g(w - 1, j)) == INVALID, "Wrong right");
 //   }
 
@@ -163 +163 @@
 //     for (int i = 1; i < w; ++i) {
 //       check(g.source(g.left(g(i, j))) == g(i, j), "Wrong left");
-//       check(g.target(g.left(g(i, j))) == g(i - 1, j), "Wrong left");      
-//     }
-//     check(g.left(g(0, j)) == INVALID, "Wrong left");    
+//       check(g.target(g.left(g(i, j))) == g(i - 1, j), "Wrong left");
+//     }
+//     check(g.left(g(0, j)) == INVALID, "Wrong left");
 //   }
 // }

test/graph_test.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -218 +218 @@
       n.incir.push_back(G.addEdge(n.inner[i],n.inner[(i+2)%num]));
     }
-    
+
     return n;
   }
@@ -247 +247 @@
     checkBidirPetersen(G, num);
   }
-  
+
   template <class Graph>
   void checkGraph() {

test/graph_utils_test.cc

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -141 +141 @@
 {
   TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
-  
+
   const int nodeNum = 10;
   const int arcNum = 100;
@@ -156 +156 @@
   }
   for (int i = 0; i < nodeNum; ++i) {
-    check(inDeg[nodes[i]] == countInArcs(digraph, nodes[i]), 
+    check(inDeg[nodes[i]] == countInArcs(digraph, nodes[i]),
           "Wrong in degree map");
   }
   for (int i = 0; i < nodeNum; ++i) {
-    check(outDeg[nodes[i]] == countOutArcs(digraph, nodes[i]), 
+    check(outDeg[nodes[i]] == countOutArcs(digraph, nodes[i]),
           "Wrong out degree map");
   }
@@ -173 +173 @@
   Node n1=g.addNode();
   Node n2=g.addNode();
-  
+
   InDegMap<Digraph> ind(g);
-  
+
   g.addArc(n1,n2);
-  
+
   typename Digraph::Snapshot snap(g);
-  
+
   OutDegMap<Digraph> outd(g);
-  
+
   check(ind[n1]==0 && ind[n2]==1, "Wrong InDegMap value.");
   check(outd[n1]==1 && outd[n2]==0, "Wrong OutDegMap value.");

test/heap_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -41 +41 @@
 DIGRAPH_TYPEDEFS(Digraph);
 
-char test_lgf[] = 
-  "@nodes\n" 
-  "label\n"     
-  "0\n" 
-  "1\n" 
-  "2\n" 
-  "3\n" 
-  "4\n" 
-  "5\n" 
-  "6\n" 
-  "7\n" 
-  "8\n" 
-  "9\n" 
-  "@arcs\n" 
-  "             label   capacity\n"     
-  "0    5       0       94\n"   
-  "3    9       1       11\n"   
-  "8    7       2       83\n"   
-  "1    2       3       94\n"   
-  "5    7       4       35\n"   
-  "7    4       5       84\n"   
-  "9    5       6       38\n"   
-  "0    4       7       96\n"   
-  "6    7       8       6\n"    
-  "3    1       9       27\n"   
-  "5    2       10      77\n"   
-  "5    6       11      69\n"   
-  "6    5       12      41\n"   
-  "4    6       13      70\n"   
-  "3    2       14      45\n"   
-  "7    9       15      93\n"   
-  "5    9       16      50\n"   
-  "9    0       17      94\n"   
-  "9    6       18      67\n"   
-  "0    9       19      86\n"   
-  "@attributes\n" 
+char test_lgf[] =
+  "@nodes\n"
+  "label\n"
+  "0\n"
+  "1\n"
+  "2\n"
+  "3\n"
+  "4\n"
+  "5\n"
+  "6\n"
+  "7\n"
+  "8\n"
+  "9\n"
+  "@arcs\n"
+  "                label        capacity\n"
+  "0        5        0        94\n"
+  "3        9        1        11\n"
+  "8        7        2        83\n"
+  "1        2        3        94\n"
+  "5        7        4        35\n"
+  "7        4        5        84\n"
+  "9        5        6        38\n"
+  "0        4        7        96\n"
+  "6        7        8        6\n"
+  "3        1        9        27\n"
+  "5        2        10        77\n"
+  "5        6        11        69\n"
+  "6        5        12        41\n"
+  "4        6        13        70\n"
+  "3        2        14        45\n"
+  "7        9        15        93\n"
+  "5        9        16        50\n"
+  "9        0        17        94\n"
+  "9        6        18        67\n"
+  "0        9        19        86\n"
+  "@attributes\n"
   "source 3\n";
 
@@ -89 +89 @@
 
   Heap heap(map);
-  
+
   std::vector<int> v(test_len);
 
@@ -108 +108 @@
 
   Heap heap(map);
-  
+
   std::vector<int> v(test_len);
 
@@ -129 +129 @@
 
 template <typename Heap>
-void dijkstraHeapTest(const Digraph& digraph, const IntArcMap& length, 
-                      Node source) {
-  
+void dijkstraHeapTest(const Digraph& digraph, const IntArcMap& length,
+                      Node source) {
+
   typename Dijkstra<Digraph, IntArcMap>::template DefStandardHeap<Heap>::
     Create dijkstra(digraph, length);
@@ -138 +138 @@
 
   for(ArcIt a(digraph); a != INVALID; ++a) {
-    Node s = digraph.source(a); 
+    Node s = digraph.source(a);
     Node t = digraph.target(a);
     if (dijkstra.reached(s)) {
       check( dijkstra.dist(t) - dijkstra.dist(s) <= length[a],
-             "Error in a shortest path tree!");
+                   "Error in a shortest path tree!");
     }
   }
@@ -151 +151 @@
       Node s = digraph.source(a);
       check( dijkstra.dist(n) - dijkstra.dist(s) == length[a],
-             "Error in a shortest path tree!");
+             "Error in a shortest path tree!");
     }
   }
@@ -162 +162 @@
   typedef int Prio;
   typedef RangeMap<int> ItemIntMap;
-  
+
   Digraph digraph;
   IntArcMap length(digraph);
@@ -171 +171 @@
     arcMap("capacity", length).
     node("source", source).
-    run();  
- 
+    run();
+
   {
     typedef BinHeap<Prio, ItemIntMap> IntHeap;
@@ -178 +178 @@
     heapSortTest<IntHeap>();
     heapIncreaseTest<IntHeap>();
-    
+
     typedef BinHeap<Prio, IntNodeMap > NodeHeap;
     checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();

test/kruskal_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -74 +74 @@
   Node v4=G.addNode();
   Node t=G.addNode();
-  
+
   Edge e1 = G.addEdge(s, v1);
   Edge e2 = G.addEdge(s, v2);
@@ -91 +91 @@
   ECostMap edge_cost_map(G, 2);
   EBoolMap tree_map(G);
-  
+
 
   //Test with const map.
   check(kruskal(G, ConstMap<ListGraph::Edge,int>(2), tree_map)==10,
-        "Total cost should be 10");
+        "Total cost should be 10");
   //Test with an edge map (filled with uniform costs).
   check(kruskal(G, edge_cost_map, tree_map)==10,
-        "Total cost should be 10");
+        "Total cost should be 10");
 
   edge_cost_map.set(e1, -10);
@@ -115 +115 @@
   //Test with a edge map and inserter.
   check(kruskal(G, edge_cost_map,
-                 tree_edge_vec.begin())
-        ==-31,
-        "Total cost should be -31.");
-  
+                 tree_edge_vec.begin())
+        ==-31,
+        "Total cost should be -31.");
+
   tree_edge_vec.clear();
 
   check(kruskal(G, edge_cost_map,
-                back_inserter(tree_edge_vec))
-        ==-31,
-        "Total cost should be -31.");
-  
+                back_inserter(tree_edge_vec))
+        ==-31,
+        "Total cost should be -31.");
+
 //   tree_edge_vec.clear();
-  
+
 //   //The above test could also be coded like this:
 //   check(kruskal(G,
-//              makeKruskalMapInput(G, edge_cost_map),
-//              makeKruskalSequenceOutput(back_inserter(tree_edge_vec)))
-//      ==-31,
-//      "Total cost should be -31.");
+//                 makeKruskalMapInput(G, edge_cost_map),
+//                 makeKruskalSequenceOutput(back_inserter(tree_edge_vec)))
+//         ==-31,
+//         "Total cost should be -31.");
 
   check(tree_edge_vec.size()==5,"The tree should have 5 edges.");
 
   check(tree_edge_vec[0]==e1 &&
-        tree_edge_vec[1]==e2 &&
-        tree_edge_vec[2]==e5 &&
-        tree_edge_vec[3]==e7 &&
-        tree_edge_vec[4]==e9,
-        "Wrong tree.");
+        tree_edge_vec[1]==e2 &&
+        tree_edge_vec[2]==e5 &&
+        tree_edge_vec[3]==e7 &&
+        tree_edge_vec[4]==e9,
+        "Wrong tree.");
 
   return 0;

test/maps_test.cc

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -305 +305 @@
           "Something is wrong with EqualMap");
   }
-  
+
   // LoggerBoolMap
   {
@@ -321 +321 @@
           v1[0]==20 && v1[1]==50 && v1[2]==60 && v2[0]==20 && v2[1]==50 && v2[2]==60,
           "Something is wrong with LoggerBoolMap");
-          
+
     int i = 0;
     for ( LoggerBoolMap<vec::iterator>::Iterator it = map2.begin();

test/path_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -40 +40 @@
 
 int main() {
-  check_concepts();  
+  check_concepts();
   return 0;
 }

test/random_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -34 +34 @@
 
   lemon::rnd.seed(100);
-  lemon::rnd.seed(seed_array, seed_array + 
-                  (sizeof(seed_array) / sizeof(seed_array[0])));
+  lemon::rnd.seed(seed_array, seed_array +
+                  (sizeof(seed_array) / sizeof(seed_array[0])));
 
   return 0;

test/test_tools.h

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008

test/test_tools_fail.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -19 +19 @@
 #include "test_tools.h"
 
-int main() 
+int main()
 {
   check(false, "Don't panic. Failing is the right behaviour here.");

test/test_tools_pass.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -19 +19 @@
 #include "test_tools.h"
 
-int main() 
+int main()
 {
   check(true, "It should pass.");

test/time_measure_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -21 +21 @@
 using namespace lemon;
 
-void f() 
+void f()
 {
   double d=0;
@@ -28 +28 @@
 }
 
-void g() 
+void g()
 {
   static Timer T;
-  
+
   for(int i=0;i<1000;i++)
     TimeStamp x(T);
@@ -50 +50 @@
   std::cout << t << " (" << n << " tests)\n";
   std::cout << "Total: " << full << "\n";
-  
+
   t=runningTimeTest(g,1,&n,&full);
   std::cout << t << " (" << n << " tests)\n";
   std::cout << "Total: " << full << "\n";
-  
+
   return 0;
 }

test/unionfind_test.cc

@@ -1 @@
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
  *
- * This file is a part of LEMON, a generic C++ optimization library
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -32 +32 @@
   UFE U(base);
   vector<ListGraph::Node> n;
-  
+
   for(int i=0;i<20;i++) n.push_back(g.addNode());