LEMON/LEMON-official Changeset - r631:33c6b6e755cd

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r631:33c6b6e755cd

« 630:99a31b

635:58f704 »

r631:33c6b6e755cd

Wed, 15 Apr 2009 02:04:37

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Small doc improvements (#263)

0 19 0

default

19 files changed with 118 insertions and 125 deletions:

lemon/bin_heap.h

lemon/concepts/graph_components.h

lemon/concepts/heap.h

lemon/dfs.h

lemon/dijkstra.h

lemon/dimacs.h

lemon/graph_to_eps.h

lemon/kruskal.h

lemon/lgf_reader.h

lemon/lgf_writer.h

lemon/lp_base.h

lemon/maps.h

lemon/min_cost_arborescence.h

lemon/random.h

lemon/suurballe.h

lemon/time_measure.h

tools/dimacs-solver.cc

tools/dimacs-to-lgf.cc

tools/lgf-gen.cc

↑ Collapse diff ↑

lemon/bin_heap.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_BIN_HEAP_H
 		#define LEMON_BIN_HEAP_H
 		///\ingroup auxdat
 		///\file
 		///\brief Binary Heap implementation.
 		#include <vector>
 		#include <utility>
 		#include <functional>
 		namespace lemon {
 		  ///\ingroup auxdat
 		  ///
 		  ///\brief A Binary Heap implementation.
 		  ///
 		  ///This class implements the \e binary \e heap data structure.
 		  ///
 		  ///A \e heap is a data structure for storing items with specified values
 		  ///called \e priorities in such a way that finding the item with minimum
 		  ///priority is efficient. \c Comp specifies the ordering of the priorities.
 		  ///In a heap one can change the priority of an item, add or erase an
 		  ///item, etc.
 		  ///
 		  ///\tparam PR Type of the priority of the items.
 		  ///\tparam IM A read and writable item map with int values, used internally
 		  ///to handle the cross references.
 		  ///\tparam Comp A functor class for the ordering of the priorities.
 		  ///The default is \c std::less<PR>.
 		  ///
 		  ///\sa FibHeap
 		  ///\sa Dijkstra
 		  template <typename PR, typename IM, typename Comp = std::less<PR> >
 		  class BinHeap {
 		  public:
 		    ///\e
 		    typedef IM ItemIntMap;
 		    ///\e
 		    typedef PR Prio;
 		    ///\e
 		    typedef typename ItemIntMap::Key Item;
 		    ///\e
 		    typedef std::pair<Item,Prio> Pair;
 		    ///\e
 		    typedef Comp Compare;
 		    /// \brief Type to represent the items states.
 		    ///
 		    /// Each Item element have a state associated to it. It may be "in heap",
 		    /// "pre heap" or "post heap". The latter two are indifferent from the
 		    /// heap's point of view, but may be useful to the user.
 		    ///
 		    /// The item-int map must be initialized in such way that it assigns
 		    /// \c PRE_HEAP (<tt>-1</tt>) to any element to be put in the heap.
 		    enum State {
 		      IN_HEAP = 0,    ///< \e
 		      PRE_HEAP = -1,  ///< \e
-		      POST_HEAP = -2  ///< \e
+		      IN_HEAP = 0,    ///< = 0.
 		      PRE_HEAP = -1,  ///< = -1.
 		      POST_HEAP = -2  ///< = -2.
 		    };
 		  private:
 		    std::vector<Pair> _data;
 		    Compare _comp;
 		    ItemIntMap &_iim;
 		  public:
 		    /// \brief The constructor.
 		    ///
 		    /// The constructor.
 		    /// \param map should be given to the constructor, since it is used
 		    /// internally to handle the cross references. The value of the map
 		    /// must be \c PRE_HEAP (<tt>-1</tt>) for every item.
 		    explicit BinHeap(ItemIntMap &map) : _iim(map) {}
 		    /// \brief The constructor.
 		    ///
 		    /// The constructor.
 		    /// \param map should be given to the constructor, since it is used
 		    /// internally to handle the cross references. The value of the map
 		    /// should be PRE_HEAP (-1) for each element.
 		    ///
 		    /// \param comp The comparator function object.
 		    BinHeap(ItemIntMap &map, const Compare &comp)
 		      : _iim(map), _comp(comp) {}
 		    /// The number of items stored in the heap.
 		    ///
 		    /// \brief Returns the number of items stored in the heap.
 		    int size() const { return _data.size(); }
 		    /// \brief Checks if the heap stores no items.
 		    ///
 		    /// Returns \c true if and only if the heap stores no items.
 		    bool empty() const { return _data.empty(); }
 		    /// \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();
+		    }
 		  private:
 		    static int parent(int i) { return (i-1)/2; }
 		    static int second_child(int i) { return 2*i+2; }
 		    bool less(const Pair &p1, const Pair &p2) const {
 		      return _comp(p1.second, p2.second);
+		    }
 		    int bubble_up(int hole, Pair p) {
 		      int par = parent(hole);
 		      while( hole>0 && less(p,_data[par]) ) {
 		        move(_data[par],hole);
 		        hole = par;
 		        par = parent(hole);
+		      }
 		      move(p, hole);
 		      return hole;
+		    }
 		    int bubble_down(int hole, Pair p, int length) {
 		      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);
+		      }
 		      child--;
 		      if( child<length && less(_data[child], p) ) {
 		        move(_data[child], hole);
 		        hole=child;
+		      }
 		    ok:
 		      move(p, hole);
 		      return hole;
+		    }
 		    void move(const Pair &p, int i) {
 		      _data[i] = p;
 		      _iim.set(p.first, i);
+		    }
 		  public:
 		    /// \brief Insert a pair of item and priority into the heap.
 		    ///
 		    /// Adds \c p.first to the heap with priority \c p.second.
 		    /// \param p The pair to insert.
 		    void push(const Pair &p) {
 		      int n = _data.size();
 		      _data.resize(n+1);
 		      bubble_up(n, p);
+		    }
 		    /// \brief Insert an item into the heap with the given heap.
 		    ///
 		    /// Adds \c i to the heap with priority \c p.
 		    /// \param i The item to insert.
 		    /// \param p The priority of the item.
 		    void push(const Item &i, const Prio &p) { push(Pair(i,p)); }
 		    /// \brief Returns the item with minimum priority relative to \c Compare.
 		    ///
 		    /// This method returns the item with minimum priority relative to \c
 		    /// Compare.
 		    /// \pre The heap must be nonempty.
 		    Item top() const {
 		      return _data[0].first;
+		    }
 		    /// \brief Returns the minimum priority relative to \c Compare.
 		    ///
 		    /// It returns the minimum priority relative to \c Compare.
 		    /// \pre The heap must be nonempty.
 		    Prio prio() const {
 		      return _data[0].second;
+		    }
 		    /// \brief Deletes the item with minimum priority relative to \c Compare.
 		    ///
 		    /// This method deletes the item with minimum priority relative to \c
 		    /// 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);
+		      }
 		      _data.pop_back();
+		    }
 		    /// \brief Deletes \c i from the heap.
 		    ///
 		    /// This method deletes item \c i from the heap.
 		    /// \param i The item to erase.
 		    /// \pre The item should be in the heap.
 		    void erase(const Item &i) {
 		      int h = _iim[i];
 		      int n = _data.size()-1;
 		      _iim.set(_data[h].first, POST_HEAP);
 		      if( h < 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.
 		    /// \param i The item.
 		    /// \pre \c i must be in the heap.
 		    Prio operator[](const Item &i) const {
 		      int idx = _iim[i];
 		      return _data[idx].second;
+		    }
 		    /// \brief \c i gets to the heap with priority \c p independently
 		    /// if \c i was already there.
 		    ///
 		    /// This method calls \ref push(\c i, \c p) if \c i is not stored
 		    /// in the heap and sets the priority of \c i to \c p otherwise.
 		    /// \param i The item.
 		    /// \param p The priority.
 		    void set(const Item &i, const Prio &p) {
 		      int idx = _iim[i];
 		      if( idx < 0 ) {
 		        push(i,p);
+		      }
 		      else if( _comp(p, _data[idx].second) ) {
 		        bubble_up(idx, Pair(i,p));
+		      }
 		      else {
 		        bubble_down(idx, Pair(i,p), _data.size());
+		      }
+		    }
 		    /// \brief Decreases the priority of \c i to \c p.
 		    ///
 		    /// This method decreases the priority of item \c i to \c p.
 		    /// \param i The item.
 		    /// \param p The priority.
 		    /// \pre \c i must be stored in the heap with priority at least \c
 		    /// p relative to \c Compare.
 		    void decrease(const Item &i, const Prio &p) {
 		      int idx = _iim[i];
 		      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.
 		    /// \param i The item.
 		    /// \param p The priority.
 		    /// \pre \c i must be stored in the heap with priority at most \c
 		    /// p relative to \c Compare.
 		    void increase(const Item &i, const Prio &p) {
 		      int idx = _iim[i];
 		      bubble_down(idx, Pair(i,p), _data.size());
+		    }
 		    /// \brief Returns if \c item is in, has already been in, or has
 		    /// never been in the heap.
 		    ///
 		    /// This method returns PRE_HEAP if \c item has never been in the
 		    /// heap, IN_HEAP if it is in the heap at the moment, and POST_HEAP
 		    /// otherwise. In the latter case it is possible that \c item will
 		    /// get back to the heap again.
 		    /// \param i The item.
 		    State state(const Item &i) const {
 		      int s = _iim[i];
 		      if( s>=0 )
 		        s=0;
 		      return State(s);
+		    }
 		    /// \brief Sets the state of the \c item in the heap.
 		    ///
 		    /// Sets the state of the \c item in the heap. It can be used to
 		    /// manually clear the heap when it is important to achive the
 		    /// better time complexity.
 		    /// \param i The item.
 		    /// \param st The state. It should not be \c IN_HEAP.
 		    void state(const Item& i, State st) {
 		      switch (st) {
 		      case POST_HEAP:
 		      case PRE_HEAP:
 		        if (state(i) == IN_HEAP) {
 		          erase(i);
+		        }
 		        _iim[i] = st;
 		        break;
 		      case IN_HEAP:
 		        break;
+		      }
+		    }
 		    /// \brief Replaces an item in the heap.
 		    ///
 		    /// The \c i item is replaced with \c j item. The \c i item should
 		    /// be in the heap, while the \c j should be out of the heap. The
 		    /// \c i item will out of the heap and \c j will be in the heap
 		    /// with the same prioriority as prevoiusly the \c i item.
 		    void replace(const Item& i, const Item& j) {
 		      int idx = _iim[i];
 		      _iim.set(i, _iim[j]);
 		      _iim.set(j, idx);
 		      _data[idx].first = j;
+		    }
 		  }; // class BinHeap
 		} // namespace lemon
 		#endif // LEMON_BIN_HEAP_H

lemon/concepts/graph_components.h

Show inline comments

@@ -93,1241 +93,1241 @@
 		      bool operator<(const GraphItem&) const { return false; }
 		      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);
 		          b = (ia == INVALID) && (ib != INVALID);
 		          b = (ia < ib);
+		        }
 		        const _GraphItem &ia;
 		        const _GraphItem &ib;
 		      };
 		    };
 		    /// \brief Base skeleton class for directed graphs.
 		    ///
 		    /// This class describes the base interface of directed graph types.
 		    /// All digraph %concepts have to conform to this class.
 		    /// It just provides types for nodes and arcs and functions
 		    /// to get the source and the target nodes of arcs.
 		    class BaseDigraphComponent {
 		    public:
 		      typedef BaseDigraphComponent Digraph;
 		      /// \brief Node class of the digraph.
 		      ///
 		      /// This class represents the nodes of the digraph.
 		      typedef GraphItem<'n'> Node;
 		      /// \brief Arc class of the digraph.
 		      ///
 		      /// This class represents the arcs of the digraph.
 		      typedef GraphItem<'a'> Arc;
 		      /// \brief Return the source node of an arc.
 		      ///
 		      /// This function returns the source node of an arc.
 		      Node source(const Arc&) const { return INVALID; }
 		      /// \brief Return the target node of an arc.
 		      ///
 		      /// This function returns the target node of an arc.
 		      Node target(const Arc&) const { return INVALID; }
 		      /// \brief Return the opposite node on the given arc.
 		      ///
 		      /// This function returns the opposite node on the given arc.
 		      Node oppositeNode(const Node&, const Arc&) const {
 		        return INVALID;
+		      }
 		      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);
 		            n = digraph.oppositeNode(n, e);
+		          }
+		        }
 		        const _Digraph& digraph;
 		      };
 		    };
 		    /// \brief Base skeleton class for undirected graphs.
 		    ///
 		    /// This class describes the base interface of undirected graph types.
 		    /// All graph %concepts have to conform to this class.
 		    /// It extends the interface of \ref BaseDigraphComponent with an
 		    /// \c Edge type and functions to get the end nodes of edges,
 		    /// to convert from arcs to edges and to get both direction of edges.
 		    class BaseGraphComponent : public BaseDigraphComponent {
 		    public:
 		      typedef BaseDigraphComponent::Node Node;
 		      typedef BaseDigraphComponent::Arc Arc;
 		      /// \brief Undirected edge class of the graph.
 		      ///
 		      /// This class represents the undirected edges of the graph.
 		      /// Undirected graphs can be used as directed graphs, each edge is
 		      /// represented by two opposite directed arcs.
 		      class Edge : public GraphItem<'e'> {
 		      public:
 		        typedef GraphItem<'e'> Parent;
 		        /// \brief Default constructor.
 		        ///
 		        /// Default constructor.
 		        /// \warning The default constructor is not required to set
 		        /// the item to some well-defined value. So you should consider it
 		        /// as uninitialized.
 		        Edge() {}
 		        /// \brief Copy constructor.
 		        ///
 		        /// Copy constructor.
 		        Edge(const Edge &) : Parent() {}
 		        /// \brief Constructor for conversion from \c INVALID.
 		        ///
 		        /// Constructor for conversion from \c INVALID.
 		        /// It initializes the item to be invalid.
 		        /// \sa Invalid for more details.
 		        Edge(Invalid) {}
 		        /// \brief Constructor for conversion from an arc.
 		        ///
 		        /// Constructor for conversion from an arc.
 		        /// Besides the core graph item functionality each arc should
 		        /// be convertible to the represented edge.
 		        Edge(const Arc&) {}
 		        /// \brief Assign an arc to an edge.
 		        ///
 		        /// This function assigns an arc to an edge.
 		        /// Besides the core graph item functionality each arc should
 		        /// be convertible to the represented edge.
 		        Edge& operator=(const Arc&) { return *this; }
 		      };
 		      /// \brief Return one end node of an edge.
 		      ///
 		      /// This function returns one end node of an edge.
 		      Node u(const Edge&) const { return INVALID; }
 		      /// \brief Return the other end node of an edge.
 		      ///
 		      /// This function returns the other end node of an edge.
 		      Node v(const Edge&) const { return INVALID; }
 		      /// \brief Return a directed arc related to an edge.
 		      ///
 		      /// This function returns a directed arc from its direction and the
 		      /// represented edge.
 		      Arc direct(const Edge&, bool) const { return INVALID; }
 		      /// \brief Return a directed arc related to an edge.
 		      ///
 		      /// This function returns a directed arc from its source node and the
 		      /// represented edge.
 		      Arc direct(const Edge&, const Node&) const { return INVALID; }
 		      /// \brief Return the direction of the arc.
 		      ///
 		      /// Returns the direction of the arc. Each arc represents an
 		      /// edge with a direction. It gives back the
 		      /// direction.
 		      bool direction(const Arc&) const { return true; }
 		      /// \brief Return the opposite arc.
 		      ///
 		      /// This function returns the opposite arc, i.e. the arc representing
 		      /// the same edge and has opposite direction.
 		      Arc oppositeArc(const Arc&) 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() {
 		          checkConcept<BaseDigraphComponent, _Graph>();
 		          checkConcept<GraphItem<'e'>, Edge>();
+		          {
 		            Node n;
 		            Edge ue(INVALID);
 		            Arc e;
 		            n = graph.u(ue);
 		            n = graph.v(ue);
 		            e = graph.direct(ue, true);
 		            e = graph.direct(ue, false);
 		            e = graph.direct(ue, n);
 		            e = graph.oppositeArc(e);
 		            ue = e;
 		            bool d = graph.direction(e);
 		            ignore_unused_variable_warning(d);
+		          }
+		        }
 		        const _Graph& graph;
 		      };
 		    };
 		    /// \brief Skeleton class for \e idable directed graphs.
 		    ///
 		    /// This class describes the interface of \e idable directed graphs.
 		    /// It extends \ref BaseDigraphComponent with the core ID functions.
 		    /// The ids of the items must be unique and immutable.
 		    /// This concept is part of the Digraph concept.
 		    template <typename BAS = BaseDigraphComponent>
 		    class IDableDigraphComponent : public BAS {
 		    public:
 		      typedef BAS Base;
 		      typedef typename Base::Node Node;
 		      typedef typename Base::Arc Arc;
 		      /// \brief Return a unique integer id for the given node.
 		      ///
 		      /// This function returns a unique integer id for the given node.
 		      int id(const Node&) const { return -1; }
 		      /// \brief Return the node by its unique id.
 		      ///
 		      /// This function returns the node by its unique id.
 		      /// If the digraph does not contain a node with the given id,
 		      /// then the result of the function is undefined.
 		      Node nodeFromId(int) const { return INVALID; }
 		      /// \brief Return a unique integer id for the given arc.
 		      ///
 		      /// This function returns a unique integer id for the given arc.
 		      int id(const Arc&) const { return -1; }
 		      /// \brief Return the arc by its unique id.
 		      ///
 		      /// This function returns the arc by its unique id.
 		      /// If the digraph does not contain an arc with the given id,
 		      /// then the result of the function is undefined.
 		      Arc arcFromId(int) const { return INVALID; }
 		      /// \brief Return an integer greater or equal to the maximum
 		      /// node id.
 		      ///
 		      /// This function returns an integer greater or equal to the
 		      /// maximum node id.
 		      int maxNodeId() const { return -1; }
 		      /// \brief Return an integer greater or equal to the maximum
 		      /// arc id.
 		      ///
 		      /// This function returns an integer greater or equal to the
 		      /// maximum arc id.
 		      int maxArcId() const { return -1; }
 		      template <typename _Digraph>
 		      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;
 		      };
 		    };
 		    /// \brief Skeleton class for \e idable undirected graphs.
 		    ///
 		    /// This class describes the interface of \e idable undirected
 		    /// graphs. It extends \ref IDableDigraphComponent with the core ID
 		    /// functions of undirected graphs.
 		    /// The ids of the items must be unique and immutable.
 		    /// This concept is part of the Graph concept.
 		    template <typename BAS = BaseGraphComponent>
 		    class IDableGraphComponent : public IDableDigraphComponent<BAS> {
 		    public:
 		      typedef BAS Base;
 		      typedef typename Base::Edge Edge;
 		      using IDableDigraphComponent<Base>::id;
 		      /// \brief Return a unique integer id for the given edge.
 		      ///
 		      /// This function returns a unique integer id for the given edge.
 		      int id(const Edge&) const { return -1; }
 		      /// \brief Return the edge by its unique id.
 		      ///
 		      /// This function returns the edge by its unique id.
 		      /// If the graph does not contain an edge with the given id,
 		      /// then the result of the function is undefined.
 		      Edge edgeFromId(int) const { return INVALID; }
 		      /// \brief Return an integer greater or equal to the maximum
 		      /// edge id.
 		      ///
 		      /// This function returns an integer greater or equal to the
 		      /// maximum edge id.
 		      int maxEdgeId() const { return -1; }
 		      template <typename _Graph>
 		      struct Constraints {
 		        void constraints() {
 		          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;
 		      };
 		    };
 		    /// \brief Concept class for \c NodeIt, \c ArcIt and \c EdgeIt types.
 		    ///
 		    /// This class describes the concept of \c NodeIt, \c ArcIt and
 		    /// \c EdgeIt subtypes of digraph and graph types.
 		    template <typename GR, typename Item>
 		    class GraphItemIt : public Item {
 		    public:
 		      /// \brief Default constructor.
 		      ///
 		      /// Default constructor.
 		      /// \warning The default constructor is not required to set
 		      /// the iterator to some well-defined value. So you should consider it
 		      /// as uninitialized.
 		      GraphItemIt() {}
 		      /// \brief Copy constructor.
 		      ///
 		      /// Copy constructor.
 		      GraphItemIt(const GraphItemIt& it) : Item(it) {}
 		      /// \brief Constructor that sets the iterator to the first item.
 		      ///
 		      /// Constructor that sets the iterator to the first item.
 		      explicit GraphItemIt(const GR&) {}
 		      /// \brief Constructor for conversion from \c INVALID.
 		      ///
 		      /// Constructor for conversion from \c INVALID.
 		      /// It initializes the iterator to be invalid.
 		      /// \sa Invalid for more details.
 		      GraphItemIt(Invalid) {}
 		      /// \brief Assignment operator.
 		      ///
 		      /// Assignment operator for the iterator.
 		      GraphItemIt& operator=(const GraphItemIt&) { return *this; }
 		      /// \brief Increment the iterator.
 		      ///
 		      /// This operator increments the iterator, i.e. assigns it to the
 		      /// next item.
 		      GraphItemIt& operator++() { return *this; }
 		      /// \brief Equality operator
 		      ///
 		      /// 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
 		      ///
 		      /// Inequality 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;}
 		      template<typename _GraphItemIt>
 		      struct Constraints {
 		        void constraints() {
 		          checkConcept<GraphItem<>, _GraphItemIt>();
 		          _GraphItemIt it1(g);
 		          _GraphItemIt it2;
 		          _GraphItemIt it3 = it1;
 		          _GraphItemIt it4 = INVALID;
 		          it2 = ++it1;
 		          ++it2 = it1;
 		          ++(++it1);
 		          Item bi = it1;
 		          bi = it2;
+		        }
 		        const GR& g;
 		      };
 		    };
 		    /// \brief Concept class for \c InArcIt, \c OutArcIt and
 		    /// \c IncEdgeIt types.
 		    ///
 		    /// This class describes the concept of \c InArcIt, \c OutArcIt
 		    /// and \c IncEdgeIt subtypes of digraph and graph types.
 		    ///
 		    /// \note Since these iterator classes do not inherit from the same
 		    /// base class, there is an additional template parameter (selector)
 		    /// \c sel. For \c InArcIt you should instantiate it with character
 		    /// \c 'i', for \c OutArcIt with \c 'o' and for \c IncEdgeIt with \c 'e'.
 		    template <typename GR,
 		              typename Item = typename GR::Arc,
 		              typename Base = typename GR::Node,
 		              char sel = '0'>
 		    class GraphIncIt : public Item {
 		    public:
 		      /// \brief Default constructor.
 		      ///
 		      /// Default constructor.
 		      /// \warning The default constructor is not required to set
 		      /// the iterator to some well-defined value. So you should consider it
 		      /// as uninitialized.
 		      GraphIncIt() {}
 		      /// \brief Copy constructor.
 		      ///
 		      /// Copy constructor.
 		      GraphIncIt(const GraphIncIt& it) : Item(it) {}
 		      /// \brief Constructor that sets the iterator to the first
 		      /// incoming or outgoing arc.
 		      ///
 		      /// Constructor that sets the iterator to the first arc
 		      /// incoming to or outgoing from the given node.
 		      explicit GraphIncIt(const GR&, const Base&) {}
 		      /// \brief Constructor for conversion from \c INVALID.
 		      ///
 		      /// Constructor for conversion from \c INVALID.
 		      /// It initializes the iterator to be invalid.
 		      /// \sa Invalid for more details.
 		      GraphIncIt(Invalid) {}
 		      /// \brief Assignment operator.
 		      ///
 		      /// Assignment operator for the iterator.
 		      GraphIncIt& operator=(const GraphIncIt&) { return *this; }
 		      /// \brief Increment the iterator.
 		      ///
 		      /// This operator increments the iterator, i.e. assigns it to the
 		      /// next arc incoming to or outgoing from the given node.
 		      GraphIncIt& operator++() { return *this; }
 		      /// \brief Equality operator
 		      ///
 		      /// Equality operator.
 		      /// Two iterators are equal if and only if they point to the
 		      /// same object or both are invalid.
 		      bool operator==(const GraphIncIt&) const { return true;}
 		      /// \brief Inequality operator
 		      ///
 		      /// Inequality operator.
 		      /// Two iterators are equal if and only if they point to the
 		      /// same object or both are invalid.
 		      bool operator!=(const GraphIncIt&) const { return true;}
 		      template <typename _GraphIncIt>
 		      struct Constraints {
 		        void constraints() {
 		          checkConcept<GraphItem<sel>, _GraphIncIt>();
 		          _GraphIncIt it1(graph, node);
 		          _GraphIncIt it2;
 		          _GraphIncIt it3 = it1;
 		          _GraphIncIt it4 = INVALID;
 		          it2 = ++it1;
 		          ++it2 = it1;
 		          ++(++it1);
 		          Item e = it1;
 		          e = it2;
+		        }
 		        const Base& node;
 		        const GR& graph;
 		      };
 		    };
 		    /// \brief Skeleton class for iterable directed graphs.
 		    ///
 		    /// This class describes the interface of iterable directed
 		    /// graphs. It extends \ref BaseDigraphComponent with the core
 		    /// iterable interface.
 		    /// This concept is part of the Digraph concept.
 		    template <typename BAS = BaseDigraphComponent>
 		    class IterableDigraphComponent : public BAS {
 		    public:
 		      typedef BAS Base;
 		      typedef typename Base::Node Node;
 		      typedef typename Base::Arc Arc;
 		      typedef IterableDigraphComponent Digraph;
-		      /// \name Base iteration
+		      /// \name Base Iteration
 		      ///
 		      /// This interface provides functions for iteration on digraph items.
 		      ///
 		      /// @{
 		      /// \brief Return the first node.
 		      ///
 		      /// This function gives back the first node in the iteration order.
 		      void first(Node&) const {}
 		      /// \brief Return the next node.
 		      ///
 		      /// This function gives back the next node in the iteration order.
 		      void next(Node&) const {}
 		      /// \brief Return the first arc.
 		      ///
 		      /// This function gives back the first arc in the iteration order.
 		      void first(Arc&) const {}
 		      /// \brief Return the next arc.
 		      ///
 		      /// This function gives back the next arc in the iteration order.
 		      void next(Arc&) const {}
 		      /// \brief Return the first arc incomming to the given node.
 		      ///
 		      /// This function gives back the first arc incomming to the
 		      /// given node.
 		      void firstIn(Arc&, const Node&) const {}
 		      /// \brief Return the next arc incomming to the given node.
 		      ///
 		      /// This function gives back the next arc incomming to the
 		      /// given node.
 		      void nextIn(Arc&) const {}
 		      /// \brief Return the first arc outgoing form the given node.
 		      ///
 		      /// This function gives back the first arc outgoing form the
 		      /// given node.
 		      void firstOut(Arc&, const Node&) const {}
 		      /// \brief Return the next arc outgoing form the given node.
 		      ///
 		      /// This function gives back the next arc outgoing form the
 		      /// given node.
 		      void nextOut(Arc&) const {}
 		      /// @}
-		      /// \name Class based iteration
+		      /// \name Class Based Iteration
 		      ///
 		      /// This interface provides iterator classes for digraph items.
 		      ///
 		      /// @{
 		      /// \brief This iterator goes through each node.
 		      ///
 		      /// This iterator goes through each node.
 		      ///
 		      typedef GraphItemIt<Digraph, Node> NodeIt;
 		      /// \brief This iterator goes through each arc.
 		      ///
 		      /// This iterator goes through each arc.
 		      ///
 		      typedef GraphItemIt<Digraph, Arc> ArcIt;
 		      /// \brief This iterator goes trough the incoming arcs of a node.
 		      ///
 		      /// This iterator goes trough the \e incoming arcs of a certain node
 		      /// of a digraph.
 		      typedef GraphIncIt<Digraph, Arc, Node, 'i'> InArcIt;
 		      /// \brief This iterator goes trough the outgoing arcs of a node.
 		      ///
 		      /// This iterator goes trough the \e outgoing arcs of a certain node
 		      /// of a digraph.
 		      typedef GraphIncIt<Digraph, Arc, Node, 'o'> OutArcIt;
 		      /// \brief The base node of the iterator.
 		      ///
 		      /// This function gives back the base node of the iterator.
 		      /// It is always the target node of the pointed arc.
 		      Node baseNode(const InArcIt&) const { return INVALID; }
 		      /// \brief The running node of the iterator.
 		      ///
 		      /// This function gives back the running node of the iterator.
 		      /// It is always the source node of the pointed arc.
 		      Node runningNode(const InArcIt&) const { return INVALID; }
 		      /// \brief The base node of the iterator.
 		      ///
 		      /// This function gives back the base node of the iterator.
 		      /// It is always the source node of the pointed arc.
 		      Node baseNode(const OutArcIt&) const { return INVALID; }
 		      /// \brief The running node of the iterator.
 		      ///
 		      /// This function gives back the running node of the iterator.
 		      /// It is always the target node of the pointed arc.
 		      Node runningNode(const OutArcIt&) const { return INVALID; }
 		      /// @}
 		      template <typename _Digraph>
 		      struct Constraints {
 		        void constraints() {
 		          checkConcept<Base, _Digraph>();
+		          {
 		            typename _Digraph::Node node(INVALID);
 		            typename _Digraph::Arc arc(INVALID);
+		            {
 		              digraph.first(node);
 		              digraph.next(node);
+		            }
+		            {
 		              digraph.first(arc);
 		              digraph.next(arc);
+		            }
+		            {
 		              digraph.firstIn(arc, node);
 		              digraph.nextIn(arc);
+		            }
+		            {
 		              digraph.firstOut(arc, node);
 		              digraph.nextOut(arc);
+		            }
+		          }
+		          {
 		            checkConcept<GraphItemIt<_Digraph, typename _Digraph::Arc>,
 		              typename _Digraph::ArcIt >();
 		            checkConcept<GraphItemIt<_Digraph, typename _Digraph::Node>,
 		              typename _Digraph::NodeIt >();
 		            checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc,
 		              typename _Digraph::Node, 'i'>, typename _Digraph::InArcIt>();
 		            checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc,
 		              typename _Digraph::Node, 'o'>, typename _Digraph::OutArcIt>();
 		            typename _Digraph::Node n;
 		            const typename _Digraph::InArcIt iait(INVALID);
 		            const typename _Digraph::OutArcIt oait(INVALID);
 		            n = digraph.baseNode(iait);
 		            n = digraph.runningNode(iait);
 		            n = digraph.baseNode(oait);
 		            n = digraph.runningNode(oait);
 		            ignore_unused_variable_warning(n);
+		          }
+		        }
 		        const _Digraph& digraph;
 		      };
 		    };
 		    /// \brief Skeleton class for iterable undirected graphs.
 		    ///
 		    /// This class describes the interface of iterable undirected
 		    /// graphs. It extends \ref IterableDigraphComponent with the core
 		    /// iterable interface of undirected graphs.
 		    /// This concept is part of the Graph concept.
 		    template <typename BAS = BaseGraphComponent>
 		    class IterableGraphComponent : public IterableDigraphComponent<BAS> {
 		    public:
 		      typedef BAS Base;
 		      typedef typename Base::Node Node;
 		      typedef typename Base::Arc Arc;
 		      typedef typename Base::Edge Edge;
 		      typedef IterableGraphComponent Graph;
-		      /// \name Base iteration
+		      /// \name Base Iteration
 		      ///
 		      /// This interface provides functions for iteration on edges.
 		      ///
 		      /// @{
 		      using IterableDigraphComponent<Base>::first;
 		      using IterableDigraphComponent<Base>::next;
 		      /// \brief Return the first edge.
 		      ///
 		      /// This function gives back the first edge in the iteration order.
 		      void first(Edge&) const {}
 		      /// \brief Return the next edge.
 		      ///
 		      /// This function gives back the next edge in the iteration order.
 		      void next(Edge&) const {}
 		      /// \brief Return the first edge incident to the given node.
 		      ///
 		      /// This function gives back the first edge incident to the given
 		      /// node. The bool parameter gives back the direction for which the
 		      /// source node of the directed arc representing the edge is the
 		      /// given node.
 		      void firstInc(Edge&, bool&, const Node&) const {}
 		      /// \brief Gives back the next of the edges from the
 		      /// given node.
 		      ///
 		      /// This function gives back the next edge incident to the given
 		      /// node. The bool parameter should be used as \c firstInc() use it.
 		      void nextInc(Edge&, bool&) const {}
 		      using IterableDigraphComponent<Base>::baseNode;
 		      using IterableDigraphComponent<Base>::runningNode;
 		      /// @}
-		      /// \name Class based iteration
+		      /// \name Class Based Iteration
 		      ///
 		      /// This interface provides iterator classes for edges.
 		      ///
 		      /// @{
 		      /// \brief This iterator goes through each edge.
 		      ///
 		      /// This iterator goes through each edge.
 		      typedef GraphItemIt<Graph, Edge> EdgeIt;
 		      /// \brief This iterator goes trough the incident edges of a
 		      /// node.
 		      ///
 		      /// This iterator goes trough the incident edges of a certain
 		      /// node of a graph.
 		      typedef GraphIncIt<Graph, Edge, Node, 'e'> IncEdgeIt;
 		      /// \brief The base node of the iterator.
 		      ///
 		      /// This function gives back the base node of the iterator.
 		      Node baseNode(const IncEdgeIt&) const { return INVALID; }
 		      /// \brief The running node of the iterator.
 		      ///
 		      /// This function gives back the running node of the iterator.
 		      Node runningNode(const IncEdgeIt&) const { return INVALID; }
 		      /// @}
 		      template <typename _Graph>
 		      struct Constraints {
 		        void constraints() {
 		          checkConcept<IterableDigraphComponent<Base>, _Graph>();
+		          {
 		            typename _Graph::Node node(INVALID);
 		            typename _Graph::Edge edge(INVALID);
 		            bool dir;
+		            {
 		              graph.first(edge);
 		              graph.next(edge);
+		            }
+		            {
 		              graph.firstInc(edge, dir, node);
 		              graph.nextInc(edge, dir);
+		            }
+		          }
+		          {
 		            checkConcept<GraphItemIt<_Graph, typename _Graph::Edge>,
 		              typename _Graph::EdgeIt >();
 		            checkConcept<GraphIncIt<_Graph, typename _Graph::Edge,
 		              typename _Graph::Node, 'e'>, typename _Graph::IncEdgeIt>();
 		            typename _Graph::Node n;
 		            const typename _Graph::IncEdgeIt ieit(INVALID);
 		            n = graph.baseNode(ieit);
 		            n = graph.runningNode(ieit);
+		          }
+		        }
 		        const _Graph& graph;
 		      };
 		    };
 		    /// \brief Skeleton class for alterable directed graphs.
 		    ///
 		    /// This class describes the interface of alterable directed
 		    /// graphs. It extends \ref BaseDigraphComponent with the alteration
 		    /// notifier interface. It implements
 		    /// an observer-notifier pattern for each digraph item. More
 		    /// obsevers can be registered into the notifier and whenever an
 		    /// alteration occured in the digraph all the observers will be
 		    /// notified about it.
 		    template <typename BAS = BaseDigraphComponent>
 		    class AlterableDigraphComponent : public BAS {
 		    public:
 		      typedef BAS Base;
 		      typedef typename Base::Node Node;
 		      typedef typename Base::Arc Arc;
 		      /// Node alteration notifier class.
 		      typedef AlterationNotifier<AlterableDigraphComponent, Node>
 		      NodeNotifier;
 		      /// Arc alteration notifier class.
 		      typedef AlterationNotifier<AlterableDigraphComponent, Arc>
 		      ArcNotifier;
 		      /// \brief Return the node alteration notifier.
 		      ///
 		      /// This function gives back the node alteration notifier.
 		      NodeNotifier& notifier(Node) const {
 		         return NodeNotifier();
+		      }
 		      /// \brief Return the arc alteration notifier.
 		      ///
 		      /// This function gives back the arc alteration notifier.
 		      ArcNotifier& notifier(Arc) const {
 		        return ArcNotifier();
+		      }
 		      template <typename _Digraph>
 		      struct Constraints {
 		        void constraints() {
 		          checkConcept<Base, _Digraph>();
 		          typename _Digraph::NodeNotifier& nn
 		            = digraph.notifier(typename _Digraph::Node());
 		          typename _Digraph::ArcNotifier& en
 		            = digraph.notifier(typename _Digraph::Arc());
 		          ignore_unused_variable_warning(nn);
 		          ignore_unused_variable_warning(en);
+		        }
 		        const _Digraph& digraph;
 		      };
 		    };
 		    /// \brief Skeleton class for alterable undirected graphs.
 		    ///
 		    /// This class describes the interface of alterable undirected
 		    /// graphs. It extends \ref AlterableDigraphComponent with the alteration
 		    /// notifier interface of undirected graphs. It implements
 		    /// an observer-notifier pattern for the edges. More
 		    /// obsevers can be registered into the notifier and whenever an
 		    /// alteration occured in the graph all the observers will be
 		    /// notified about it.
 		    template <typename BAS = BaseGraphComponent>
 		    class AlterableGraphComponent : public AlterableDigraphComponent<BAS> {
 		    public:
 		      typedef BAS Base;
 		      typedef typename Base::Edge Edge;
 		      /// Edge alteration notifier class.
 		      typedef AlterationNotifier<AlterableGraphComponent, Edge>
 		      EdgeNotifier;
 		      /// \brief Return the edge alteration notifier.
 		      ///
 		      /// This function gives back the edge alteration notifier.
 		      EdgeNotifier& notifier(Edge) const {
 		        return EdgeNotifier();
+		      }
 		      template <typename _Graph>
 		      struct Constraints {
 		        void constraints() {
 		          checkConcept<AlterableDigraphComponent<Base>, _Graph>();
 		          typename _Graph::EdgeNotifier& uen
 		            = graph.notifier(typename _Graph::Edge());
 		          ignore_unused_variable_warning(uen);
+		        }
 		        const _Graph& graph;
 		      };
 		    };
 		    /// \brief Concept class for standard graph maps.
 		    ///
 		    /// This class describes the concept of standard graph maps, i.e.
 		    /// the \c NodeMap, \c ArcMap and \c EdgeMap subtypes of digraph and
 		    /// graph types, which can be used for associating data to graph items.
 		    /// The standard graph maps must conform to the ReferenceMap concept.
 		    template <typename GR, typename K, typename V>
 		    class GraphMap : public ReferenceMap<K, V, V&, const V&> {
 		    public:
 		      typedef ReadWriteMap<K, V> Parent;
 		      /// The graph type of the map.
 		      typedef GR Graph;
 		      /// The key type of the map.
 		      typedef K Key;
 		      /// The value type of the map.
 		      typedef V Value;
 		      /// The reference type of the map.
 		      typedef Value& Reference;
 		      /// The const reference type of the map.
 		      typedef const Value& ConstReference;
 		      // The reference map tag.
 		      typedef True ReferenceMapTag;
 		      /// \brief Construct a new map.
 		      ///
 		      /// Construct a new map for the graph.
 		      explicit GraphMap(const Graph&) {}
 		      /// \brief Construct a new map with default value.
 		      ///
 		      /// Construct a new map for the graph and initalize the values.
 		      GraphMap(const Graph&, const Value&) {}
 		    private:
 		      /// \brief Copy constructor.
 		      ///
 		      /// Copy Constructor.
 		      GraphMap(const GraphMap&) : Parent() {}
 		      /// \brief Assignment operator.
 		      ///
 		      /// Assignment 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.
 		      template <typename CMap>
 		      GraphMap& operator=(const CMap&) {
 		        checkConcept<ReadMap<Key, Value>, CMap>();
 		        return *this;
+		      }
 		    public:
 		      template<typename _Map>
 		      struct Constraints {
 		        void constraints() {
 		          checkConcept
 		            <ReferenceMap<Key, Value, Value&, const Value&>, _Map>();
 		          _Map m1(g);
 		          _Map m2(g,t);
 		          // Copy constructor
 		          // _Map m3(m);
 		          // Assignment operator
 		          // ReadMap<Key, Value> cmap;
 		          // m3 = cmap;
 		          ignore_unused_variable_warning(m1);
 		          ignore_unused_variable_warning(m2);
 		          // ignore_unused_variable_warning(m3);
+		        }
 		        const _Map &m;
 		        const Graph &g;
 		        const typename GraphMap::Value &t;
 		      };
 		    };
 		    /// \brief Skeleton class for mappable directed graphs.
 		    ///
 		    /// This class describes the interface of mappable directed graphs.
 		    /// It extends \ref BaseDigraphComponent with the standard digraph
 		    /// map classes, namely \c NodeMap and \c ArcMap.
 		    /// This concept is part of the Digraph concept.
 		    template <typename BAS = BaseDigraphComponent>
 		    class MappableDigraphComponent : public BAS  {
 		    public:
 		      typedef BAS Base;
 		      typedef typename Base::Node Node;
 		      typedef typename Base::Arc Arc;
 		      typedef MappableDigraphComponent Digraph;
 		      /// \brief Standard graph map for the nodes.
 		      ///
 		      /// Standard graph map for the nodes.
 		      /// It conforms to the ReferenceMap concept.
 		      template <typename V>
 		      class NodeMap : public GraphMap<MappableDigraphComponent, Node, V> {
 		      public:
 		        typedef GraphMap<MappableDigraphComponent, Node, V> Parent;
 		        /// \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 initalize the values.
 		        NodeMap(const MappableDigraphComponent& digraph, const V& value)
 		          : Parent(digraph, value) {}
 		      private:
 		        /// \brief Copy constructor.
 		        ///
 		        /// Copy Constructor.
 		        NodeMap(const NodeMap& nm) : Parent(nm) {}
 		        /// \brief Assignment operator.
 		        ///
 		        /// Assignment operator.
 		        template <typename CMap>
 		        NodeMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Node, V>, CMap>();
 		          return *this;
+		        }
 		      };
 		      /// \brief Standard graph map for the arcs.
 		      ///
 		      /// Standard graph map for the arcs.
 		      /// It conforms to the ReferenceMap concept.
 		      template <typename V>
 		      class ArcMap : public GraphMap<MappableDigraphComponent, Arc, V> {
 		      public:
 		        typedef GraphMap<MappableDigraphComponent, Arc, V> Parent;
 		        /// \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 initalize the values.
 		        ArcMap(const MappableDigraphComponent& digraph, const V& value)
 		          : Parent(digraph, value) {}
 		      private:
 		        /// \brief Copy constructor.
 		        ///
 		        /// Copy Constructor.
 		        ArcMap(const ArcMap& nm) : Parent(nm) {}
 		        /// \brief Assignment operator.
 		        ///
 		        /// Assignment operator.
 		        template <typename CMap>
 		        ArcMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Arc, V>, CMap>();
 		          return *this;
+		        }
 		      };
 		      template <typename _Digraph>
 		      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 >();
+		          }
+		        }
 		        const _Digraph& digraph;
 		      };
 		    };
 		    /// \brief Skeleton class for mappable undirected graphs.
 		    ///
 		    /// This class describes the interface of mappable undirected graphs.
 		    /// It extends \ref MappableDigraphComponent with the standard graph
 		    /// map class for edges (\c EdgeMap).
 		    /// This concept is part of the Graph concept.
 		    template <typename BAS = BaseGraphComponent>
 		    class MappableGraphComponent : public MappableDigraphComponent<BAS>  {
 		    public:
 		      typedef BAS Base;
 		      typedef typename Base::Edge Edge;
 		      typedef MappableGraphComponent Graph;
 		      /// \brief Standard graph map for the edges.
 		      ///
 		      /// Standard graph map for the edges.
 		      /// It conforms to the ReferenceMap concept.
 		      template <typename V>
 		      class EdgeMap : public GraphMap<MappableGraphComponent, Edge, V> {
 		      public:
 		        typedef GraphMap<MappableGraphComponent, Edge, V> Parent;
 		        /// \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 initalize the values.
 		        EdgeMap(const MappableGraphComponent& graph, const V& value)
 		          : Parent(graph, value) {}
 		      private:
 		        /// \brief Copy constructor.
 		        ///
 		        /// Copy Constructor.
 		        EdgeMap(const EdgeMap& nm) : Parent(nm) {}
 		        /// \brief Assignment operator.
 		        ///
 		        /// Assignment operator.
 		        template <typename CMap>
 		        EdgeMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Edge, V>, CMap>();
 		          return *this;
+		        }
 		      };
 		      template <typename _Graph>
 		      struct Constraints {
 		        struct Dummy {
 		          int value;
 		          Dummy() : value(0) {}
 		          Dummy(int _v) : value(_v) {}
 		        };
 		        void constraints() {
 		          checkConcept<MappableDigraphComponent<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 >();
+		          }
+		        }
 		        const _Graph& graph;
 		      };
 		    };
 		    /// \brief Skeleton class for extendable directed graphs.
 		    ///
 		    /// This class describes the interface of extendable directed graphs.
 		    /// It extends \ref BaseDigraphComponent with functions for adding
 		    /// nodes and arcs to the digraph.
 		    /// This concept requires \ref AlterableDigraphComponent.
 		    template <typename BAS = BaseDigraphComponent>
 		    class ExtendableDigraphComponent : public BAS {
 		    public:
 		      typedef BAS Base;
 		      typedef typename Base::Node Node;
 		      typedef typename Base::Arc Arc;
 		      /// \brief Add a new node to the digraph.
 		      ///
 		      /// This function adds a new node to the digraph.
 		      Node addNode() {
 		        return INVALID;
+		      }
 		      /// \brief Add a new arc connecting the given two nodes.
 		      ///
 		      /// This function adds a new arc connecting the given two nodes
 		      /// of the digraph.
 		      Arc addArc(const Node&, const Node&) {
 		        return INVALID;
+		      }
 		      template <typename _Digraph>
 		      struct 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;
 		      };
 		    };
 		    /// \brief Skeleton class for extendable undirected graphs.
 		    ///

lemon/concepts/heap.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		///\ingroup concept
 		///\file
 		///\brief The concept of heaps.
 		#ifndef LEMON_CONCEPTS_HEAP_H
 		#define LEMON_CONCEPTS_HEAP_H
 		#include <lemon/core.h>
 		#include <lemon/concept_check.h>
 		namespace lemon {
 		  namespace concepts {
 		    /// \addtogroup concept
 		    /// @{
 		    /// \brief The heap concept.
 		    ///
 		    /// Concept class describing the main interface of heaps. A \e heap
 		    /// is a data structure for storing items with specified values called
 		    /// \e priorities in such a way that finding the item with minimum
 		    /// priority is efficient. In a heap one can change the priority of an
 		    /// item, add or erase an item, etc.
 		    ///
 		    /// \tparam PR Type of the priority of the items.
 		    /// \tparam IM A read and writable item map with int values, used
 		    /// internally to handle the cross references.
 		    /// \tparam Comp A functor class for the ordering of the priorities.
 		    /// The default is \c std::less<PR>.
 		#ifdef DOXYGEN
 		    template <typename PR, typename IM, typename Comp = std::less<PR> >
 		#else
 		    template <typename PR, typename IM>
 		#endif
 		    class Heap {
 		    public:
 		      /// Type of the item-int map.
 		      typedef IM ItemIntMap;
 		      /// Type of the priorities.
 		      typedef PR Prio;
 		      /// Type of the items stored in the heap.
 		      typedef typename ItemIntMap::Key Item;
 		      /// \brief Type to represent the states of the items.
 		      ///
 		      /// Each item has a state associated to it. It can be "in heap",
 		      /// "pre heap" or "post heap". The later two are indifferent
 		      /// from the point of view of the heap, but may be useful for
 		      /// the user.
 		      ///
 		      /// The item-int map must be initialized in such way that it assigns
 		      /// \c PRE_HEAP (<tt>-1</tt>) to any element to be put in the heap.
 		      enum State {
 		        IN_HEAP = 0,    ///< The "in heap" state constant.
 		        PRE_HEAP = -1,  ///< The "pre heap" state constant.
-		        POST_HEAP = -2  ///< The "post heap" state constant.
+		        IN_HEAP = 0,    ///< = 0. The "in heap" state constant.
 		        PRE_HEAP = -1,  ///< = -1. The "pre heap" state constant.
 		        POST_HEAP = -2  ///< = -2. The "post heap" state constant.
 		      };
 		      /// \brief The constructor.
 		      ///
 		      /// The constructor.
 		      /// \param map A map that assigns \c int values to keys of type
 		      /// \c Item. It is used internally by the heap implementations to
 		      /// handle the cross references. The assigned value must be
 		      /// \c PRE_HEAP (<tt>-1</tt>) for every item.
 		      explicit Heap(ItemIntMap &map) {}
 		      /// \brief The number of items stored in the heap.
 		      ///
 		      /// Returns the number of items stored in the heap.
 		      int size() const { return 0; }
 		      /// \brief Checks if the heap is empty.
 		      ///
 		      /// Returns \c true if the heap is empty.
 		      bool empty() const { return false; }
 		      /// \brief Makes the heap empty.
 		      ///
 		      /// Makes the heap empty.
 		      void clear();
 		      /// \brief Inserts an 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.
 		      void push(const Item &i, const Prio &p) {}
 		      /// \brief Returns the item having minimum priority.
 		      ///
 		      /// Returns the item having minimum priority.
 		      /// \pre The heap must be non-empty.
 		      Item top() const {}
 		      /// \brief The minimum priority.
 		      ///
 		      /// Returns the minimum priority.
 		      /// \pre The heap must be non-empty.
 		      Prio prio() const {}
 		      /// \brief Removes the item having minimum priority.
 		      ///
 		      /// Removes the item having minimum priority.
 		      /// \pre The heap must be non-empty.
 		      void pop() {}
 		      /// \brief Removes an item from the heap.
 		      ///
 		      /// Removes the given item from the heap if it is already stored.
 		      /// \param i The item to delete.
 		      void erase(const Item &i) {}
 		      /// \brief The priority of an item.
 		      ///
 		      /// Returns the priority of the given item.
 		      /// \param i The item.
 		      /// \pre \c i must be in the heap.
 		      Prio operator[](const Item &i) const {}
 		      /// \brief Sets the priority of an item or inserts it, if it is
 		      /// not stored in the heap.
 		      ///
 		      /// This method sets the priority of the given item if it is
 		      /// already stored in the heap.
 		      /// Otherwise it inserts the given item with the given priority.
 		      ///
 		      /// \param i The item.
 		      /// \param p The priority.
 		      void set(const Item &i, const Prio &p) {}
 		      /// \brief Decreases the priority of an item to the given value.
 		      ///
 		      /// Decreases the priority of an item to the given value.
 		      /// \param i The item.
 		      /// \param p The priority.
 		      /// \pre \c i must be stored in the heap with priority at least \c p.
 		      void decrease(const Item &i, const Prio &p) {}
 		      /// \brief Increases the priority of an item to the given value.
 		      ///
 		      /// Increases the priority of an item to the given value.
 		      /// \param i The item.
 		      /// \param p The priority.
 		      /// \pre \c i must be stored in the heap with priority at most \c p.
 		      void increase(const Item &i, const Prio &p) {}
 		      /// \brief Returns if an item is in, has already been in, or has
 		      /// never been in the heap.
 		      ///
 		      /// This method returns \c PRE_HEAP if the given item has never
 		      /// been in the heap, \c IN_HEAP if it is in the heap at the moment,
 		      /// and \c POST_HEAP otherwise.
 		      /// In the latter case it is possible that the item will get back
 		      /// to the heap again.
 		      /// \param i The item.
 		      State state(const Item &i) const {}
 		      /// \brief Sets the state of an item in the heap.
 		      ///
 		      /// Sets the state of the given item in the heap. It can be used
 		      /// to manually clear the heap when it is important to achive the
 		      /// better time complexity.
 		      /// \param i The item.
 		      /// \param st The state. It should not be \c IN_HEAP.
 		      void state(const Item& i, State st) {}
 		      template <typename _Heap>
 		      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;
 		      };
 		    };
 		    /// @}
 		  } // namespace lemon
+		}
 		#endif

lemon/dfs.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_DFS_H
 		#define LEMON_DFS_H
 		///\ingroup search
 		///\file
 		///\brief DFS algorithm.
 		#include <lemon/list_graph.h>
 		#include <lemon/bits/path_dump.h>
 		#include <lemon/core.h>
 		#include <lemon/error.h>
 		#include <lemon/maps.h>
 		#include <lemon/path.h>
 		namespace lemon {
 		  ///Default traits class of Dfs class.
 		  ///Default traits class of Dfs class.
 		  ///\tparam GR Digraph type.
 		  template<class GR>
 		  struct DfsDefaultTraits
+		  {
 		    ///The type of the digraph the algorithm runs on.
 		    typedef GR Digraph;
 		    ///\brief The type of the map that stores the predecessor
 		    ///arcs of the %DFS paths.
 		    ///
 		    ///The type of the map that stores the predecessor
 		    ///arcs of the %DFS paths.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    typedef typename Digraph::template NodeMap<typename Digraph::Arc> PredMap;
 		    ///Instantiates a \c PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param g is the digraph, to which we would like to define the
 		    ///\ref PredMap.
 		    static PredMap *createPredMap(const Digraph &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.
 		    typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
 		    ///Instantiates a \c ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///\param g is the digraph, to which
 		    ///we would like to define the \ref ProcessedMap.
 		#ifdef DOXYGEN
 		    static ProcessedMap *createProcessedMap(const Digraph &g)
 		#else
 		    static ProcessedMap *createProcessedMap(const Digraph &)
 		#endif
+		    {
 		      return new ProcessedMap();
+		    }
 		    ///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::ReadWriteMap "ReadWriteMap" concept.
 		    typedef typename Digraph::template NodeMap<bool> ReachedMap;
 		    ///Instantiates a \c ReachedMap.
 		    ///This function instantiates a \ref ReachedMap.
 		    ///\param g is the digraph, to which
 		    ///we would like to define the \ref ReachedMap.
 		    static ReachedMap *createReachedMap(const Digraph &g)
+		    {
 		      return new ReachedMap(g);
+		    }
 		    ///The type of the map that stores the distances of the nodes.
 		    ///The type of the map that stores the distances of the nodes.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    typedef typename Digraph::template NodeMap<int> DistMap;
 		    ///Instantiates a \c 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 Digraph &g)
+		    {
 		      return new DistMap(g);
+		    }
 		  };
 		  ///%DFS algorithm class.
 		  ///\ingroup search
 		  ///This class provides an efficient implementation of the %DFS algorithm.
 		  ///
 		  ///There is also a \ref dfs() "function-type interface" for the DFS
 		  ///algorithm, which is convenient in the simplier cases and it can be
 		  ///used easier.
 		  ///
 		  ///\tparam GR The type of the digraph the algorithm runs on.
 		  ///The default type is \ref ListDigraph.
 		#ifdef DOXYGEN
 		  template <typename GR,
 		            typename TR>
 		#else
 		  template <typename GR=ListDigraph,
 		            typename TR=DfsDefaultTraits<GR> >
 		#endif
 		  class Dfs {
 		  public:
 		    ///The type of the digraph the algorithm runs on.
 		    typedef typename TR::Digraph Digraph;
 		    ///\brief The type of the map that stores the predecessor arcs of the
 		    ///DFS paths.
 		    typedef typename TR::PredMap PredMap;
 		    ///The type of the map that stores the distances of the nodes.
 		    typedef typename TR::DistMap DistMap;
 		    ///The type of the map that indicates which nodes are reached.
 		    typedef typename TR::ReachedMap ReachedMap;
 		    ///The type of the map that indicates which nodes are processed.
 		    typedef typename TR::ProcessedMap ProcessedMap;
 		    ///The type of the paths.
 		    typedef PredMapPath<Digraph, PredMap> Path;
 		    ///The \ref DfsDefaultTraits "traits class" of the algorithm.
 		    typedef TR Traits;
 		  private:
 		    typedef typename Digraph::Node Node;
 		    typedef typename Digraph::NodeIt NodeIt;
 		    typedef typename Digraph::Arc Arc;
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    //Pointer to the underlying digraph.
 		    const Digraph *G;
 		    //Pointer to the map of predecessor arcs.
 		    PredMap *_pred;
 		    //Indicates if _pred is locally allocated (true) or not.
 		    bool local_pred;
 		    //Pointer to the map of distances.
 		    DistMap *_dist;
 		    //Indicates if _dist is locally allocated (true) or not.
 		    bool local_dist;
 		    //Pointer to the map of reached status of the nodes.
 		    ReachedMap *_reached;
 		    //Indicates if _reached is locally allocated (true) or not.
 		    bool local_reached;
 		    //Pointer to the map of processed status of the nodes.
 		    ProcessedMap *_processed;
 		    //Indicates if _processed is locally allocated (true) or not.
 		    bool local_processed;
 		    std::vector<typename Digraph::OutArcIt> _stack;
 		    int _stack_head;
 		    //Creates the maps if necessary.
 		    void create_maps()
+		    {
 		      if(!_pred) {
 		        local_pred = true;
 		        _pred = Traits::createPredMap(*G);
+		      }
 		      if(!_dist) {
 		        local_dist = true;
 		        _dist = Traits::createDistMap(*G);
+		      }
 		      if(!_reached) {
 		        local_reached = true;
 		        _reached = Traits::createReachedMap(*G);
+		      }
 		      if(!_processed) {
 		        local_processed = true;
 		        _processed = Traits::createProcessedMap(*G);
+		      }
+		    }
 		  protected:
 		    Dfs() {}
 		  public:
 		    typedef Dfs Create;
-		    ///\name Named template parameters
+		    ///\name Named Template Parameters
 		    ///@{
 		    template <class T>
 		    struct SetPredMapTraits : public Traits {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &)
+		      {
 		        LEMON_ASSERT(false, "PredMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\c PredMap type.
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting
 		    ///\c PredMap type.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    template <class T>
 		    struct SetPredMap : public Dfs<Digraph, SetPredMapTraits<T> > {
 		      typedef Dfs<Digraph, SetPredMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct SetDistMapTraits : public Traits {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &)
+		      {
 		        LEMON_ASSERT(false, "DistMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\c DistMap type.
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting
 		    ///\c DistMap type.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    template <class T>
 		    struct SetDistMap : public Dfs< Digraph, SetDistMapTraits<T> > {
 		      typedef Dfs<Digraph, SetDistMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct SetReachedMapTraits : public Traits {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &)
+		      {
 		        LEMON_ASSERT(false, "ReachedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\c ReachedMap type.
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting
 		    ///\c ReachedMap type.
 		    ///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept.
 		    template <class T>
 		    struct SetReachedMap : public Dfs< Digraph, SetReachedMapTraits<T> > {
 		      typedef Dfs< Digraph, SetReachedMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct SetProcessedMapTraits : public Traits {
 		      typedef T ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &)
+		      {
 		        LEMON_ASSERT(false, "ProcessedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\c ProcessedMap type.
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting
 		    ///\c ProcessedMap type.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    template <class T>
 		    struct SetProcessedMap : public Dfs< Digraph, SetProcessedMapTraits<T> > {
 		      typedef Dfs< Digraph, SetProcessedMapTraits<T> > Create;
 		    };
 		    struct SetStandardProcessedMapTraits : public Traits {
 		      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &g)
+		      {
 		        return new ProcessedMap(g);
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\c ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting
 		    ///\c ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
 		    ///If you don't set it explicitly, it will be automatically allocated.
 		    struct SetStandardProcessedMap :
 		      public Dfs< Digraph, SetStandardProcessedMapTraits > {
 		      typedef Dfs< Digraph, SetStandardProcessedMapTraits > Create;
 		    };
 		    ///@}
 		  public:
 		    ///Constructor.
 		    ///Constructor.
 		    ///\param g The digraph the algorithm runs on.
 		    Dfs(const Digraph &g) :
 		      G(&g),
 		      _pred(NULL), local_pred(false),
 		      _dist(NULL), local_dist(false),
 		      _reached(NULL), local_reached(false),
 		      _processed(NULL), local_processed(false)
 		    { }
 		    ///Destructor.
 		    ~Dfs()
+		    {
 		      if(local_pred) delete _pred;
 		      if(local_dist) delete _dist;
 		      if(local_reached) delete _reached;
 		      if(local_processed) delete _processed;
+		    }
 		    ///Sets the map that stores the predecessor arcs.
 		    ///Sets the map that stores the predecessor arcs.
 		    ///If you don't use this function before calling \ref run(Node) "run()"
 		    ///or \ref init(), an instance will be allocated automatically.
 		    ///The destructor deallocates this automatically allocated map,
 		    ///of course.
 		    ///\return <tt> (*this) </tt>
 		    Dfs &predMap(PredMap &m)
+		    {
 		      if(local_pred) {
 		        delete _pred;
 		        local_pred=false;
+		      }
 		      _pred = &m;
 		      return *this;
+		    }
 		    ///Sets the map that indicates which nodes are reached.
 		    ///Sets the map that indicates which nodes are reached.
 		    ///If you don't use this function before calling \ref run(Node) "run()"
 		    ///or \ref init(), an instance will be allocated automatically.
 		    ///The destructor deallocates this automatically allocated map,
 		    ///of course.
 		    ///\return <tt> (*this) </tt>
 		    Dfs &reachedMap(ReachedMap &m)
+		    {
 		      if(local_reached) {
 		        delete _reached;
 		        local_reached=false;
+		      }
 		      _reached = &m;
 		      return *this;
+		    }
 		    ///Sets the map that indicates which nodes are processed.
 		    ///Sets the map that indicates which nodes are processed.
 		    ///If you don't use this function before calling \ref run(Node) "run()"
 		    ///or \ref init(), an instance will be allocated automatically.
 		    ///The destructor deallocates this automatically allocated map,
 		    ///of course.
 		    ///\return <tt> (*this) </tt>
 		    Dfs &processedMap(ProcessedMap &m)
+		    {
 		      if(local_processed) {
 		        delete _processed;
 		        local_processed=false;
+		      }
 		      _processed = &m;
 		      return *this;
+		    }
 		    ///Sets the map that stores the distances of the nodes.
 		    ///Sets the map that stores the distances of the nodes calculated by
 		    ///the algorithm.
 		    ///If you don't use this function before calling \ref run(Node) "run()"
 		    ///or \ref init(), an instance will be allocated automatically.
 		    ///The destructor deallocates this automatically allocated map,
 		    ///of course.
 		    ///\return <tt> (*this) </tt>
 		    Dfs &distMap(DistMap &m)
+		    {
 		      if(local_dist) {
 		        delete _dist;
 		        local_dist=false;
+		      }
 		      _dist = &m;
 		      return *this;
+		    }
 		  public:
 		    ///\name Execution Control
 		    ///The simplest way to execute the DFS algorithm is to use one of the
 		    ///member functions called \ref run(Node) "run()".\n
 		    ///If you need more control on the execution, first you have to call
 		    ///\ref init(), then you can add a source node with \ref addSource()
 		    ///and perform the actual computation with \ref start().
 		    ///This procedure can be repeated if there are nodes that have not
 		    ///been reached.
 		    ///@{
 		    ///\brief Initializes the internal data structures.
 		    ///
 		    ///Initializes the internal data structures.
 		    void init()
+		    {
 		      create_maps();
 		      _stack.resize(countNodes(*G));
 		      _stack_head=-1;
 		      for ( NodeIt u(*G) ; u!=INVALID ; ++u ) {
 		        _pred->set(u,INVALID);
 		        _reached->set(u,false);
 		        _processed->set(u,false);
+		      }
+		    }
 		    ///Adds a new source node.
 		    ///Adds a new source node to the set of nodes to be processed.
 		    ///
 		    ///\pre The stack must be empty. Otherwise the algorithm gives
 		    ///wrong results. (One of the outgoing arcs of all the source nodes
 		    ///except for the last one will not be visited and distances will
 		    ///also be wrong.)
 		    void addSource(Node s)
+		    {
 		      LEMON_DEBUG(emptyQueue(), "The stack is not empty.");
 		      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);
+		          }
+		        }
+		    }
 		    ///Processes the next arc.
 		    ///Processes the next arc.
 		    ///
 		    ///\return The processed arc.
 		    ///
 		    ///\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);
+		      }
 		      else {
 		        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];
+		        }
+		      }
 		      return e;
+		    }
 		    ///Next arc to be processed.
 		    ///Next arc to be processed.
 		    ///
 		    ///\return The next arc to be processed or \c INVALID if the stack
 		    ///is empty.
 		    OutArcIt nextArc() const
+		    {
 		      return _stack_head>=0?_stack[_stack_head]:INVALID;
+		    }
 		    ///Returns \c false if there are nodes to be processed.
 		    ///Returns \c false if there are nodes to be processed
 		    ///in the queue (stack).
 		    bool emptyQueue() const { 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 (stack).
 		    int queueSize() const { return _stack_head+1; }
 		    ///Executes the algorithm.
 		    ///Executes the algorithm.
 		    ///
 		    ///This method runs the %DFS algorithm from the root node
 		    ///in order to compute the DFS path to each node.
 		    ///
 		    /// The algorithm computes
 		    ///- the %DFS tree,
 		    ///- the distance of each node from the root in the %DFS tree.
 		    ///
 		    ///\pre init() must be called and a root node should be
 		    ///added with addSource() before using this function.
 		    ///
 		    ///\note <tt>d.start()</tt> is just a shortcut of the following code.
 		    ///\code
 		    ///  while ( !d.emptyQueue() ) {
 		    ///    d.processNextArc();
 		    ///  }
 		    ///\endcode
 		    void start()
+		    {
 		      while ( !emptyQueue() ) processNextArc();
+		    }
 		    ///Executes the algorithm until the given target node is reached.
 		    ///Executes the algorithm until the given target node is reached.
 		    ///
 		    ///This method runs the %DFS algorithm from the root node
 		    ///in order to compute the DFS path to \c t.
 		    ///
 		    ///The algorithm computes
 		    ///- the %DFS path to \c t,
 		    ///- the distance of \c t from the root in the %DFS tree.
 		    ///
 		    ///\pre init() must be called and a root node should be
 		    ///added with addSource() before using this function.
 		    void start(Node t)
+		    {
 		      while ( !emptyQueue() && G->target(_stack[_stack_head])!=t )
 		        processNextArc();
+		    }
 		    ///Executes the algorithm until a condition is met.
 		    ///Executes the algorithm until a condition is met.
 		    ///
 		    ///This method runs the %DFS algorithm from the root node
 		    ///until an arc \c a with <tt>am[a]</tt> true is found.
 		    ///
 		    ///\param am A \c bool (or convertible) arc map. The algorithm
 		    ///will stop when it reaches an arc \c a with <tt>am[a]</tt> true.
 		    ///
 		    ///\return The reached arc \c a with <tt>am[a]</tt> true or
 		    ///\c INVALID if no such arc was found.
 		    ///
 		    ///\pre init() must be called and a root node should be
 		    ///added with addSource() before using this function.
 		    ///
 		    ///\warning Contrary to \ref Bfs and \ref Dijkstra, \c am is an arc map,
 		    ///not a node map.
 		    template<class ArcBoolMap>
 		    Arc start(const ArcBoolMap &am)
+		    {
 		      while ( !emptyQueue() && !am[_stack[_stack_head]] )
 		        processNextArc();
 		      return emptyQueue() ? INVALID : _stack[_stack_head];
+		    }
 		    ///Runs the algorithm from the given source node.
 		    ///This method runs the %DFS algorithm from node \c s
 		    ///in order to compute the DFS path to each node.
 		    ///
 		    ///The algorithm computes
 		    ///- the %DFS tree,
 		    ///- the distance of each node from the root in the %DFS tree.
 		    ///
 		    ///\note <tt>d.run(s)</tt> is just a shortcut of the following code.
 		    ///\code
 		    ///  d.init();
 		    ///  d.addSource(s);
 		    ///  d.start();
 		    ///\endcode
 		    void run(Node s) {
 		      init();
 		      addSource(s);
 		      start();
+		    }
 		    ///Finds the %DFS path between \c s and \c t.
 		    ///This method runs the %DFS algorithm from node \c s
 		    ///in order to compute the DFS path to node \c t
 		    ///(it stops searching when \c t is processed)
 		    ///
 		    ///\return \c true if \c t is reachable form \c s.
 		    ///
 		    ///\note Apart from the return value, <tt>d.run(s,t)</tt> is
 		    ///just a shortcut of the following code.
 		    ///\code
 		    ///  d.init();
 		    ///  d.addSource(s);
 		    ///  d.start(t);
 		    ///\endcode
 		    bool run(Node s,Node t) {
 		      init();
 		      addSource(s);
 		      start(t);
 		      return reached(t);
+		    }
 		    ///Runs the 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
 		    ///- the %DFS tree (forest),
 		    ///- the distance of each node from the root(s) in the %DFS tree.
 		    ///
 		    ///\note <tt>d.run()</tt> is just a shortcut of the following code.
 		    ///\code
 		    ///  d.init();
 		    ///  for (NodeIt n(digraph); n != INVALID; ++n) {
 		    ///    if (!d.reached(n)) {
 		    ///      d.addSource(n);
 		    ///      d.start();
 		    ///    }
 		    ///  }
 		    ///\endcode
 		    void run() {
 		      init();
 		      for (NodeIt it(*G); it != INVALID; ++it) {
 		        if (!reached(it)) {
 		          addSource(it);
 		          start();
+		        }
+		      }
+		    }
 		    ///@}
 		    ///\name Query Functions
 		    ///The results of the DFS algorithm can be obtained using these
 		    ///functions.\n
 		    ///Either \ref run(Node) "run()" or \ref start() should be called
 		    ///before using them.
 		    ///@{
 		    ///The DFS path to a node.
 		    ///Returns the DFS path to a node.
 		    ///
 		    ///\warning \c t should be reached from the root(s).
 		    ///
 		    ///\pre Either \ref run(Node) "run()" or \ref init()
 		    ///must be called before using this function.
 		    Path path(Node t) const { return Path(*G, *_pred, t); }
 		    ///The distance of a node from the root(s).
 		    ///Returns the distance of a node from the root(s).
 		    ///
 		    ///\warning If node \c v is not reached from the root(s), then
 		    ///the return value of this function is undefined.
 		    ///
 		    ///\pre Either \ref run(Node) "run()" or \ref init()
 		    ///must be called before using this function.
 		    int dist(Node v) const { return (*_dist)[v]; }
 		    ///Returns the 'previous arc' of the %DFS tree for a node.
 		    ///This function returns the 'previous arc' of the %DFS tree for the
 		    ///node \c v, i.e. it returns the last arc of a %DFS path from a
 		    ///root to \c v. It is \c INVALID if \c v is not reached from the
 		    ///root(s) or if \c v is a root.
 		    ///
 		    ///The %DFS tree used here is equal to the %DFS tree used in
 		    ///\ref predNode().
 		    ///
 		    ///\pre Either \ref run(Node) "run()" or \ref init()
 		    ///must be called before using this function.
 		    Arc predArc(Node v) const { return (*_pred)[v];}
 		    ///Returns the 'previous node' of the %DFS tree.
 		    ///This function returns the 'previous node' of the %DFS
 		    ///tree for the node \c v, i.e. it returns the last but one node
 		    ///from a %DFS path from a root to \c v. It is \c INVALID
 		    ///if \c v is not reached from the root(s) or if \c v is a root.
 		    ///
 		    ///The %DFS tree used here is equal to the %DFS tree used in
 		    ///\ref predArc().
 		    ///
 		    ///\pre Either \ref run(Node) "run()" or \ref init()
 		    ///must be called before using this function.
 		    Node predNode(Node v) const { return (*_pred)[v]==INVALID ? INVALID:
 		                                  G->source((*_pred)[v]); }

lemon/dijkstra.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_DIJKSTRA_H
 		#define LEMON_DIJKSTRA_H
 		///\ingroup shortest_path
 		///\file
 		///\brief Dijkstra algorithm.
 		#include <limits>
 		#include <lemon/list_graph.h>
 		#include <lemon/bin_heap.h>
 		#include <lemon/bits/path_dump.h>
 		#include <lemon/core.h>
 		#include <lemon/error.h>
 		#include <lemon/maps.h>
 		#include <lemon/path.h>
 		namespace lemon {
 		  /// \brief Default operation traits for the Dijkstra algorithm class.
 		  ///
 		  /// This operation traits class defines all computational operations and
 		  /// constants which are used in the Dijkstra algorithm.
 		  template <typename V>
 		  struct DijkstraDefaultOperationTraits {
 		    /// \e
 		    typedef V Value;
 		    /// \brief Gives back the zero value of the type.
 		    static Value zero() {
 		      return static_cast<Value>(0);
+		    }
 		    /// \brief Gives back the sum of the given two elements.
 		    static Value plus(const Value& left, const Value& right) {
 		      return left + right;
+		    }
 		    /// \brief Gives back true only if the first value is less than the second.
 		    static bool less(const Value& left, const Value& right) {
 		      return left < right;
+		    }
 		  };
 		  ///Default traits class of Dijkstra class.
 		  ///Default traits class of Dijkstra class.
 		  ///\tparam GR The type of the digraph.
 		  ///\tparam LEN The type of the length map.
 		  template<typename GR, typename LEN>
 		  struct DijkstraDefaultTraits
+		  {
 		    ///The type of the digraph the algorithm runs on.
 		    typedef GR Digraph;
 		    ///The type of the map that stores the arc lengths.
 		    ///The type of the map that stores the arc lengths.
 		    ///It must meet the \ref concepts::ReadMap "ReadMap" concept.
 		    typedef LEN LengthMap;
 		    ///The type of the length of the arcs.
 		    typedef typename LEN::Value Value;
 		    /// Operation traits for %Dijkstra algorithm.
 		    /// This class defines the operations that are used in the algorithm.
 		    /// \see DijkstraDefaultOperationTraits
 		    typedef DijkstraDefaultOperationTraits<Value> OperationTraits;
 		    /// The cross reference type used by the heap.
 		    /// The cross reference type used by the heap.
 		    /// Usually it is \c Digraph::NodeMap<int>.
 		    typedef typename Digraph::template NodeMap<int> HeapCrossRef;
 		    ///Instantiates a \c HeapCrossRef.
 		    ///This function instantiates a \ref HeapCrossRef.
 		    /// \param g is the digraph, to which we would like to define the
 		    /// \ref HeapCrossRef.
 		    static HeapCrossRef *createHeapCrossRef(const Digraph &g)
+		    {
 		      return new HeapCrossRef(g);
+		    }
 		    ///The heap type used by the %Dijkstra algorithm.
 		    ///The heap type used by the Dijkstra algorithm.
 		    ///
 		    ///\sa BinHeap
 		    ///\sa Dijkstra
 		    typedef BinHeap<typename LEN::Value, HeapCrossRef, std::less<Value> > Heap;
 		    ///Instantiates a \c Heap.
 		    ///This function instantiates a \ref Heap.
 		    static Heap *createHeap(HeapCrossRef& r)
+		    {
 		      return new Heap(r);
+		    }
 		    ///\brief The type of the map that stores the predecessor
 		    ///arcs of the shortest paths.
 		    ///
 		    ///The type of the map that stores the predecessor
 		    ///arcs of the shortest paths.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    typedef typename Digraph::template NodeMap<typename Digraph::Arc> PredMap;
 		    ///Instantiates a \c PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param g is the digraph, to which we would like to define the
 		    ///\ref PredMap.
 		    static PredMap *createPredMap(const Digraph &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.
 		    ///By default it is a NullMap.
 		    typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
 		    ///Instantiates a \c ProcessedMap.
 		    ///This function instantiates a \ref ProcessedMap.
 		    ///\param g is the digraph, to which
 		    ///we would like to define the \ref ProcessedMap.
 		#ifdef DOXYGEN
 		    static ProcessedMap *createProcessedMap(const Digraph &g)
 		#else
 		    static ProcessedMap *createProcessedMap(const Digraph &)
 		#endif
+		    {
 		      return new ProcessedMap();
+		    }
 		    ///The type of the map that stores the distances of the nodes.
 		    ///The type of the map that stores the distances of the nodes.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    typedef typename Digraph::template NodeMap<typename LEN::Value> DistMap;
 		    ///Instantiates a \c 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 Digraph &g)
+		    {
 		      return new DistMap(g);
+		    }
 		  };
 		  ///%Dijkstra algorithm class.
 		  /// \ingroup shortest_path
 		  ///This class provides an efficient implementation of the %Dijkstra algorithm.
 		  ///
 		  ///The arc lengths are passed to the algorithm using a
 		  ///\ref concepts::ReadMap "ReadMap",
 		  ///so it is easy to change it to any kind of length.
 		  ///The type of the length is determined by the
 		  ///\ref concepts::ReadMap::Value "Value" of the length map.
 		  ///It is also possible to change the underlying priority heap.
 		  ///
 		  ///There is also a \ref dijkstra() "function-type interface" for the
 		  ///%Dijkstra algorithm, which is convenient in the simplier cases and
 		  ///it can be used easier.
 		  ///
 		  ///\tparam GR The type of the digraph the algorithm runs on.
 		  ///The default type is \ref ListDigraph.
 		  ///\tparam LEN A \ref concepts::ReadMap "readable" arc map that specifies
 		  ///the lengths of the arcs.
 		  ///It is read once for each arc, so the map may involve in
 		  ///relatively time consuming process to compute the arc lengths if
 		  ///it is necessary. The default map type is \ref
 		  ///concepts::Digraph::ArcMap "GR::ArcMap<int>".
 		#ifdef DOXYGEN
 		  template <typename GR, typename LEN, typename TR>
 		#else
 		  template <typename GR=ListDigraph,
 		            typename LEN=typename GR::template ArcMap<int>,
 		            typename TR=DijkstraDefaultTraits<GR,LEN> >
 		#endif
 		  class Dijkstra {
 		  public:
 		    ///The type of the digraph the algorithm runs on.
 		    typedef typename TR::Digraph Digraph;
 		    ///The type of the length of the arcs.
 		    typedef typename TR::LengthMap::Value Value;
 		    ///The type of the map that stores the arc lengths.
 		    typedef typename TR::LengthMap LengthMap;
 		    ///\brief The type of the map that stores the predecessor arcs of the
 		    ///shortest paths.
 		    typedef typename TR::PredMap PredMap;
 		    ///The type of the map that stores the distances of the nodes.
 		    typedef typename TR::DistMap DistMap;
 		    ///The type of the map that indicates which nodes are processed.
 		    typedef typename TR::ProcessedMap ProcessedMap;
 		    ///The type of the paths.
 		    typedef PredMapPath<Digraph, PredMap> Path;
 		    ///The cross reference type used for the current heap.
 		    typedef typename TR::HeapCrossRef HeapCrossRef;
 		    ///The heap type used by the algorithm.
 		    typedef typename TR::Heap Heap;
 		    ///\brief The \ref DijkstraDefaultOperationTraits "operation traits class"
 		    ///of the algorithm.
 		    typedef typename TR::OperationTraits OperationTraits;
 		    ///The \ref DijkstraDefaultTraits "traits class" of the algorithm.
 		    typedef TR Traits;
 		  private:
 		    typedef typename Digraph::Node Node;
 		    typedef typename Digraph::NodeIt NodeIt;
 		    typedef typename Digraph::Arc Arc;
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    //Pointer to the underlying digraph.
 		    const Digraph *G;
 		    //Pointer to the length map.
 		    const LengthMap *_length;
 		    //Pointer to the map of predecessors arcs.
 		    PredMap *_pred;
 		    //Indicates if _pred is locally allocated (true) or not.
 		    bool local_pred;
 		    //Pointer to the map of distances.
 		    DistMap *_dist;
 		    //Indicates if _dist is locally allocated (true) or not.
 		    bool local_dist;
 		    //Pointer to the map of processed status of the nodes.
 		    ProcessedMap *_processed;
 		    //Indicates if _processed is locally allocated (true) or not.
 		    bool local_processed;
 		    //Pointer to the heap cross references.
 		    HeapCrossRef *_heap_cross_ref;
 		    //Indicates if _heap_cross_ref is locally allocated (true) or not.
 		    bool local_heap_cross_ref;
 		    //Pointer to the heap.
 		    Heap *_heap;
 		    //Indicates if _heap is locally allocated (true) or not.
 		    bool local_heap;
 		    //Creates the maps if necessary.
 		    void create_maps()
+		    {
 		      if(!_pred) {
 		        local_pred = true;
 		        _pred = Traits::createPredMap(*G);
+		      }
 		      if(!_dist) {
 		        local_dist = true;
 		        _dist = Traits::createDistMap(*G);
+		      }
 		      if(!_processed) {
 		        local_processed = true;
 		        _processed = Traits::createProcessedMap(*G);
+		      }
 		      if (!_heap_cross_ref) {
 		        local_heap_cross_ref = true;
 		        _heap_cross_ref = Traits::createHeapCrossRef(*G);
+		      }
 		      if (!_heap) {
 		        local_heap = true;
 		        _heap = Traits::createHeap(*_heap_cross_ref);
+		      }
+		    }
 		  public:
 		    typedef Dijkstra Create;
-		    ///\name Named template parameters
+		    ///\name Named Template Parameters
 		    ///@{
 		    template <class T>
 		    struct SetPredMapTraits : public Traits {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &)
+		      {
 		        LEMON_ASSERT(false, "PredMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\c PredMap type.
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting
 		    ///\c PredMap type.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    template <class T>
 		    struct SetPredMap
 		      : public Dijkstra< Digraph, LengthMap, SetPredMapTraits<T> > {
 		      typedef Dijkstra< Digraph, LengthMap, SetPredMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct SetDistMapTraits : public Traits {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &)
+		      {
 		        LEMON_ASSERT(false, "DistMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\c DistMap type.
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting
 		    ///\c DistMap type.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    template <class T>
 		    struct SetDistMap
 		      : public Dijkstra< Digraph, LengthMap, SetDistMapTraits<T> > {
 		      typedef Dijkstra< Digraph, LengthMap, SetDistMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct SetProcessedMapTraits : public Traits {
 		      typedef T ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &)
+		      {
 		        LEMON_ASSERT(false, "ProcessedMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\c ProcessedMap type.
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting
 		    ///\c ProcessedMap type.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    template <class T>
 		    struct SetProcessedMap
 		      : public Dijkstra< Digraph, LengthMap, SetProcessedMapTraits<T> > {
 		      typedef Dijkstra< Digraph, LengthMap, SetProcessedMapTraits<T> > Create;
 		    };
 		    struct SetStandardProcessedMapTraits : public Traits {
 		      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &g)
+		      {
 		        return new ProcessedMap(g);
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///\c ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting
 		    ///\c ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
 		    ///If you don't set it explicitly, it will be automatically allocated.
 		    struct SetStandardProcessedMap
 		      : public Dijkstra< Digraph, LengthMap, SetStandardProcessedMapTraits > {
 		      typedef Dijkstra< Digraph, LengthMap, SetStandardProcessedMapTraits >
 		      Create;
 		    };
 		    template <class H, class CR>
 		    struct SetHeapTraits : public Traits {
 		      typedef CR HeapCrossRef;
 		      typedef H Heap;
 		      static HeapCrossRef *createHeapCrossRef(const Digraph &) {
 		        LEMON_ASSERT(false, "HeapCrossRef is not initialized");
 		        return 0; // ignore warnings
+		      }
 		      static Heap *createHeap(HeapCrossRef &)
+		      {
 		        LEMON_ASSERT(false, "Heap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///heap and cross reference types
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting heap and cross
 		    ///reference types. If this named parameter is used, then external
 		    ///heap and cross reference objects must be passed to the algorithm
 		    ///using the \ref heap() function before calling \ref run(Node) "run()"
 		    ///or \ref init().
 		    ///\sa SetStandardHeap
 		    template <class H, class CR = typename Digraph::template NodeMap<int> >
 		    struct SetHeap
 		      : public Dijkstra< Digraph, LengthMap, SetHeapTraits<H, CR> > {
 		      typedef Dijkstra< Digraph, LengthMap, SetHeapTraits<H, CR> > Create;
 		    };
 		    template <class H, class CR>
 		    struct SetStandardHeapTraits : public Traits {
 		      typedef CR HeapCrossRef;
 		      typedef H Heap;
 		      static HeapCrossRef *createHeapCrossRef(const Digraph &G) {
 		        return new HeapCrossRef(G);
+		      }
 		      static Heap *createHeap(HeapCrossRef &R)
+		      {
 		        return new Heap(R);
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///heap and cross reference types with automatic allocation
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting heap and cross
 		    ///reference types with automatic allocation.
 		    ///They should have standard constructor interfaces to be able to
 		    ///automatically created by the algorithm (i.e. the digraph should be
 		    ///passed to the constructor of the cross reference and the cross
 		    ///reference should be passed to the constructor of the heap).
 		    ///However external heap and cross reference objects could also be
 		    ///passed to the algorithm using the \ref heap() function before
 		    ///calling \ref run(Node) "run()" or \ref init().
 		    ///\sa SetHeap
 		    template <class H, class CR = typename Digraph::template NodeMap<int> >
 		    struct SetStandardHeap
 		      : public Dijkstra< Digraph, LengthMap, SetStandardHeapTraits<H, CR> > {
 		      typedef Dijkstra< Digraph, LengthMap, SetStandardHeapTraits<H, CR> >
 		      Create;
 		    };
 		    template <class T>
 		    struct SetOperationTraitsTraits : public Traits {
 		      typedef T OperationTraits;
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    ///\c OperationTraits type
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting
 		    ///\c OperationTraits type.
 		    template <class T>
 		    struct SetOperationTraits
 		      : public Dijkstra<Digraph, LengthMap, SetOperationTraitsTraits<T> > {
 		      typedef Dijkstra<Digraph, LengthMap, SetOperationTraitsTraits<T> >
 		      Create;
 		    };
 		    ///@}
 		  protected:
 		    Dijkstra() {}
 		  public:
 		    ///Constructor.
 		    ///Constructor.
 		    ///\param g The digraph the algorithm runs on.
 		    ///\param length The length map used by the algorithm.
 		    Dijkstra(const Digraph& g, const LengthMap& length) :
 		      G(&g), _length(&length),
 		      _pred(NULL), local_pred(false),
 		      _dist(NULL), local_dist(false),
 		      _processed(NULL), local_processed(false),
 		      _heap_cross_ref(NULL), local_heap_cross_ref(false),
 		      _heap(NULL), local_heap(false)
 		    { }
 		    ///Destructor.
 		    ~Dijkstra()
+		    {
 		      if(local_pred) delete _pred;
 		      if(local_dist) delete _dist;
 		      if(local_processed) delete _processed;
 		      if(local_heap_cross_ref) delete _heap_cross_ref;
 		      if(local_heap) delete _heap;
+		    }
 		    ///Sets the length map.
 		    ///Sets the length map.
 		    ///\return <tt> (*this) </tt>
 		    Dijkstra &lengthMap(const LengthMap &m)
+		    {
 		      _length = &m;
 		      return *this;
+		    }
 		    ///Sets the map that stores the predecessor arcs.
 		    ///Sets the map that stores the predecessor arcs.
 		    ///If you don't use this function before calling \ref run(Node) "run()"
 		    ///or \ref init(), an instance will be allocated automatically.
 		    ///The destructor deallocates this automatically allocated map,
 		    ///of course.
 		    ///\return <tt> (*this) </tt>
 		    Dijkstra &predMap(PredMap &m)
+		    {
 		      if(local_pred) {
 		        delete _pred;
 		        local_pred=false;
+		      }
 		      _pred = &m;
 		      return *this;
+		    }
 		    ///Sets the map that indicates which nodes are processed.
 		    ///Sets the map that indicates which nodes are processed.
 		    ///If you don't use this function before calling \ref run(Node) "run()"
 		    ///or \ref init(), an instance will be allocated automatically.
 		    ///The destructor deallocates this automatically allocated map,
 		    ///of course.
 		    ///\return <tt> (*this) </tt>
 		    Dijkstra &processedMap(ProcessedMap &m)
+		    {
 		      if(local_processed) {
 		        delete _processed;
 		        local_processed=false;
+		      }
 		      _processed = &m;
 		      return *this;
+		    }
 		    ///Sets the map that stores the distances of the nodes.
 		    ///Sets the map that stores the distances of the nodes calculated by the
 		    ///algorithm.
 		    ///If you don't use this function before calling \ref run(Node) "run()"
 		    ///or \ref init(), an instance will be allocated automatically.
 		    ///The destructor deallocates this automatically allocated map,
 		    ///of course.
 		    ///\return <tt> (*this) </tt>
 		    Dijkstra &distMap(DistMap &m)
+		    {
 		      if(local_dist) {
 		        delete _dist;
 		        local_dist=false;
+		      }
 		      _dist = &m;
 		      return *this;
+		    }
 		    ///Sets the heap and the cross reference used by algorithm.
 		    ///Sets the heap and the cross reference used by algorithm.
 		    ///If you don't use this function before calling \ref run(Node) "run()"
 		    ///or \ref init(), heap and cross reference instances will be
 		    ///allocated automatically.
 		    ///The destructor deallocates these automatically allocated objects,
 		    ///of course.
 		    ///\return <tt> (*this) </tt>
 		    Dijkstra &heap(Heap& hp, HeapCrossRef &cr)
+		    {
 		      if(local_heap_cross_ref) {
 		        delete _heap_cross_ref;
 		        local_heap_cross_ref=false;
+		      }
 		      _heap_cross_ref = &cr;
 		      if(local_heap) {
 		        delete _heap;
 		        local_heap=false;
+		      }
 		      _heap = &hp;
 		      return *this;
+		    }
 		  private:
 		    void finalizeNodeData(Node v,Value dst)
+		    {
 		      _processed->set(v,true);
 		      _dist->set(v, dst);
+		    }
 		  public:
 		    ///\name Execution Control
 		    ///The simplest way to execute the %Dijkstra algorithm is to use
 		    ///one of the member functions called \ref run(Node) "run()".\n
 		    ///If you need more control on the execution, first you have to call
 		    ///\ref init(), then you can add several source nodes with
 		    ///\ref addSource(). Finally the actual path computation can be
 		    ///performed with one of the \ref start() functions.
 		    ///@{
 		    ///\brief Initializes the internal data structures.
 		    ///
 		    ///Initializes the internal data structures.
 		    void init()
+		    {
 		      create_maps();
 		      _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);
+		      }
+		    }
 		    ///Adds a new source node.
 		    ///Adds a new source node to the priority heap.
 		    ///The optional second parameter is the initial distance of the node.
 		    ///
 		    ///The function checks if the node has already been added to the heap and
 		    ///it is pushed to the heap only if either it was not in the heap
 		    ///or the shortest path found till then is shorter than \c dst.
 		    void addSource(Node s,Value dst=OperationTraits::zero())
+		    {
 		      if(_heap->state(s) != Heap::IN_HEAP) {
 		        _heap->push(s,dst);
 		      } else if(OperationTraits::less((*_heap)[s], dst)) {
 		        _heap->set(s,dst);
 		        _pred->set(s,INVALID);
+		      }
+		    }
 		    ///Processes the next node in the priority heap
 		    ///Processes the next node in the priority heap.
 		    ///
 		    ///\return The processed node.
 		    ///
 		    ///\warning The priority heap must not be empty.
 		    Node processNextNode()
+		    {
 		      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;
+		        }
+		      }
 		      return v;
+		    }
 		    ///The next node to be processed.
 		    ///Returns the next node to be processed or \c INVALID if the
 		    ///priority heap is empty.
 		    Node nextNode() const
+		    {
 		      return !_heap->empty()?_heap->top():INVALID;
+		    }
 		    ///Returns \c false if there are nodes to be processed.
 		    ///Returns \c false if there are nodes to be processed
 		    ///in the priority heap.
 		    bool emptyQueue() const { return _heap->empty(); }
 		    ///Returns the number of the nodes to be processed.
 		    ///Returns the number of the nodes to be processed
 		    ///in the priority heap.
 		    int queueSize() const { return _heap->size(); }
 		    ///Executes the algorithm.
 		    ///Executes the algorithm.
 		    ///
 		    ///This method runs the %Dijkstra algorithm from the root node(s)
 		    ///in order to compute the shortest path to each node.
 		    ///
 		    ///The algorithm computes
 		    ///- the shortest path tree (forest),
 		    ///- the distance of each node from the root(s).
 		    ///
 		    ///\pre init() must be called and at least one root node should be
 		    ///added with addSource() before using this function.
 		    ///
 		    ///\note <tt>d.start()</tt> is just a shortcut of the following code.
 		    ///\code
 		    ///  while ( !d.emptyQueue() ) {
 		    ///    d.processNextNode();
 		    ///  }
 		    ///\endcode
 		    void start()
+		    {
 		      while ( !emptyQueue() ) processNextNode();
+		    }
 		    ///Executes the algorithm until the given target node is processed.
 		    ///Executes the algorithm until the given target node is processed.
 		    ///
 		    ///This method runs the %Dijkstra algorithm from the root node(s)
 		    ///in order to compute the shortest path to \c t.
 		    ///
 		    ///The algorithm computes
 		    ///- the shortest path to \c t,
 		    ///- the distance of \c t from the root(s).
 		    ///
 		    ///\pre init() must be called and at least one root node should be
 		    ///added with addSource() before using this function.
 		    void start(Node t)
+		    {
 		      while ( !_heap->empty() && _heap->top()!=t ) processNextNode();
 		      if ( !_heap->empty() ) {
 		        finalizeNodeData(_heap->top(),_heap->prio());
 		        _heap->pop();
+		      }
+		    }
 		    ///Executes the algorithm until a condition is met.
 		    ///Executes the algorithm until a condition is met.
 		    ///
 		    ///This method runs the %Dijkstra algorithm from the root node(s) in
 		    ///order to compute the shortest path to a node \c v with
 		    /// <tt>nm[v]</tt> true, if such a node can be found.
 		    ///
 		    ///\param nm A \c bool (or convertible) node map. The algorithm
 		    ///will stop when it reaches a node \c v with <tt>nm[v]</tt> true.
 		    ///
 		    ///\return The reached node \c v with <tt>nm[v]</tt> true or
 		    ///\c INVALID if no such node was found.
 		    ///
 		    ///\pre init() must be called and at least one root node should be
 		    ///added with addSource() before using this function.
 		    template<class NodeBoolMap>
 		    Node start(const NodeBoolMap &nm)
+		    {
 		      while ( !_heap->empty() && !nm[_heap->top()] ) processNextNode();
 		      if ( _heap->empty() ) return INVALID;
 		      finalizeNodeData(_heap->top(),_heap->prio());
 		      return _heap->top();
+		    }
 		    ///Runs the algorithm from the given source node.
 		    ///This method runs the %Dijkstra algorithm from node \c s
 		    ///in order to compute the shortest path to each node.
 		    ///
 		    ///The algorithm computes
 		    ///- the shortest path tree,
 		    ///- the distance of each node from the root.
 		    ///
 		    ///\note <tt>d.run(s)</tt> is just a shortcut of the following code.
 		    ///\code
 		    ///  d.init();
 		    ///  d.addSource(s);
 		    ///  d.start();
 		    ///\endcode
 		    void run(Node s) {
 		      init();
 		      addSource(s);
 		      start();
+		    }
 		    ///Finds the shortest path between \c s and \c t.
 		    ///This method runs the %Dijkstra algorithm from node \c s
 		    ///in order to compute the shortest path to node \c t
 		    ///(it stops searching when \c t is processed).
 		    ///
 		    ///\return \c true if \c t is reachable form \c s.
 		    ///
 		    ///\note Apart from the return value, <tt>d.run(s,t)</tt> is just a
 		    ///shortcut of the following code.
 		    ///\code
 		    ///  d.init();
 		    ///  d.addSource(s);
 		    ///  d.start(t);
 		    ///\endcode
 		    bool run(Node s,Node t) {
 		      init();
 		      addSource(s);
 		      start(t);
 		      return (*_heap_cross_ref)[t] == Heap::POST_HEAP;
+		    }
 		    ///@}
 		    ///\name Query Functions

lemon/dimacs.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_DIMACS_H
 		#define LEMON_DIMACS_H
 		#include <iostream>
 		#include <string>
 		#include <vector>
 		#include <limits>
 		#include <lemon/maps.h>
 		#include <lemon/error.h>
 		/// \ingroup dimacs_group
 		/// \file
 		/// \brief DIMACS file format reader.
 		namespace lemon {
 		  /// \addtogroup dimacs_group
 		  /// @{
 		  /// DIMACS file type descriptor.
 		  struct DimacsDescriptor
+		  {
 		    ///File type enum
 		    enum Type
+		      {
 		        NONE, MIN, MAX, SP, MAT
-		      };
+		    ///\brief DIMACS file type enum
 		    ///
 		    ///DIMACS file type enum.
 		    enum Type {
 		      NONE,  ///< Undefined type.
 		      MIN,   ///< DIMACS file type for minimum cost flow problems.
 		      MAX,   ///< DIMACS file type for maximum flow problems.
 		      SP,    ///< DIMACS file type for shostest path problems.
 		      MAT    ///< DIMACS file type for plain graphs and matching problems.
 		    };
 		    ///The file type
 		    Type type;
 		    ///The number of nodes in the graph
 		    int nodeNum;
 		    ///The number of edges in the graph
 		    int edgeNum;
 		    int lineShift;
-		    /// Constructor. Sets the type to NONE.
+		    ///Constructor. It sets the type to \c NONE.
 		    DimacsDescriptor() : type(NONE) {}
 		  };
 		  ///Discover the type of a DIMACS file
 		  ///It starts seeking the beginning of the file for the problem type
 		  ///and size info. The found data is returned in a special struct
 		  ///that can be evaluated and passed to the appropriate reader
 		  ///function.
 		  ///This function starts seeking the beginning of the given file for the
 		  ///problem type and size info.
 		  ///The found data is returned in a special struct that can be evaluated
 		  ///and passed to the appropriate reader function.
 		  DimacsDescriptor dimacsType(std::istream& is)
+		  {
 		    DimacsDescriptor r;
 		    std::string problem,str;
 		    char c;
 		    r.lineShift=0;
 		    while (is >> c)
 		      switch(c)
+		        {
 		        case 'p':
 		          if(is >> problem >> r.nodeNum >> r.edgeNum)
+		            {
 		              getline(is, str);
 		              r.lineShift++;
 		              if(problem=="min") r.type=DimacsDescriptor::MIN;
 		              else if(problem=="max") r.type=DimacsDescriptor::MAX;
 		              else if(problem=="sp") r.type=DimacsDescriptor::SP;
 		              else if(problem=="mat") r.type=DimacsDescriptor::MAT;
 		              else throw FormatError("Unknown problem type");
 		              return r;
+		            }
 		          else
+		            {
 		              throw FormatError("Missing or wrong problem type declaration.");
+		            }
 		          break;
 		        case 'c':
 		          getline(is, str);
 		          r.lineShift++;
 		          break;
 		        default:
 		          throw FormatError("Unknown DIMACS declaration.");
+		        }
 		    throw FormatError("Missing problem type declaration.");
+		  }
 		  /// DIMACS minimum cost flow reader function.
 		  /// \brief DIMACS minimum cost flow reader function.
 		  ///
 		  /// This function reads a minimum cost flow instance from DIMACS format,
 		  /// i.e. from a DIMACS file having a line starting with
 		  /// \code
 		  ///   p min
 		  /// \endcode
 		  /// At the beginning, \c g is cleared by \c g.clear(). The supply
 		  /// amount of the nodes are written to the \c supply node map
 		  /// (they are signed values). The lower bounds, capacities and costs
 		  /// of the arcs are written to the \c lower, \c capacity and \c cost
 		  /// arc maps.
 		  ///
 		  /// If the capacity of an arc is less than the lower bound, it will
 		  /// be set to "infinite" instead. The actual value of "infinite" is
 		  /// contolled by the \c infty parameter. If it is 0 (the default value),
 		  /// \c std::numeric_limits<Capacity>::infinity() will be used if available,
 		  /// \c std::numeric_limits<Capacity>::max() otherwise. If \c infty is set to
 		  /// a non-zero value, that value will be used as "infinite".
 		  ///
 		  /// If the file type was previously evaluated by dimacsType(), then
 		  /// the descriptor struct should be given by the \c dest parameter.
 		  template <typename Digraph, typename LowerMap,
 		            typename CapacityMap, typename CostMap,
 		            typename SupplyMap>
 		  void readDimacsMin(std::istream& is,
 		                     Digraph &g,
 		                     LowerMap& lower,
 		                     CapacityMap& capacity,
 		                     CostMap& cost,
 		                     SupplyMap& supply,
 		                     typename CapacityMap::Value infty = 0,
 		                     DimacsDescriptor desc=DimacsDescriptor())
+		  {
 		    g.clear();
 		    std::vector<typename Digraph::Node> nodes;
 		    typename Digraph::Arc e;
 		    std::string problem, str;
 		    char c;
 		    int i, j;
 		    if(desc.type==DimacsDescriptor::NONE) desc=dimacsType(is);
 		    if(desc.type!=DimacsDescriptor::MIN)
 		      throw FormatError("Problem type mismatch");
 		    nodes.resize(desc.nodeNum + 1);
 		    for (int k = 1; k <= desc.nodeNum; ++k) {
 		      nodes[k] = g.addNode();
 		      supply.set(nodes[k], 0);
+		    }
 		    typename SupplyMap::Value sup;
 		    typename CapacityMap::Value low;
 		    typename CapacityMap::Value cap;
 		    typename CostMap::Value co;
 		    typedef typename CapacityMap::Value Capacity;
 		    if(infty==0)
 		      infty = std::numeric_limits<Capacity>::has_infinity ?
 		        std::numeric_limits<Capacity>::infinity() :
 		        std::numeric_limits<Capacity>::max();
 		    while (is >> c) {
 		      switch (c) {
 		      case 'c': // comment line
 		        getline(is, str);
 		        break;
 		      case 'n': // node definition line
 		        is >> i >> sup;
 		        getline(is, str);
 		        supply.set(nodes[i], sup);
 		        break;
 		      case 'a': // arc definition line
 		        is >> i >> j >> low >> cap >> co;
 		        getline(is, str);
 		        e = g.addArc(nodes[i], nodes[j]);
 		        lower.set(e, low);
 		        if (cap >= low)
 		          capacity.set(e, cap);
 		        else
 		          capacity.set(e, infty);
 		        cost.set(e, co);
 		        break;
+		      }
+		    }
+		  }
 		  template<typename Digraph, typename CapacityMap>
 		  void _readDimacs(std::istream& is,
 		                   Digraph &g,
 		                   CapacityMap& capacity,
 		                   typename Digraph::Node &s,
 		                   typename Digraph::Node &t,
 		                   typename CapacityMap::Value infty = 0,
 		                   DimacsDescriptor desc=DimacsDescriptor()) {
 		    g.clear();
 		    s=t=INVALID;
 		    std::vector<typename Digraph::Node> nodes;
 		    typename Digraph::Arc e;
 		    char c, d;
 		    int i, j;
 		    typename CapacityMap::Value _cap;
 		    std::string str;
 		    nodes.resize(desc.nodeNum + 1);
 		    for (int k = 1; k <= desc.nodeNum; ++k) {
 		      nodes[k] = g.addNode();
+		    }
 		    typedef typename CapacityMap::Value Capacity;
 		    if(infty==0)
 		      infty = std::numeric_limits<Capacity>::has_infinity ?
 		        std::numeric_limits<Capacity>::infinity() :
 		        std::numeric_limits<Capacity>::max();
 		    while (is >> c) {
 		      switch (c) {
 		      case 'c': // comment line
 		        getline(is, str);
 		        break;
 		      case 'n': // node definition line
 		        if (desc.type==DimacsDescriptor::SP) { // shortest path problem
 		          is >> i;
 		          getline(is, str);
 		          s = nodes[i];
+		        }
 		        if (desc.type==DimacsDescriptor::MAX) { // max flow problem
 		          is >> i >> d;
 		          getline(is, str);
 		          if (d == 's') s = nodes[i];
 		          if (d == 't') t = nodes[i];
+		        }
 		        break;
 		      case 'a': // arc definition line
 		        if (desc.type==DimacsDescriptor::SP) {
 		          is >> i >> j >> _cap;
 		          getline(is, str);
 		          e = g.addArc(nodes[i], nodes[j]);
 		          capacity.set(e, _cap);
+		        }
 		        else if (desc.type==DimacsDescriptor::MAX) {
 		          is >> i >> j >> _cap;
 		          getline(is, str);
 		          e = g.addArc(nodes[i], nodes[j]);
 		          if (_cap >= 0)
 		            capacity.set(e, _cap);
 		          else
 		            capacity.set(e, infty);
+		        }
 		        else {
 		          is >> i >> j;
 		          getline(is, str);
 		          g.addArc(nodes[i], nodes[j]);
+		        }
 		        break;
+		      }
+		    }
+		  }
 		  /// DIMACS maximum flow reader function.
+		  /// \brief DIMACS maximum flow reader function.
 		  ///
 		  /// This function reads a maximum flow instance from DIMACS format,
 		  /// i.e. from a DIMACS file having a line starting with
 		  /// \code
 		  ///   p max
 		  /// \endcode
 		  /// At the beginning, \c g is cleared by \c g.clear(). The arc
 		  /// capacities are written to the \c capacity arc map and \c s and
 		  /// \c t are set to the source and the target nodes.
 		  ///
 		  /// If the capacity of an arc is negative, it will
 		  /// be set to "infinite" instead. The actual value of "infinite" is
 		  /// contolled by the \c infty parameter. If it is 0 (the default value),
 		  /// \c std::numeric_limits<Capacity>::infinity() will be used if available,
 		  /// \c std::numeric_limits<Capacity>::max() otherwise. If \c infty is set to
 		  /// a non-zero value, that value will be used as "infinite".
 		  ///
 		  /// If the file type was previously evaluated by dimacsType(), then
 		  /// the descriptor struct should be given by the \c dest parameter.
 		  template<typename Digraph, typename CapacityMap>
 		  void readDimacsMax(std::istream& is,
 		                     Digraph &g,
 		                     CapacityMap& capacity,
 		                     typename Digraph::Node &s,
 		                     typename Digraph::Node &t,
 		                     typename CapacityMap::Value infty = 0,
 		                     DimacsDescriptor desc=DimacsDescriptor()) {
 		    if(desc.type==DimacsDescriptor::NONE) desc=dimacsType(is);
 		    if(desc.type!=DimacsDescriptor::MAX)
 		      throw FormatError("Problem type mismatch");
 		    _readDimacs(is,g,capacity,s,t,infty,desc);
+		  }
 		  /// DIMACS shortest path reader function.
+		  /// \brief DIMACS shortest path reader function.
 		  ///
 		  /// This function reads a shortest path instance from DIMACS format,
 		  /// i.e. from a DIMACS file having a line starting with
 		  /// \code
 		  ///   p sp
 		  /// \endcode
 		  /// At the beginning, \c g is cleared by \c g.clear(). The arc
 		  /// lengths are written to the \c length arc map and \c s is set to the
 		  /// source node.
 		  ///
 		  /// If the file type was previously evaluated by dimacsType(), then
 		  /// the descriptor struct should be given by the \c dest parameter.
 		  template<typename Digraph, typename LengthMap>
 		  void readDimacsSp(std::istream& is,
 		                    Digraph &g,
 		                    LengthMap& length,
 		                    typename Digraph::Node &s,
 		                    DimacsDescriptor desc=DimacsDescriptor()) {
 		    typename Digraph::Node t;
 		    if(desc.type==DimacsDescriptor::NONE) desc=dimacsType(is);
 		    if(desc.type!=DimacsDescriptor::SP)
 		      throw FormatError("Problem type mismatch");
 		    _readDimacs(is, g, length, s, t, 0, desc);
+		  }
 		  /// DIMACS capacitated digraph reader function.
+		  /// \brief DIMACS capacitated digraph reader function.
 		  ///
 		  /// This function reads an arc capacitated digraph instance from
 		  /// DIMACS 'max' or 'sp' format.
 		  /// At the beginning, \c g is cleared by \c g.clear()
 		  /// and the arc capacities/lengths are written to the \c capacity
 		  /// arc map.
 		  ///
 		  /// In case of the 'max' format, if the capacity of an arc is negative,
 		  /// it will
 		  /// be set to "infinite" instead. The actual value of "infinite" is
 		  /// contolled by the \c infty parameter. If it is 0 (the default value),
 		  /// \c std::numeric_limits<Capacity>::infinity() will be used if available,
 		  /// \c std::numeric_limits<Capacity>::max() otherwise. If \c infty is set to
 		  /// a non-zero value, that value will be used as "infinite".
 		  ///
 		  /// If the file type was previously evaluated by dimacsType(), then
 		  /// the descriptor struct should be given by the \c dest parameter.
 		  template<typename Digraph, typename CapacityMap>
 		  void readDimacsCap(std::istream& is,
 		                     Digraph &g,
 		                     CapacityMap& capacity,
 		                     typename CapacityMap::Value infty = 0,
 		                     DimacsDescriptor desc=DimacsDescriptor()) {
 		    typename Digraph::Node u,v;
 		    if(desc.type==DimacsDescriptor::NONE) desc=dimacsType(is);
 		    if(desc.type!=DimacsDescriptor::MAX || desc.type!=DimacsDescriptor::SP)
 		      throw FormatError("Problem type mismatch");
 		    _readDimacs(is, g, capacity, u, v, infty, desc);
+		  }
 		  template<typename Graph>
 		  typename enable_if<lemon::UndirectedTagIndicator<Graph>,void>::type
 		  _addArcEdge(Graph &g, typename Graph::Node s, typename Graph::Node t,
 		              dummy<0> = 0)
+		  {
 		    g.addEdge(s,t);
+		  }
 		  template<typename Graph>
 		  typename disable_if<lemon::UndirectedTagIndicator<Graph>,void>::type
 		  _addArcEdge(Graph &g, typename Graph::Node s, typename Graph::Node t,
 		              dummy<1> = 1)
+		  {
 		    g.addArc(s,t);
+		  }
 		  /// DIMACS plain (di)graph reader function.
+		  /// \brief DIMACS plain (di)graph reader function.
 		  ///
 		  /// This function reads a (di)graph without any designated nodes and
 		  /// maps from DIMACS format, i.e. from DIMACS files having a line
-		  /// starting with
+		  /// This function reads a plain (di)graph without any designated nodes
 		  /// and maps (e.g. a matching instance) from DIMACS format, i.e. from
 		  /// DIMACS files having a line starting with
 		  /// \code
 		  ///   p mat
 		  /// \endcode
 		  /// At the beginning, \c g is cleared by \c g.clear().
 		  ///
 		  /// If the file type was previously evaluated by dimacsType(), then
 		  /// the descriptor struct should be given by the \c dest parameter.
 		  template<typename Graph>
 		  void readDimacsMat(std::istream& is, Graph &g,
 		                     DimacsDescriptor desc=DimacsDescriptor())
+		  {
 		    if(desc.type==DimacsDescriptor::NONE) desc=dimacsType(is);
 		    if(desc.type!=DimacsDescriptor::MAT)
 		      throw FormatError("Problem type mismatch");
 		    g.clear();
 		    std::vector<typename Graph::Node> nodes;
 		    char c;
 		    int i, j;
 		    std::string str;
 		    nodes.resize(desc.nodeNum + 1);
 		    for (int k = 1; k <= desc.nodeNum; ++k) {
 		      nodes[k] = g.addNode();
+		    }
 		    while (is >> c) {
 		      switch (c) {
 		      case 'c': // comment line
 		        getline(is, str);
 		        break;
 		      case 'n': // node definition line
 		        break;
 		      case 'a': // arc definition line
 		        is >> i >> j;
 		        getline(is, str);
 		        _addArcEdge(g,nodes[i], nodes[j]);
 		        break;
+		      }
+		    }
+		  }
 		  /// DIMACS plain digraph writer function.
 		  ///
 		  /// This function writes a digraph without any designated nodes and
 		  /// maps into DIMACS format, i.e. into DIMACS file having a line
 		  /// starting with
 		  /// \code
 		  ///   p mat
 		  /// \endcode
 		  /// If \c comment is not empty, then it will be printed in the first line
 		  /// prefixed by 'c'.
 		  template<typename Digraph>
 		  void writeDimacsMat(std::ostream& os, const Digraph &g,
 		                      std::string comment="") {
 		    typedef typename Digraph::NodeIt NodeIt;
 		    typedef typename Digraph::ArcIt ArcIt;
 		    if(!comment.empty())
 		      os << "c " << comment << std::endl;
 		    os << "p mat " << g.nodeNum() << " " << g.arcNum() << std::endl;
 		    typename Digraph::template NodeMap<int> nodes(g);
 		    int i = 1;
 		    for(NodeIt v(g); v != INVALID; ++v) {
 		      nodes.set(v, i);
 		      ++i;
+		    }
 		    for(ArcIt e(g); e != INVALID; ++e) {
 		      os << "a " << nodes[g.source(e)] << " " << nodes[g.target(e)]
 		         << std::endl;
+		    }
+		  }
 		  /// @}
 		} //namespace lemon
 		#endif //LEMON_DIMACS_H

lemon/graph_to_eps.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_GRAPH_TO_EPS_H
 		#define LEMON_GRAPH_TO_EPS_H
 		#include<iostream>
 		#include<fstream>
 		#include<sstream>
 		#include<algorithm>
 		#include<vector>
 		#ifndef WIN32
 		#include<sys/time.h>
 		#include<ctime>
 		#else
 		#include<lemon/bits/windows.h>
 		#endif
 		#include<lemon/math.h>
 		#include<lemon/core.h>
 		#include<lemon/dim2.h>
 		#include<lemon/maps.h>
 		#include<lemon/color.h>
 		#include<lemon/bits/bezier.h>
 		#include<lemon/error.h>
 		///\ingroup eps_io
 		///\file
 		///\brief A well configurable tool for visualizing graphs
 		namespace lemon {
 		  namespace _graph_to_eps_bits {
 		    template<class MT>
 		    class _NegY {
 		    public:
 		      typedef typename MT::Key Key;
 		      typedef typename MT::Value Value;
 		      const MT &map;
 		      int yscale;
 		      _NegY(const MT &m,bool b) : map(m), yscale(1-b*2) {}
 		      Value operator[](Key n) { return Value(map[n].x,map[n].y*yscale);}
 		    };
+		  }
 		///Default traits class of GraphToEps
 		///Default traits class of \ref GraphToEps.
 		///
 		///\param GR is the type of the underlying graph.
 		template<class GR>
 		struct DefaultGraphToEpsTraits
+		{
 		  typedef GR Graph;
 		  typedef typename Graph::Node Node;
 		  typedef typename Graph::NodeIt NodeIt;
 		  typedef typename Graph::Arc Arc;
 		  typedef typename Graph::ArcIt ArcIt;
 		  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;
 		  ConstMap<typename Graph::Node,double > _nodeSizes;
 		  ConstMap<typename Graph::Node,int > _nodeShapes;
 		  ConstMap<typename Graph::Node,Color > _nodeColors;
 		  ConstMap<typename Graph::Arc,Color > _arcColors;
 		  ConstMap<typename Graph::Arc,double > _arcWidths;
 		  double _arcWidthScale;
 		  double _nodeScale;
 		  double _xBorder, _yBorder;
 		  double _scale;
 		  double _nodeBorderQuotient;
 		  bool _drawArrows;
 		  double _arrowLength, _arrowWidth;
 		  bool _showNodes, _showArcs;
 		  bool _enableParallel;
 		  double _parArcDist;
 		  bool _showNodeText;
 		  ConstMap<typename Graph::Node,bool > _nodeTexts;
 		  double _nodeTextSize;
 		  bool _showNodePsText;
 		  ConstMap<typename Graph::Node,bool > _nodePsTexts;
 		  char *_nodePsTextsPreamble;
 		  bool _undirected;
 		  bool _pleaseRemoveOsStream;
 		  bool _scaleToA4;
 		  std::string _title;
 		  std::string _copyright;
 		  enum NodeTextColorType
 		    { DIST_COL=0, DIST_BW=1, CUST_COL=2, SAME_COL=3 } _nodeTextColorType;
 		  ConstMap<typename Graph::Node,Color > _nodeTextColors;
 		  bool _autoNodeScale;
 		  bool _autoArcWidthScale;
 		  bool _absoluteNodeSizes;
 		  bool _absoluteArcWidths;
 		  bool _negY;
 		  bool _preScale;
 		  ///Constructor
 		  ///Constructor
 		  ///\param gr  Reference to the graph to be printed.
 		  ///\param ost Reference to the output stream.
 		  ///By default it is <tt>std::cout</tt>.
 		  ///\param pros If it is \c true, then the \c ostream referenced by \c os
 		  ///will be explicitly deallocated by the destructor.
 		  DefaultGraphToEpsTraits(const GR &gr, std::ostream& ost = std::cout,
 		                          bool pros = false) :
 		    g(gr), os(ost),
 		    _coords(dim2::Point<double>(1,1)), _nodeSizes(1), _nodeShapes(0),
 		    _nodeColors(WHITE), _arcColors(BLACK),
 		    _arcWidths(1.0), _arcWidthScale(0.003),
 		    _nodeScale(.01), _xBorder(10), _yBorder(10), _scale(1.0),
 		    _nodeBorderQuotient(.1),
 		    _drawArrows(false), _arrowLength(1), _arrowWidth(0.3),
 		    _showNodes(true), _showArcs(true),
 		    _enableParallel(false), _parArcDist(1),
 		    _showNodeText(false), _nodeTexts(false), _nodeTextSize(1),
 		    _showNodePsText(false), _nodePsTexts(false), _nodePsTextsPreamble(0),
 		    _undirected(lemon::UndirectedTagIndicator<GR>::value),
 		    _pleaseRemoveOsStream(pros), _scaleToA4(false),
 		    _nodeTextColorType(SAME_COL), _nodeTextColors(BLACK),
 		    _autoNodeScale(false),
 		    _autoArcWidthScale(false),
 		    _absoluteNodeSizes(false),
 		    _absoluteArcWidths(false),
 		    _negY(false),
 		    _preScale(true)
 		  {}
 		};
 		///Auxiliary class to implement the named parameters of \ref graphToEps()
 		///Auxiliary class to implement the named parameters of \ref graphToEps().
 		///
 		///For detailed examples see the \ref graph_to_eps_demo.cc demo file.
 		template<class T> class GraphToEps : public T
+		{
 		  // Can't believe it is required by the C++ standard
 		  using T::g;
 		  using T::os;
 		  using T::_coords;
 		  using T::_nodeSizes;
 		  using T::_nodeShapes;
 		  using T::_nodeColors;
 		  using T::_arcColors;
 		  using T::_arcWidths;
 		  using T::_arcWidthScale;
 		  using T::_nodeScale;
 		  using T::_xBorder;
 		  using T::_yBorder;
 		  using T::_scale;
 		  using T::_nodeBorderQuotient;
 		  using T::_drawArrows;
 		  using T::_arrowLength;
 		  using T::_arrowWidth;
 		  using T::_showNodes;
 		  using T::_showArcs;
 		  using T::_enableParallel;
 		  using T::_parArcDist;
 		  using T::_showNodeText;
 		  using T::_nodeTexts;
 		  using T::_nodeTextSize;
 		  using T::_showNodePsText;
 		  using T::_nodePsTexts;
 		  using T::_nodePsTextsPreamble;
 		  using T::_undirected;
 		  using T::_pleaseRemoveOsStream;
 		  using T::_scaleToA4;
 		  using T::_title;
 		  using T::_copyright;
 		  using T::NodeTextColorType;
 		  using T::CUST_COL;
 		  using T::DIST_COL;
 		  using T::DIST_BW;
 		  using T::_nodeTextColorType;
 		  using T::_nodeTextColors;
 		  using T::_autoNodeScale;
 		  using T::_autoArcWidthScale;
 		  using T::_absoluteNodeSizes;
 		  using T::_absoluteArcWidths;
 		  using T::_negY;
 		  using T::_preScale;
 		  // dradnats ++C eht yb deriuqer si ti eveileb t'naC
 		  typedef typename T::Graph Graph;
 		  typedef typename Graph::Node Node;
 		  typedef typename Graph::NodeIt NodeIt;
 		  typedef typename Graph::Arc Arc;
 		  typedef typename Graph::ArcIt ArcIt;
 		  typedef typename Graph::InArcIt InArcIt;
 		  typedef typename Graph::OutArcIt OutArcIt;
 		  static const int INTERPOL_PREC;
 		  static const double A4HEIGHT;
 		  static const double A4WIDTH;
 		  static const double A4BORDER;
 		  bool dontPrint;
 		public:
 		  ///Node shapes
 		  ///Node shapes.
 		  ///
 		  enum NodeShapes {
 		    /// = 0
 		    ///\image html nodeshape_0.png
 		    ///\image latex nodeshape_0.eps "CIRCLE shape (0)" width=2cm
 		    CIRCLE=0,
 		    /// = 1
 		    ///\image html nodeshape_1.png
 		    ///\image latex nodeshape_1.eps "SQUARE shape (1)" width=2cm
 		    ///
 		    SQUARE=1,
 		    /// = 2
 		    ///\image html nodeshape_2.png
 		    ///\image latex nodeshape_2.eps "DIAMOND shape (2)" width=2cm
 		    ///
 		    DIAMOND=2,
 		    /// = 3
 		    ///\image html nodeshape_3.png
 		    ///\image latex nodeshape_2.eps "MALE shape (4)" width=2cm
 		    ///
 		    ///\image latex nodeshape_3.eps "MALE shape (3)" width=2cm
 		    MALE=3,
 		    /// = 4
 		    ///\image html nodeshape_4.png
 		    ///\image latex nodeshape_2.eps "FEMALE shape (4)" width=2cm
 		    ///
 		    ///\image latex nodeshape_4.eps "FEMALE shape (4)" width=2cm
 		    FEMALE=4
 		  };
 		private:
 		  class arcLess {
 		    const Graph &g;
 		  public:
 		    arcLess(const Graph &_g) : g(_g) {}
 		    bool operator()(Arc a,Arc b) const
+		    {
 		      Node ai=std::min(g.source(a),g.target(a));
 		      Node aa=std::max(g.source(a),g.target(a));
 		      Node bi=std::min(g.source(b),g.target(b));
 		      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))));
+		    }
 		  };
 		  bool isParallel(Arc e,Arc f) const
+		  {
 		    return (g.source(e)==g.source(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)
+		    {
 		      std::ostringstream os;
 		      os << p.x << ' ' << p.y;
 		      return os.str();
+		    }
 		  static std::string psOut(const Color &c)
+		    {
 		      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;
 		    const X &_coords;
 		    CoordsTraits(const T &t,const X &x) : T(t), _coords(x) {}
 		  };
 		  ///Sets the map of the node coordinates
 		  ///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.
 		  template<class X> GraphToEps<CoordsTraits<X> > coords(const X &x) {
 		    dontPrint=true;
 		    return GraphToEps<CoordsTraits<X> >(CoordsTraits<X>(*this,x));
+		  }
 		  template<class X> struct NodeSizesTraits : public T {
 		    const X &_nodeSizes;
 		    NodeSizesTraits(const T &t,const X &x) : T(t), _nodeSizes(x) {}
 		  };
 		  ///Sets the map of the node sizes
 		  ///Sets the map of the node sizes.
 		  ///\param x must be a node map with \c double (or convertible) values.
 		  template<class X> GraphToEps<NodeSizesTraits<X> > nodeSizes(const X &x)
+		  {
 		    dontPrint=true;
 		    return GraphToEps<NodeSizesTraits<X> >(NodeSizesTraits<X>(*this,x));
+		  }
 		  template<class X> struct NodeShapesTraits : public T {
 		    const X &_nodeShapes;
 		    NodeShapesTraits(const T &t,const X &x) : T(t), _nodeShapes(x) {}
 		  };
 		  ///Sets the map of the node shapes
 		  ///Sets the map of the node shapes.
 		  ///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.
 		  ///\sa NodeShapes
 		  template<class X> GraphToEps<NodeShapesTraits<X> > nodeShapes(const X &x)
+		  {
 		    dontPrint=true;
 		    return GraphToEps<NodeShapesTraits<X> >(NodeShapesTraits<X>(*this,x));
+		  }
 		  template<class X> struct NodeTextsTraits : public T {
 		    const X &_nodeTexts;
 		    NodeTextsTraits(const T &t,const X &x) : T(t), _nodeTexts(x) {}
 		  };
 		  ///Sets the text printed on the nodes
 		  ///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.
 		  template<class X> GraphToEps<NodeTextsTraits<X> > nodeTexts(const X &x)
+		  {
 		    dontPrint=true;
 		    _showNodeText=true;
 		    return GraphToEps<NodeTextsTraits<X> >(NodeTextsTraits<X>(*this,x));
+		  }
 		  template<class X> struct NodePsTextsTraits : public T {
 		    const X &_nodePsTexts;
 		    NodePsTextsTraits(const T &t,const X &x) : T(t), _nodePsTexts(x) {}
 		  };
 		  ///Inserts a PostScript block to the nodes
 		  ///With this command it is possible to insert a verbatim PostScript
 		  ///block to the nodes.
 		  ///The PS current point will be moved to the center of the node before
 		  ///the PostScript block inserted.
 		  ///
 		  ///Before and after the block a newline character is inserted so you
 		  ///don't have to bother with the separators.
 		  ///
 		  ///\param x must be a node map with type that can be pushed to a standard
 		  ///\c ostream.
 		  ///
 		  ///\sa nodePsTextsPreamble()
 		  template<class X> GraphToEps<NodePsTextsTraits<X> > nodePsTexts(const X &x)
+		  {
 		    dontPrint=true;
 		    _showNodePsText=true;
 		    return GraphToEps<NodePsTextsTraits<X> >(NodePsTextsTraits<X>(*this,x));
+		  }
 		  template<class X> struct ArcWidthsTraits : public T {
 		    const X &_arcWidths;
 		    ArcWidthsTraits(const T &t,const X &x) : T(t), _arcWidths(x) {}
 		  };
 		  ///Sets the map of the arc widths
 		  ///Sets the map of the arc widths.
 		  ///\param x must be an arc map with \c double (or convertible) values.
 		  template<class X> GraphToEps<ArcWidthsTraits<X> > arcWidths(const X &x)
+		  {
 		    dontPrint=true;
 		    return GraphToEps<ArcWidthsTraits<X> >(ArcWidthsTraits<X>(*this,x));
+		  }
 		  template<class X> struct NodeColorsTraits : public T {
 		    const X &_nodeColors;
 		    NodeColorsTraits(const T &t,const X &x) : T(t), _nodeColors(x) {}
 		  };
 		  ///Sets the map of the node colors
 		  ///Sets the map of the node colors.
 		  ///\param x must be a node map with \ref Color values.
 		  ///
 		  ///\sa Palette
 		  template<class X> GraphToEps<NodeColorsTraits<X> >
 		  nodeColors(const X &x)
+		  {
 		    dontPrint=true;
 		    return GraphToEps<NodeColorsTraits<X> >(NodeColorsTraits<X>(*this,x));
+		  }
 		  template<class X> struct NodeTextColorsTraits : public T {
 		    const X &_nodeTextColors;
 		    NodeTextColorsTraits(const T &t,const X &x) : T(t), _nodeTextColors(x) {}
 		  };
 		  ///Sets the map of the node text colors
 		  ///Sets the map of the node text colors.
 		  ///\param x must be a node map with \ref Color values.
 		  ///
 		  ///\sa Palette
 		  template<class X> GraphToEps<NodeTextColorsTraits<X> >
 		  nodeTextColors(const X &x)
+		  {
 		    dontPrint=true;
 		    _nodeTextColorType=CUST_COL;
 		    return GraphToEps<NodeTextColorsTraits<X> >
 		      (NodeTextColorsTraits<X>(*this,x));
+		  }
 		  template<class X> struct ArcColorsTraits : public T {
 		    const X &_arcColors;
 		    ArcColorsTraits(const T &t,const X &x) : T(t), _arcColors(x) {}
 		  };
 		  ///Sets the map of the arc colors
 		  ///Sets the map of the arc colors.
 		  ///\param x must be an arc map with \ref Color values.
 		  ///
 		  ///\sa Palette
 		  template<class X> GraphToEps<ArcColorsTraits<X> >
 		  arcColors(const X &x)
+		  {
 		    dontPrint=true;
 		    return GraphToEps<ArcColorsTraits<X> >(ArcColorsTraits<X>(*this,x));
+		  }
 		  ///Sets a global scale factor for node sizes
 		  ///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
 		  /// autoNodeScale() is not, then the node size given by
 		  /// nodeSizes() will be multiplied by the value \c d.
 		  /// If both nodeSizes() and autoNodeScale() are used, then the
 		  /// node sizes will be scaled in such a way that the greatest size will be
 		  /// equal to \c d.
 		  /// \sa nodeSizes()
 		  /// \sa autoNodeScale()
 		  GraphToEps<T> &nodeScale(double d=.01) {_nodeScale=d;return *this;}
 		  ///Turns on/off the automatic node size scaling.
 		  ///Turns on/off the automatic node size scaling.
 		  ///
 		  ///\sa nodeScale()
 		  ///
 		  GraphToEps<T> &autoNodeScale(bool b=true) {
 		    _autoNodeScale=b;return *this;
+		  }
 		  ///Turns on/off the absolutematic node size scaling.
 		  ///Turns on/off the absolutematic node size scaling.
 		  ///
 		  ///\sa nodeScale()
 		  ///
 		  GraphToEps<T> &absoluteNodeSizes(bool b=true) {
 		    _absoluteNodeSizes=b;return *this;
+		  }
 		  ///Negates the Y coordinates.
 		  GraphToEps<T> &negateY(bool b=true) {
 		    _negY=b;return *this;
+		  }
 		  ///Turn on/off pre-scaling
 		  ///By default graphToEps() rescales the whole image in order to avoid
 		  ///very big or very small bounding boxes.
 		  ///
 		  ///This (p)rescaling can be turned off with this function.
 		  ///
 		  GraphToEps<T> &preScale(bool b=true) {
 		    _preScale=b;return *this;
+		  }
 		  ///Sets a global scale factor for arc widths
 		  /// Sets a global scale factor for arc widths.
 		  ///
 		  /// If arcWidths() is not given, this function simply sets the arc
 		  /// widths to \c d.  If arcWidths() is given, but
 		  /// autoArcWidthScale() is not, then the arc withs given by
 		  /// arcWidths() will be multiplied by the value \c d.
 		  /// If both arcWidths() and autoArcWidthScale() are used, then the
 		  /// arc withs will be scaled in such a way that the greatest width will be
 		  /// equal to \c d.
 		  GraphToEps<T> &arcWidthScale(double d=.003) {_arcWidthScale=d;return *this;}
 		  ///Turns on/off the automatic arc width scaling.
 		  ///Turns on/off the automatic arc width scaling.
 		  ///
 		  ///\sa arcWidthScale()
 		  ///
 		  GraphToEps<T> &autoArcWidthScale(bool b=true) {
 		    _autoArcWidthScale=b;return *this;
+		  }
 		  ///Turns on/off the absolutematic arc width scaling.
 		  ///Turns on/off the absolutematic arc width scaling.
 		  ///
 		  ///\sa arcWidthScale()
 		  ///
 		  GraphToEps<T> &absoluteArcWidths(bool b=true) {
 		    _absoluteArcWidths=b;return *this;
+		  }
 		  ///Sets a global scale factor for the whole picture
 		  GraphToEps<T> &scale(double d) {_scale=d;return *this;}
 		  ///Sets the width of the border around the picture
 		  GraphToEps<T> &border(double b=10) {_xBorder=_yBorder=b;return *this;}
 		  ///Sets the width of the border around the picture
 		  GraphToEps<T> &border(double x, double y) {
 		    _xBorder=x;_yBorder=y;return *this;
+		  }
 		  ///Sets whether to draw arrows
 		  GraphToEps<T> &drawArrows(bool b=true) {_drawArrows=b;return *this;}
 		  ///Sets the length of the arrowheads
 		  GraphToEps<T> &arrowLength(double d=1.0) {_arrowLength*=d;return *this;}
 		  ///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;}
 		  ///Sets the color of the node texts to be different from the node color
 		  ///Sets the color of the node texts to be as different from the node color
 		  ///as it is possible.
 		  GraphToEps<T> &distantColorNodeTexts()
 		  {_nodeTextColorType=DIST_COL;return *this;}
 		  ///Sets the color of the node texts to be black or white and always visible.
 		  ///Sets the color of the node texts to be black or white according to
 		  ///which is more different from the node color.
 		  GraphToEps<T> &distantBWNodeTexts()
 		  {_nodeTextColorType=DIST_BW;return *this;}
 		  ///Gives a preamble block for node Postscript block.
 		  ///Gives a preamble block for node Postscript block.
 		  ///
 		  ///\sa nodePsTexts()
 		  GraphToEps<T> & nodePsTextsPreamble(const char *str) {
 		    _nodePsTextsPreamble=str ;return *this;
+		  }
 		  ///Sets whether the graph is undirected
 		  ///Sets whether the graph is undirected.
 		  ///
 		  ///This setting is the default for undirected graphs.
 		  ///
 		  ///\sa directed()
 		   GraphToEps<T> &undirected(bool b=true) {_undirected=b;return *this;}
 		  ///Sets whether the graph is directed
 		  ///Sets whether the graph is directed.
 		  ///Use it to show the edges as a pair of directed ones.
 		  ///
 		  ///This setting is the default for digraphs.
 		  ///
 		  ///\sa undirected()
 		  GraphToEps<T> &directed(bool b=true) {_undirected=!b;return *this;}
 		  ///Sets the title.
 		  ///Sets the title of the generated image,
 		  ///namely it inserts a <tt>%%Title:</tt> DSC field to the header of
 		  ///the EPS file.
 		  GraphToEps<T> &title(const std::string &t) {_title=t;return *this;}
 		  ///Sets the copyright statement.
 		  ///Sets the copyright statement of the generated image,
 		  ///namely it inserts a <tt>%%Copyright:</tt> DSC field to the header of
 		  ///the EPS file.
 		  GraphToEps<T> &copyright(const std::string &t) {_copyright=t;return *this;}
 		protected:
 		  bool isInsideNode(dim2::Point<double> p, double r,int t)
+		  {
 		    switch(t) {
 		    case CIRCLE:
 		    case MALE:
 		    case FEMALE:
 		      return p.normSquare()<=r*r;
 		    case SQUARE:
 		      return p.x<=r&&p.x>=-r&&p.y<=r&&p.y>=-r;
 		    case DIAMOND:
 		      return p.x+p.y<=r && p.x-p.y<=r && -p.x+p.y<=r && -p.x-p.y<=r;
+		    }
 		    return false;
+		  }
 		public:
 		  ~GraphToEps() { }
 		  ///Draws the graph.
 		  ///Like other functions using
 		  ///\ref named-templ-func-param "named template parameters",
 		  ///this function calls the algorithm itself, i.e. in this case
 		  ///it draws the graph.
 		  void run() {
 		    const double EPSILON=1e-9;
 		    if(dontPrint) return;
 		    _graph_to_eps_bits::_NegY<typename T::CoordsMapType>
 		      mycoords(_coords,_negY);
 		    os << "%!PS-Adobe-2.0 EPSF-2.0\n";
 		    if(_title.size()>0) os << "%%Title: " << _title << '\n';
 		     if(_copyright.size()>0) os << "%%Copyright: " << _copyright << '\n';
 		    os << "%%Creator: LEMON, graphToEps()\n";
+		    {
 		      os << "%%CreationDate: ";
 		#ifndef WIN32
 		      timeval tv;
 		      gettimeofday(&tv, 0);
 		      char cbuf[26];
 		      ctime_r(&tv.tv_sec,cbuf);
 		      os << cbuf;
 		#else
 		      os << bits::getWinFormattedDate();
 		#endif
+		    }
 		    os << std::endl;
 		    if (_autoArcWidthScale) {
 		      double max_w=0;
 		      for(ArcIt e(g);e!=INVALID;++e)
 		        max_w=std::max(double(_arcWidths[e]),max_w);
 		      if(max_w>EPSILON) {
 		        _arcWidthScale/=max_w;
+		      }
+		    }
 		    if (_autoNodeScale) {
 		      double max_s=0;
 		      for(NodeIt n(g);n!=INVALID;++n)
 		        max_s=std::max(double(_nodeSizes[n]),max_s);
 		      if(max_s>EPSILON) {
 		        _nodeScale/=max_s;
+		      }
+		    }
 		    double diag_len = 1;
 		    if(!(_absoluteNodeSizes&&_absoluteArcWidths)) {
 		      dim2::Box<double> bb;
 		      for(NodeIt n(g);n!=INVALID;++n) bb.add(mycoords[n]);
 		      if (bb.empty()) {
 		        bb = dim2::Box<double>(dim2::Point<double>(0,0));
+		      }
 		      diag_len = std::sqrt((bb.bottomLeft()-bb.topRight()).normSquare());
 		      if(diag_len<EPSILON) diag_len = 1;
 		      if(!_absoluteNodeSizes) _nodeScale*=diag_len;
 		      if(!_absoluteArcWidths) _arcWidthScale*=diag_len;
+		    }
 		    dim2::Box<double> bb;
 		    for(NodeIt n(g);n!=INVALID;++n) {
 		      double ns=_nodeSizes[n]*_nodeScale;
 		      dim2::Point<double> p(ns,ns);
 		      switch(_nodeShapes[n]) {
 		      case CIRCLE:
 		      case SQUARE:
 		      case DIAMOND:
 		        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;
 		      case FEMALE:
 		        bb.add(p+mycoords[n]);
 		        bb.add(dim2::Point<double>(-ns,-3.01*ns)+mycoords[n]);
 		        break;
+		      }
+		    }
 		    if (bb.empty()) {
 		      bb = dim2::Box<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;
+		      }
 		      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';
+		    }
 		    os << "%%EndComments\n";
 		    //x1 y1 x2 y2 x3 y3 cr cg cb w
 		    os << "/lb { setlinewidth setrgbcolor newpath moveto\n"
 		       << "      4 2 roll 1 index 1 index curveto stroke } bind def\n";
 		    os << "/l { setlinewidth setrgbcolor newpath moveto lineto stroke }"
 		       << " bind def\n";
 		    //x y r
 		    os << "/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath }"
 		       << " bind def\n";
 		    //x y r
 		    os << "/sq { newpath 2 index 1 index add 2 index 2 index add moveto\n"
 		       << "      2 index 1 index sub 2 index 2 index add lineto\n"
 		       << "      2 index 1 index sub 2 index 2 index sub lineto\n"
 		       << "      2 index 1 index add 2 index 2 index sub lineto\n"
 		       << "      closepath pop pop pop} bind def\n";
 		    //x y r
 		    os << "/di { newpath 2 index 1 index add 2 index moveto\n"
 		       << "      2 index             2 index 2 index add lineto\n"
 		       << "      2 index 1 index sub 2 index             lineto\n"
 		       << "      2 index             2 index 2 index sub lineto\n"
 		       << "      closepath pop pop pop} bind def\n";
 		    // x y r cr cg cb
 		    os << "/nc { 0 0 0 setrgbcolor 5 index 5 index 5 index c fill\n"
 		       << "     setrgbcolor " << 1+_nodeBorderQuotient << " div c fill\n"
 		       << "   } bind def\n";
 		    os << "/nsq { 0 0 0 setrgbcolor 5 index 5 index 5 index sq fill\n"
 		       << "     setrgbcolor " << 1+_nodeBorderQuotient << " div sq fill\n"
 		       << "   } bind def\n";
 		    os << "/ndi { 0 0 0 setrgbcolor 5 index 5 index 5 index di fill\n"
 		       << "     setrgbcolor " << 1+_nodeBorderQuotient << " div di fill\n"
 		       << "   } bind def\n";
 		    os << "/nfemale { 0 0 0 setrgbcolor 3 index "
 		       << _nodeBorderQuotient/(1+_nodeBorderQuotient)

lemon/kruskal.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_KRUSKAL_H
 		#define LEMON_KRUSKAL_H
 		#include <algorithm>
 		#include <vector>
 		#include <lemon/unionfind.h>
 		#include <lemon/maps.h>
 		#include <lemon/core.h>
 		#include <lemon/bits/traits.h>
 		///\ingroup spantree
 		///\file
 		///\brief Kruskal's algorithm to compute a minimum cost spanning tree
 		///
 		///Kruskal's algorithm to compute a minimum cost spanning tree.
 		///
 		namespace lemon {
 		  namespace _kruskal_bits {
 		    // Kruskal for directed graphs.
 		    template <typename Digraph, typename In, typename Out>
 		    typename disable_if<lemon::UndirectedTagIndicator<Digraph>,
 		                       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);
 		      for (typename Digraph::NodeIt it(digraph); it != INVALID; ++it) {
 		        uf.insert(it);
+		      }
 		      Value tree_value = 0;
 		      for (typename In::const_iterator it = in.begin(); it != in.end(); ++it) {
 		        if (uf.join(digraph.target(it->first),digraph.source(it->first))) {
 		          out.set(it->first, true);
 		          tree_value += it->second;
+		        }
 		        else {
 		          out.set(it->first, false);
+		        }
+		      }
 		      return tree_value;
+		    }
 		    // Kruskal for undirected graphs.
 		    template <typename Graph, typename In, typename Out>
 		    typename enable_if<lemon::UndirectedTagIndicator<Graph>,
 		                       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);
 		      for (typename Graph::NodeIt it(graph); it != INVALID; ++it) {
 		        uf.insert(it);
+		      }
 		      Value tree_value = 0;
 		      for (typename In::const_iterator it = in.begin(); it != in.end(); ++it) {
 		        if (uf.join(graph.u(it->first),graph.v(it->first))) {
 		          out.set(it->first, true);
 		          tree_value += it->second;
+		        }
 		        else {
 		          out.set(it->first, false);
+		        }
+		      }
 		      return tree_value;
+		    }
 		    template <typename Sequence>
 		    struct PairComp {
 		      typedef typename Sequence::value_type Value;
 		      bool operator()(const Value& left, const Value& right) {
 		        return left.second < right.second;
+		      }
 		    };
 		    template <typename In, typename Enable = void>
 		    struct SequenceInputIndicator {
 		      static const bool value = false;
 		    };
 		    template <typename In>
 		    struct SequenceInputIndicator<In,
 		      typename exists<typename In::value_type::first_type>::type> {
 		      static const bool value = true;
 		    };
 		    template <typename In, typename Enable = void>
 		    struct MapInputIndicator {
 		      static const bool value = false;
 		    };
 		    template <typename In>
 		    struct MapInputIndicator<In,
 		      typename exists<typename In::Value>::type> {
 		      static const bool value = true;
 		    };
 		    template <typename In, typename Enable = void>
 		    struct SequenceOutputIndicator {
 		      static const bool value = false;
 		    };
 		    template <typename Out>
 		    struct SequenceOutputIndicator<Out,
 		      typename exists<typename Out::value_type>::type> {
 		      static const bool value = true;
 		    };
 		    template <typename Out, typename Enable = void>
 		    struct MapOutputIndicator {
 		      static const bool value = false;
 		    };
 		    template <typename Out>
 		    struct MapOutputIndicator<Out,
 		      typename exists<typename Out::Value>::type> {
 		      static const bool value = true;
 		    };
 		    template <typename In, typename InEnable = void>
 		    struct KruskalValueSelector {};
 		    template <typename In>
 		    struct KruskalValueSelector<In,
 		      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>
+		    {
 		      typedef typename In::Value Value;
 		    };
 		    template <typename Graph, typename In, typename Out,
 		              typename InEnable = void>
 		    struct KruskalInputSelector {};
 		    template <typename Graph, typename In, typename Out,
 		              typename InEnable = void>
 		    struct KruskalOutputSelector {};
 		    template <typename Graph, typename In, typename Out>
 		    struct KruskalInputSelector<Graph, In, Out,
 		      typename enable_if<SequenceInputIndicator<In>, void>::type >
+		    {
 		      typedef typename In::value_type::second_type Value;
 		      static Value kruskal(const Graph& graph, const In& in, Out& out) {
 		        return KruskalOutputSelector<Graph, In, Out>::
 		          kruskal(graph, in, out);
+		      }
 		    };
 		    template <typename Graph, typename In, typename Out>
 		    struct KruskalInputSelector<Graph, In, Out,
 		      typename enable_if<MapInputIndicator<In>, void>::type >
+		    {
 		      typedef typename In::Value Value;
 		      static Value kruskal(const Graph& graph, const In& in, Out& out) {
 		        typedef typename In::Key MapArc;
 		        typedef typename In::Value Value;
 		        typedef typename ItemSetTraits<Graph, MapArc>::ItemIt MapArcIt;
 		        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]));
+		        }
 		        std::sort(seq.begin(), seq.end(), PairComp<Sequence>());
 		        return KruskalOutputSelector<Graph, Sequence, Out>::
 		          kruskal(graph, seq, out);
+		      }
 		    };
 		    template <typename T>
 		    struct RemoveConst {
 		      typedef T type;
 		    };
 		    template <typename T>
 		    struct RemoveConst<const T> {
 		      typedef T type;
 		    };
 		    template <typename Graph, typename In, typename Out>
 		    struct KruskalOutputSelector<Graph, In, Out,
 		      typename enable_if<SequenceOutputIndicator<Out>, void>::type >
+		    {
 		      typedef typename In::value_type::second_type Value;
 		      static Value kruskal(const Graph& graph, const In& in, Out& out) {
 		        typedef LoggerBoolMap<typename RemoveConst<Out>::type> Map;
 		        Map map(out);
 		        return _kruskal_bits::kruskal(graph, in, map);
+		      }
 		    };
 		    template <typename Graph, typename In, typename Out>
 		    struct KruskalOutputSelector<Graph, In, Out,
 		      typename enable_if<MapOutputIndicator<Out>, void>::type >
+		    {
 		      typedef typename In::value_type::second_type Value;
 		      static Value kruskal(const Graph& graph, const In& in, Out& out) {
 		        return _kruskal_bits::kruskal(graph, in, out);
+		      }
 		    };
+		  }
 		  /// \ingroup spantree
 		  ///
-		  /// \brief Kruskal algorithm to find a minimum cost spanning tree of
+		  /// \brief Kruskal's algorithm for finding a minimum cost spanning tree of
 		  /// a graph.
 		  ///
 		  /// This function runs Kruskal's algorithm to find a minimum cost
 		  /// spanning tree.
+		  /// spanning tree of a graph.
 		  /// 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
 		  /// \ref concepts::Graph "undirected".
 		  /// 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.
 		  /// It can be one of the following choices.
 		  /// - An STL compatible 'Forward Container' with
 		  /// <tt>std::pair<GR::Arc,X></tt> or
 		  /// <tt>std::pair<GR::Edge,X></tt> as its <tt>value_type</tt>, where
-		  /// \c X is the type of the costs. The pairs indicates the arcs/edges
+		  /// <tt>std::pair<GR::Arc,C></tt> or
 		  /// <tt>std::pair<GR::Edge,C></tt> as its <tt>value_type</tt>, where
 		  /// \c C is the type of the costs. The pairs indicates the arcs/edges
 		  /// 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
 		  /// arc/edge costs.
 		  ///
 		  /// \retval out Here we also have a choice.
 		  /// - It can be a writable \c bool arc/edge map. After running the
 		  /// algorithm it will contain the found minimum cost spanning
 		  /// - It can be a writable arc/edge map with \c bool value type. After
 		  /// running the algorithm it will contain the found minimum cost spanning
 		  /// tree: the value of an arc/edge will be set to \c true if it belongs
 		  /// to the tree, otherwise it will be set to \c false. The value of
 		  /// each arc/edge will be set exactly once.
 		  /// - It can also be an iteraror of an STL Container with
 		  /// <tt>GR::Arc</tt> or <tt>GR::Edge</tt> as its
 		  /// <tt>value_type</tt>.  The algorithm copies the elements of the
 		  /// found tree into this sequence.  For example, if we know that the
 		  /// spanning tree of the graph \c g has say 53 arcs, then we can
 		  /// put its arcs into an STL vector \c tree with a code like this.
 		  ///\code
 		  /// std::vector<Arc> tree(53);
 		  /// kruskal(g,cost,tree.begin());
 		  ///\endcode
 		  /// Or if we don't know in advance the size of the tree, we can
 		  /// write this.
 		  ///\code
 		  /// std::vector<Arc> tree;
 		  /// kruskal(g,cost,std::back_inserter(tree));
 		  ///\endcode
 		  ///
 		  /// \return The total cost of the found spanning tree.
 		  ///
 		  /// \note If the input graph is not (weakly) connected, a spanning
 		  /// forest is calculated instead of a spanning tree.
 		#ifdef DOXYGEN
 		  template <class Graph, class In, class Out>
 		  Value kruskal(GR const& g, const In& in, Out& out)
 		  template <typename Graph, typename In, typename Out>
 		  Value kruskal(const Graph& g, const In& in, Out& out)
 		#else
 		  template <class Graph, class In, class Out>
 		  inline typename _kruskal_bits::KruskalValueSelector<In>::Value
 		  kruskal(const Graph& graph, const In& in, Out& out)
 		#endif
+		  {
 		    return _kruskal_bits::KruskalInputSelector<Graph, In, Out>::
 		      kruskal(graph, in, out);
+		  }
 		  template <class Graph, class In, class Out>
 		  inline typename _kruskal_bits::KruskalValueSelector<In>::Value
 		  kruskal(const Graph& graph, const In& in, const Out& out)
+		  {
 		    return _kruskal_bits::KruskalInputSelector<Graph, In, const Out>::
 		      kruskal(graph, in, out);
+		  }
 		} //namespace lemon
 		#endif //LEMON_KRUSKAL_H

lemon/lgf_reader.h

Show inline comments

@@ -84,2592 +84,2592 @@
 		    class MapStorage : public MapStorageBase<_Item> {
 		    public:
 		      typedef _Map Map;
 		      typedef _Converter Converter;
 		      typedef _Item Item;
 		    private:
 		      Map& _map;
 		      Converter _converter;
 		    public:
 		      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));
+		      }
 		    };
 		    template <typename _Graph, bool _dir, typename _Map,
 		              typename _Converter = DefaultConverter<typename _Map::Value> >
 		    class GraphArcMapStorage : public MapStorageBase<typename _Graph::Edge> {
 		    public:
 		      typedef _Map Map;
 		      typedef _Converter Converter;
 		      typedef _Graph Graph;
 		      typedef typename Graph::Edge Item;
 		      static const bool dir = _dir;
 		    private:
 		      const Graph& _graph;
 		      Map& _map;
 		      Converter _converter;
 		    public:
 		      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));
+		      }
 		    };
 		    class ValueStorageBase {
 		    public:
 		      ValueStorageBase() {}
 		      virtual ~ValueStorageBase() {}
 		      virtual void set(const std::string&) = 0;
 		    };
 		    template <typename _Value, typename _Converter = DefaultConverter<_Value> >
 		    class ValueStorage : public ValueStorageBase {
 		    public:
 		      typedef _Value Value;
 		      typedef _Converter Converter;
 		    private:
 		      Value& _value;
 		      Converter _converter;
 		    public:
 		      ValueStorage(Value& value, const Converter& converter = Converter())
 		        : _value(value), _converter(converter) {}
 		      virtual void set(const std::string& value) {
 		        _value = _converter(value);
+		      }
 		    };
 		    template <typename Value>
 		    struct MapLookUpConverter {
 		      const std::map<std::string, Value>& _map;
 		      MapLookUpConverter(const std::map<std::string, Value>& map)
 		        : _map(map) {}
 		      Value operator()(const std::string& str) {
 		        typename std::map<std::string, Value>::const_iterator it =
 		          _map.find(str);
 		        if (it == _map.end()) {
 		          std::ostringstream msg;
 		          msg << "Item not found: " << str;
 		          throw FormatError(msg.str());
+		        }
 		        return it->second;
+		      }
 		    };
 		    template <typename Graph>
 		    struct GraphArcLookUpConverter {
 		      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) {}
 		      typename Graph::Arc operator()(const std::string& str) {
 		        if (str.empty() || (str[0] != '+' && str[0] != '-')) {
 		          throw FormatError("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 FormatError("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';
+		    }
 		    inline bool isOct(char c) {
 		      return '0' <= c && c <='7';
+		    }
 		    inline int valueOct(char c) {
 		      LEMON_ASSERT(isOct(c), "The character is not octal.");
 		      return c - '0';
+		    }
 		    inline bool isHex(char c) {
 		      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.");
 		      if ('0' <= c && c <= '9') return c - '0';
 		      if ('a' <= c && c <= 'z') return c - 'a' + 10;
 		      return c - 'A' + 10;
+		    }
 		    inline bool isIdentifierFirstChar(char c) {
 		      return ('a' <= c && c <= 'z') ||
 		        ('A' <= c && c <= 'Z') || c == '_';
+		    }
 		    inline bool isIdentifierChar(char c) {
 		      return isIdentifierFirstChar(c) ||
 		        ('0' <= c && c <= '9');
+		    }
 		    inline char readEscape(std::istream& is) {
 		      char c;
 		      if (!is.get(c))
 		        throw FormatError("Escape format error");
 		      switch (c) {
 		      case '\\':
 		        return '\\';
 		      case '\"':
 		        return '\"';
 		      case '\'':
 		        return '\'';
 		      case '\?':
 		        return '\?';
 		      case 'a':
 		        return '\a';
 		      case 'b':
 		        return '\b';
 		      case 'f':
 		        return '\f';
 		      case 'n':
 		        return '\n';
 		      case 'r':
 		        return '\r';
 		      case 't':
 		        return '\t';
 		      case 'v':
 		        return '\v';
 		      case 'x':
+		        {
 		          int code;
 		          if (!is.get(c) || !isHex(c))
 		            throw FormatError("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 FormatError("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;
 		      char c;
 		      is >> std::ws;
 		      if (!is.get(c))
 		        return is;
 		      if (c == '\"') {
 		        while (is.get(c) && c != '\"') {
 		          if (c == '\\')
 		            c = readEscape(is);
 		          os << c;
+		        }
 		        if (!is)
 		          throw FormatError("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);
+		        }
+		      }
 		      str = os.str();
 		      return is;
+		    }
 		    class Section {
 		    public:
 		      virtual ~Section() {}
 		      virtual void process(std::istream& is, int& line_num) = 0;
 		    };
 		    template <typename Functor>
 		    class LineSection : public Section {
 		    private:
 		      Functor _functor;
 		    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();
+		      }
 		    };
 		    template <typename Functor>
 		    class StreamSection : public Section {
 		    private:
 		      Functor _functor;
 		    public:
 		      StreamSection(const Functor& functor) : _functor(functor) {}
 		      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();
+		      }
 		    };
+		  }
 		  template <typename Digraph>
 		  class DigraphReader;
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(Digraph& digraph,
 		                                       std::istream& is = std::cin);
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn);
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn);
 		  /// \ingroup lemon_io
 		  ///
 		  /// \brief \ref lgf-format "LGF" reader for directed graphs
 		  ///
 		  /// This utility reads an \ref lgf-format "LGF" file.
 		  ///
 		  /// The reading method does a batch processing. The user creates a
 		  /// reader object, then various reading rules can be added to the
 		  /// reader, and eventually the reading is executed with the \c run()
 		  /// member function. A map reading rule can be added to the reader
 		  /// with the \c nodeMap() or \c arcMap() members. An optional
 		  /// converter parameter can also be added as a standard functor
 		  /// converting from \c std::string to the value type of the map. If it
 		  /// is set, it will determine how the tokens in the file should be
 		  /// converted to the value type of the map. If the functor is not set,
 		  /// then a default conversion will be used. One map can be read into
 		  /// multiple map objects at the same time. The \c attribute(), \c
 		  /// node() and \c arc() functions are used to add attribute reading
 		  /// rules.
 		  ///
 		  ///\code
 		  /// DigraphReader<Digraph>(digraph, std::cin).
 		  ///   nodeMap("coordinates", coord_map).
 		  ///   arcMap("capacity", cap_map).
 		  ///   node("source", src).
 		  ///   node("target", trg).
 		  ///   attribute("caption", caption).
 		  ///   run();
 		  ///\endcode
 		  ///
 		  /// By default the reader uses the first section in the file of the
 		  /// proper type. If a section has an optional name, then it can be
 		  /// selected for reading by giving an optional name parameter to the
 		  /// \c nodes(), \c arcs() or \c attributes() functions.
 		  ///
 		  /// The \c useNodes() and \c useArcs() functions are used to tell the reader
 		  /// that the nodes or arcs should not be constructed (added to the
 		  /// graph) during the reading, but instead the label map of the items
 		  /// are given as a parameter of these functions. An
 		  /// application of these functions is multipass reading, which is
 		  /// important if two \c \@arcs sections must be read from the
 		  /// file. In this case the first phase would read the node set and one
 		  /// of the arc sets, while the second phase would read the second arc
 		  /// set into an \e ArcSet class (\c SmartArcSet or \c ListArcSet).
 		  /// The previously read label node map should be passed to the \c
 		  /// useNodes() functions. Another application of multipass reading when
 		  /// paths are given as a node map or an arc map.
 		  /// It is impossible to read this in
 		  /// a single pass, because the arcs are not constructed when the node
 		  /// maps are read.
 		  template <typename GR>
 		  class DigraphReader {
 		  public:
 		    typedef GR Digraph;
 		  private:
 		    TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
 		    std::istream* _is;
 		    bool local_is;
 		    std::string _filename;
 		    Digraph& _digraph;
 		    std::string _nodes_caption;
 		    std::string _arcs_caption;
 		    std::string _attributes_caption;
 		    typedef std::map<std::string, Node> NodeIndex;
 		    NodeIndex _node_index;
 		    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<Arc>*> >ArcMaps;
 		    ArcMaps _arc_maps;
 		    typedef std::multimap<std::string, _reader_bits::ValueStorageBase*>
 		      Attributes;
 		    Attributes _attributes;
 		    bool _use_nodes;
 		    bool _use_arcs;
 		    bool _skip_nodes;
 		    bool _skip_arcs;
 		    int line_num;
 		    std::istringstream line;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph reader, which reads from the given
 		    /// input stream.
 		    DigraphReader(Digraph& digraph, std::istream& is = std::cin)
 		      : _is(&is), local_is(false), _digraph(digraph),
 		        _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(Digraph& digraph, const std::string& fn)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true),
 		        _filename(fn), _digraph(digraph),
 		        _use_nodes(false), _use_arcs(false),
 		        _skip_nodes(false), _skip_arcs(false) {
 		      if (!(*_is)) {
 		        delete _is;
 		        throw IoError("Cannot open file", fn);
+		      }
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph reader, which reads from the given
 		    /// file.
 		    DigraphReader(Digraph& digraph, const char* fn)
 		      : _is(new std::ifstream(fn)), local_is(true),
 		        _filename(fn), _digraph(digraph),
 		        _use_nodes(false), _use_arcs(false),
 		        _skip_nodes(false), _skip_arcs(false) {
 		      if (!(*_is)) {
 		        delete _is;
 		        throw IoError("Cannot open file", fn);
+		      }
+		    }
 		    /// \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;
+		      }
 		      if (local_is) {
 		        delete _is;
+		      }
+		    }
 		  private:
 		    template <typename DGR>
 		    friend DigraphReader<DGR> digraphReader(DGR& digraph, std::istream& is);
 		    template <typename DGR>
 		    friend DigraphReader<DGR> digraphReader(DGR& digraph,
 		                                            const std::string& fn);
 		    template <typename DGR>
 		    friend DigraphReader<DGR> digraphReader(DGR& digraph, const char *fn);
 		    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) {
 		      other._is = 0;
 		      other.local_is = false;
 		      _node_index.swap(other._node_index);
 		      _arc_index.swap(other._arc_index);
 		      _node_maps.swap(other._node_maps);
 		      _arc_maps.swap(other._arc_maps);
 		      _attributes.swap(other._attributes);
 		      _nodes_caption = other._nodes_caption;
 		      _arcs_caption = other._arcs_caption;
 		      _attributes_caption = other._attributes_caption;
+		    }
 		    DigraphReader& operator=(const DigraphReader&);
 		  public:
-		    /// \name Reading rules
+		    /// \name Reading Rules
 		    /// @{
 		    /// \brief Node map reading rule
 		    ///
 		    /// Add a node map reading rule to the reader.
 		    template <typename Map>
 		    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);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node map reading rule
 		    ///
 		    /// Add a node map reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Map, typename 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);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map reading rule
 		    ///
 		    /// Add an arc map reading rule to the reader.
 		    template <typename Map>
 		    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);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map reading rule
 		    ///
 		    /// Add an arc map reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Map, typename 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);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute reading rule
 		    ///
 		    /// Add an attribute reading rule to the reader.
 		    template <typename Value>
 		    DigraphReader& attribute(const std::string& caption, Value& value) {
 		      _reader_bits::ValueStorageBase* storage =
 		        new _reader_bits::ValueStorage<Value>(value);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute reading rule
 		    ///
 		    /// Add an attribute reading rule with specialized converter to the
 		    /// 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);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node reading rule
 		    ///
 		    /// Add a node reading rule to reader.
 		    DigraphReader& node(const std::string& caption, Node& node) {
 		      typedef _reader_bits::MapLookUpConverter<Node> Converter;
 		      Converter converter(_node_index);
 		      _reader_bits::ValueStorageBase* storage =
 		        new _reader_bits::ValueStorage<Node, Converter>(node, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc reading rule
 		    ///
 		    /// Add an arc reading rule to reader.
 		    DigraphReader& arc(const std::string& caption, Arc& arc) {
 		      typedef _reader_bits::MapLookUpConverter<Arc> Converter;
 		      Converter converter(_arc_index);
 		      _reader_bits::ValueStorageBase* storage =
 		        new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// @}
-		    /// \name Select section by name
+		    /// \name Select Section by Name
 		    /// @{
 		    /// \brief Set \c \@nodes section to be read
 		    ///
 		    /// Set \c \@nodes section to be read
 		    DigraphReader& nodes(const std::string& caption) {
 		      _nodes_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@arcs section to be read
 		    ///
 		    /// Set \c \@arcs section to be read
 		    DigraphReader& arcs(const std::string& caption) {
 		      _arcs_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@attributes section to be read
 		    ///
 		    /// Set \c \@attributes section to be read
 		    DigraphReader& attributes(const std::string& caption) {
 		      _attributes_caption = caption;
 		      return *this;
+		    }
 		    /// @}
-		    /// \name Using previously constructed node or arc set
+		    /// \name Using Previously Constructed Node or Arc Set
 		    /// @{
 		    /// \brief Use previously constructed node set
 		    ///
 		    /// Use previously constructed node set, and specify the node
 		    /// label map.
 		    template <typename Map>
 		    DigraphReader& useNodes(const Map& map) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      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));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed node set
 		    ///
 		    /// Use previously constructed node set, and specify the node
 		    /// label map and a functor which converts the label map values to
 		    /// \c std::string.
 		    template <typename Map, typename 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");
 		      _use_nodes = true;
 		      for (NodeIt n(_digraph); n != INVALID; ++n) {
 		        _node_index.insert(std::make_pair(converter(map[n]), n));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed arc set
 		    ///
 		    /// Use previously constructed arc set, and specify the arc
 		    /// label map.
 		    template <typename Map>
 		    DigraphReader& useArcs(const Map& map) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_arcs, "Multiple usage of useArcs() member");
 		      _use_arcs = true;
 		      _writer_bits::DefaultConverter<typename Map::Value> converter;
 		      for (ArcIt a(_digraph); a != INVALID; ++a) {
 		        _arc_index.insert(std::make_pair(converter(map[a]), a));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed arc set
 		    ///
 		    /// Use previously constructed arc set, and specify the arc
 		    /// label map and a functor which converts the label map values to
 		    /// \c std::string.
 		    template <typename Map, typename 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");
 		      _use_arcs = true;
 		      for (ArcIt a(_digraph); a != INVALID; ++a) {
 		        _arc_index.insert(std::make_pair(converter(map[a]), a));
+		      }
 		      return *this;
+		    }
 		    /// \brief Skips the reading of node section
 		    ///
 		    /// Omit the reading of the node section. This implies that each node
 		    /// map reading rule will be abandoned, and the nodes of the graph
 		    /// will not be constructed, which usually cause that the arc set
 		    /// could not be read due to lack of node name resolving.
 		    /// Therefore \c skipArcs() function should also be used, or
 		    /// \c useNodes() should be used to specify the label of the nodes.
 		    DigraphReader& skipNodes() {
 		      LEMON_ASSERT(!_skip_nodes, "Skip nodes already set");
 		      _skip_nodes = true;
 		      return *this;
+		    }
 		    /// \brief Skips the reading of arc section
 		    ///
 		    /// Omit the reading of the arc section. This implies that each arc
 		    /// map reading rule will be abandoned, and the arcs of the graph
 		    /// will not be constructed.
 		    DigraphReader& skipArcs() {
 		      LEMON_ASSERT(!_skip_arcs, "Skip arcs already set");
 		      _skip_arcs = true;
 		      return *this;
+		    }
 		    /// @}
 		  private:
 		    bool readLine() {
 		      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;
+		        }
+		      }
 		      return false;
+		    }
 		    bool readSuccess() {
 		      return static_cast<bool>(*_is);
+		    }
 		    void skipSection() {
 		      char c;
 		      while (readSuccess() && line >> c && c != '@') {
 		        readLine();
+		      }
 		      if (readSuccess()) {
 		        line.putback(c);
+		      }
+		    }
 		    void readNodes() {
 		      std::vector<int> map_index(_node_maps.size());
 		      int map_num, label_index;
 		      char c;
 		      if (!readLine() || !(line >> c) || c == '@') {
 		        if (readSuccess() && line) line.putback(c);
 		        if (!_node_maps.empty())
 		          throw FormatError("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 FormatError(msg.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: " << _node_maps[i].first;
 		            throw FormatError(msg.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 FormatError(msg.str());
+		          }
+		        }
 		        if (line >> std::ws >> c)
 		          throw FormatError("Extra character at 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 FormatError("Label map not found");
 		          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 FormatError(msg.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);
+		      }
+		    }
 		    void readArcs() {
 		      std::vector<int> map_index(_arc_maps.size());
 		      int map_num, label_index;
 		      char c;
 		      if (!readLine() || !(line >> c) || c == '@') {
 		        if (readSuccess() && line) line.putback(c);
 		        if (!_arc_maps.empty())
 		          throw FormatError("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 FormatError(msg.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: " << _arc_maps[i].first;
 		            throw FormatError(msg.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 FormatError("Source not found");
 		        if (!_reader_bits::readToken(line, target_token))
 		          throw FormatError("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 FormatError(msg.str());
+		          }
+		        }
 		        if (line >> std::ws >> c)
 		          throw FormatError("Extra character at the end of line");
 		        Arc a;
 		        if (!_use_arcs) {
 		          typename NodeIndex::iterator it;
 		          it = _node_index.find(source_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << source_token;
 		            throw FormatError(msg.str());
+		          }
 		          Node source = it->second;
 		          it = _node_index.find(target_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << target_token;
 		            throw FormatError(msg.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 FormatError("Label map not found");
 		          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 FormatError(msg.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);
+		      }
+		    }
 		    void readAttributes() {
 		      std::set<std::string> read_attr;
 		      char c;
 		      while (readLine() && line >> c && c != '@') {
 		        line.putback(c);
 		        std::string attr, token;
 		        if (!_reader_bits::readToken(line, attr))
 		          throw FormatError("Attribute name not found");
 		        if (!_reader_bits::readToken(line, token))
 		          throw FormatError("Attribute value not found");
 		        if (line >> c)
 		          throw FormatError("Extra character at 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 FormatError(msg.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);
+		      }
 		      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: " << it->first;
 		          throw FormatError(msg.str());
+		        }
+		      }
+		    }
 		  public:
-		    /// \name Execution of the reader
+		    /// \name Execution of the Reader
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// 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 arcs_done = _skip_arcs;
 		      bool attributes_done = false;
 		      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 FormatError("Extra character at 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 (FormatError& error) {
 		          error.line(line_num);
 		          error.file(_filename);
 		          throw;
+		        }
+		      }
 		      if (!nodes_done) {
 		        throw FormatError("Section @nodes not found");
+		      }
 		      if (!arcs_done) {
 		        throw FormatError("Section @arcs not found");
+		      }
 		      if (!attributes_done && !_attributes.empty()) {
 		        throw FormatError("Section @attributes not found");
+		      }
+		    }
 		    /// @}
 		  };
 		  /// \brief Return a \ref DigraphReader class
 		  ///
 		  /// This function just returns a \ref DigraphReader class.
 		  /// \relates DigraphReader
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(Digraph& digraph, std::istream& is) {
 		    DigraphReader<Digraph> tmp(digraph, is);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref DigraphReader class
 		  ///
 		  /// This function just returns a \ref DigraphReader class.
 		  /// \relates DigraphReader
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(Digraph& digraph,
 		                                       const std::string& fn) {
 		    DigraphReader<Digraph> tmp(digraph, fn);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref DigraphReader class
 		  ///
 		  /// This function just returns a \ref DigraphReader class.
 		  /// \relates DigraphReader
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) {
 		    DigraphReader<Digraph> tmp(digraph, fn);
 		    return tmp;
+		  }
 		  template <typename Graph>
 		  class GraphReader;
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(Graph& graph,
 		                                 std::istream& is = std::cin);
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(Graph& graph, const std::string& fn);
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(Graph& graph, const char *fn);
 		  /// \ingroup lemon_io
 		  ///
 		  /// \brief \ref lgf-format "LGF" reader for undirected graphs
 		  ///
 		  /// This utility reads an \ref lgf-format "LGF" file.
 		  ///
 		  /// It can be used almost the same way as \c DigraphReader.
 		  /// The only difference is that this class can handle edges and
 		  /// edge maps as well as arcs and arc maps.
 		  ///
 		  /// The columns in the \c \@edges (or \c \@arcs) section are the
 		  /// edge maps. However, if there are two maps with the same name
 		  /// prefixed with \c '+' and \c '-', then these can be read into an
 		  /// arc map.  Similarly, an attribute can be read into an arc, if
 		  /// it's value is an edge label prefixed with \c '+' or \c '-'.
 		  template <typename GR>
 		  class GraphReader {
 		  public:
 		    typedef GR Graph;
 		  private:
 		    TEMPLATE_GRAPH_TYPEDEFS(Graph);
 		    std::istream* _is;
 		    bool local_is;
 		    std::string _filename;
 		    Graph& _graph;
 		    std::string _nodes_caption;
 		    std::string _edges_caption;
 		    std::string _attributes_caption;
 		    typedef std::map<std::string, Node> NodeIndex;
 		    NodeIndex _node_index;
 		    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<Edge>*> > EdgeMaps;
 		    EdgeMaps _edge_maps;
 		    typedef std::multimap<std::string, _reader_bits::ValueStorageBase*>
 		      Attributes;
 		    Attributes _attributes;
 		    bool _use_nodes;
 		    bool _use_edges;
 		    bool _skip_nodes;
 		    bool _skip_edges;
 		    int line_num;
 		    std::istringstream line;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct an undirected graph reader, which reads from the given
 		    /// input stream.
 		    GraphReader(Graph& graph, std::istream& is = std::cin)
 		      : _is(&is), local_is(false), _graph(graph),
 		        _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(Graph& graph, const std::string& fn)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true),
 		        _filename(fn), _graph(graph),
 		        _use_nodes(false), _use_edges(false),
 		        _skip_nodes(false), _skip_edges(false) {
 		      if (!(*_is)) {
 		        delete _is;
 		        throw IoError("Cannot open file", fn);
+		      }
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct an undirected graph reader, which reads from the given
 		    /// file.
 		    GraphReader(Graph& graph, const char* fn)
 		      : _is(new std::ifstream(fn)), local_is(true),
 		        _filename(fn), _graph(graph),
 		        _use_nodes(false), _use_edges(false),
 		        _skip_nodes(false), _skip_edges(false) {
 		      if (!(*_is)) {
 		        delete _is;
 		        throw IoError("Cannot open file", fn);
+		      }
+		    }
 		    /// \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;
+		      }
 		      if (local_is) {
 		        delete _is;
+		      }
+		    }
 		  private:
 		    template <typename Graph>
 		    friend GraphReader<Graph> graphReader(Graph& graph, std::istream& is);
 		    template <typename Graph>
 		    friend GraphReader<Graph> graphReader(Graph& graph, const std::string& fn);
 		    template <typename Graph>
 		    friend GraphReader<Graph> graphReader(Graph& graph, const char *fn);
 		    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) {
 		      other._is = 0;
 		      other.local_is = false;
 		      _node_index.swap(other._node_index);
 		      _edge_index.swap(other._edge_index);
 		      _node_maps.swap(other._node_maps);
 		      _edge_maps.swap(other._edge_maps);
 		      _attributes.swap(other._attributes);
 		      _nodes_caption = other._nodes_caption;
 		      _edges_caption = other._edges_caption;
 		      _attributes_caption = other._attributes_caption;
+		    }
 		    GraphReader& operator=(const GraphReader&);
 		  public:
-		    /// \name Reading rules
+		    /// \name Reading Rules
 		    /// @{
 		    /// \brief Node map reading rule
 		    ///
 		    /// Add a node map reading rule to the reader.
 		    template <typename Map>
 		    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);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node map reading rule
 		    ///
 		    /// Add a node map reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Map, typename 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);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge map reading rule
 		    ///
 		    /// Add an edge map reading rule to the reader.
 		    template <typename Map>
 		    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);
 		      _edge_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge map reading rule
 		    ///
 		    /// Add an edge map reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Map, typename 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);
 		      _edge_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map reading rule
 		    ///
 		    /// Add an arc map reading rule to the reader.
 		    template <typename Map>
 		    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);
 		      _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);
 		      _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
 		      return *this;
+		    }
 		    /// \brief Arc map reading rule
 		    ///
 		    /// Add an arc map reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Map, typename 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);
 		      _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);
 		      _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
 		      return *this;
+		    }
 		    /// \brief Attribute reading rule
 		    ///
 		    /// Add an attribute reading rule to the reader.
 		    template <typename Value>
 		    GraphReader& attribute(const std::string& caption, Value& value) {
 		      _reader_bits::ValueStorageBase* storage =
 		        new _reader_bits::ValueStorage<Value>(value);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute reading rule
 		    ///
 		    /// Add an attribute reading rule with specialized converter to the
 		    /// 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);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node reading rule
 		    ///
 		    /// Add a node reading rule to reader.
 		    GraphReader& node(const std::string& caption, Node& node) {
 		      typedef _reader_bits::MapLookUpConverter<Node> Converter;
 		      Converter converter(_node_index);
 		      _reader_bits::ValueStorageBase* storage =
 		        new _reader_bits::ValueStorage<Node, Converter>(node, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge reading rule
 		    ///
 		    /// Add an edge reading rule to reader.
 		    GraphReader& edge(const std::string& caption, Edge& edge) {
 		      typedef _reader_bits::MapLookUpConverter<Edge> Converter;
 		      Converter converter(_edge_index);
 		      _reader_bits::ValueStorageBase* storage =
 		        new _reader_bits::ValueStorage<Edge, Converter>(edge, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc reading rule
 		    ///
 		    /// Add an arc reading rule to reader.
 		    GraphReader& arc(const std::string& caption, Arc& arc) {
 		      typedef _reader_bits::GraphArcLookUpConverter<Graph> Converter;
 		      Converter converter(_graph, _edge_index);
 		      _reader_bits::ValueStorageBase* storage =
 		        new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// @}
-		    /// \name Select section by name
+		    /// \name Select Section by Name
 		    /// @{
 		    /// \brief Set \c \@nodes section to be read
 		    ///
 		    /// Set \c \@nodes section to be read.
 		    GraphReader& nodes(const std::string& caption) {
 		      _nodes_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@edges section to be read
 		    ///
 		    /// Set \c \@edges section to be read.
 		    GraphReader& edges(const std::string& caption) {
 		      _edges_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@attributes section to be read
 		    ///
 		    /// Set \c \@attributes section to be read.
 		    GraphReader& attributes(const std::string& caption) {
 		      _attributes_caption = caption;
 		      return *this;
+		    }
 		    /// @}
-		    /// \name Using previously constructed node or edge set
+		    /// \name Using Previously Constructed Node or Edge Set
 		    /// @{
 		    /// \brief Use previously constructed node set
 		    ///
 		    /// Use previously constructed node set, and specify the node
 		    /// label map.
 		    template <typename Map>
 		    GraphReader& useNodes(const Map& map) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      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));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed node set
 		    ///
 		    /// Use previously constructed node set, and specify the node
 		    /// label map and a functor which converts the label map values to
 		    /// \c std::string.
 		    template <typename Map, typename 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");
 		      _use_nodes = true;
 		      for (NodeIt n(_graph); n != INVALID; ++n) {
 		        _node_index.insert(std::make_pair(converter(map[n]), n));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed edge set
 		    ///
 		    /// Use previously constructed edge set, and specify the edge
 		    /// label map.
 		    template <typename Map>
 		    GraphReader& useEdges(const Map& map) {
 		      checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_edges, "Multiple usage of useEdges() member");
 		      _use_edges = true;
 		      _writer_bits::DefaultConverter<typename Map::Value> converter;
 		      for (EdgeIt a(_graph); a != INVALID; ++a) {
 		        _edge_index.insert(std::make_pair(converter(map[a]), a));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed edge set
 		    ///
 		    /// Use previously constructed edge set, and specify the edge
 		    /// label map and a functor which converts the label map values to
 		    /// \c std::string.
 		    template <typename Map, typename 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");
 		      _use_edges = true;
 		      for (EdgeIt a(_graph); a != INVALID; ++a) {
 		        _edge_index.insert(std::make_pair(converter(map[a]), a));
+		      }
 		      return *this;
+		    }
 		    /// \brief Skip the reading of node section
 		    ///
 		    /// Omit the reading of the node section. This implies that each node
 		    /// map reading rule will be abandoned, and the nodes of the graph
 		    /// will not be constructed, which usually cause that the edge set
 		    /// could not be read due to lack of node name
 		    /// could not be read due to lack of node name resolving.
 		    /// Therefore \c skipEdges() function should also be used, or
 		    /// \c useNodes() should be used to specify the label of the nodes.
 		    GraphReader& skipNodes() {
 		      LEMON_ASSERT(!_skip_nodes, "Skip nodes already set");
 		      _skip_nodes = true;
 		      return *this;
+		    }
 		    /// \brief Skip the reading of edge section
 		    ///
 		    /// Omit the reading of the edge section. This implies that each edge
 		    /// map reading rule will be abandoned, and the edges of the graph
 		    /// will not be constructed.
 		    GraphReader& skipEdges() {
 		      LEMON_ASSERT(!_skip_edges, "Skip edges already set");
 		      _skip_edges = true;
 		      return *this;
+		    }
 		    /// @}
 		  private:
 		    bool readLine() {
 		      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;
+		        }
+		      }
 		      return false;
+		    }
 		    bool readSuccess() {
 		      return static_cast<bool>(*_is);
+		    }
 		    void skipSection() {
 		      char c;
 		      while (readSuccess() && line >> c && c != '@') {
 		        readLine();
+		      }
 		      if (readSuccess()) {
 		        line.putback(c);
+		      }
+		    }
 		    void readNodes() {
 		      std::vector<int> map_index(_node_maps.size());
 		      int map_num, label_index;
 		      char c;
 		      if (!readLine() || !(line >> c) || c == '@') {
 		        if (readSuccess() && line) line.putback(c);
 		        if (!_node_maps.empty())
 		          throw FormatError("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 FormatError(msg.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: " << _node_maps[i].first;
 		            throw FormatError(msg.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 FormatError(msg.str());
+		          }
+		        }
 		        if (line >> std::ws >> c)
 		          throw FormatError("Extra character at 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 FormatError("Label map not found");
 		          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 FormatError(msg.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);
+		      }
+		    }
 		    void readEdges() {
 		      std::vector<int> map_index(_edge_maps.size());
 		      int map_num, label_index;
 		      char c;
 		      if (!readLine() || !(line >> c) || c == '@') {
 		        if (readSuccess() && line) line.putback(c);
 		        if (!_edge_maps.empty())
 		          throw FormatError("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 FormatError(msg.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: " << _edge_maps[i].first;
 		            throw FormatError(msg.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 FormatError("Node u not found");
 		        if (!_reader_bits::readToken(line, target_token))
 		          throw FormatError("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 FormatError(msg.str());
+		          }
+		        }
 		        if (line >> std::ws >> c)
 		          throw FormatError("Extra character at the end of line");
 		        Edge e;
 		        if (!_use_edges) {
 		          typename NodeIndex::iterator it;
 		          it = _node_index.find(source_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << source_token;
 		            throw FormatError(msg.str());
+		          }
 		          Node source = it->second;
 		          it = _node_index.find(target_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << target_token;
 		            throw FormatError(msg.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 FormatError("Label map not found");
 		          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 FormatError(msg.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);
+		      }
+		    }
 		    void readAttributes() {
 		      std::set<std::string> read_attr;
 		      char c;
 		      while (readLine() && line >> c && c != '@') {
 		        line.putback(c);
 		        std::string attr, token;
 		        if (!_reader_bits::readToken(line, attr))
 		          throw FormatError("Attribute name not found");
 		        if (!_reader_bits::readToken(line, token))
 		          throw FormatError("Attribute value not found");
 		        if (line >> c)
 		          throw FormatError("Extra character at 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 FormatError(msg.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);
+		      }
 		      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: " << it->first;
 		          throw FormatError(msg.str());
+		        }
+		      }
+		    }
 		  public:
-		    /// \name Execution of the reader
+		    /// \name Execution of the Reader
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// 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;
 		      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 FormatError("Extra character at 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 (FormatError& error) {
 		          error.line(line_num);
 		          error.file(_filename);
 		          throw;
+		        }
+		      }
 		      if (!nodes_done) {
 		        throw FormatError("Section @nodes not found");
+		      }
 		      if (!edges_done) {
 		        throw FormatError("Section @edges not found");
+		      }
 		      if (!attributes_done && !_attributes.empty()) {
 		        throw FormatError("Section @attributes not found");
+		      }
+		    }
 		    /// @}
 		  };
 		  /// \brief Return a \ref GraphReader class
 		  ///
 		  /// This function just returns a \ref GraphReader class.
 		  /// \relates GraphReader
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(Graph& graph, std::istream& is) {
 		    GraphReader<Graph> tmp(graph, is);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref GraphReader class
 		  ///
 		  /// This function just returns a \ref GraphReader class.
 		  /// \relates GraphReader
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) {
 		    GraphReader<Graph> tmp(graph, fn);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref GraphReader class
 		  ///
 		  /// This function just returns a \ref GraphReader class.
 		  /// \relates GraphReader
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(Graph& graph, const char* fn) {
 		    GraphReader<Graph> tmp(graph, fn);
 		    return tmp;
+		  }
 		  class SectionReader;
 		  SectionReader sectionReader(std::istream& is);
 		  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,
 		  /// which contain any data in arbitrary format. Such sections can be
 		  /// 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
 		  /// sectionStream() member the section can be read from an input
 		  /// stream.
 		  class SectionReader {
 		  private:
 		    std::istream* _is;
 		    bool local_is;
 		    std::string _filename;
 		    typedef std::map<std::string, _reader_bits::Section*> Sections;
 		    Sections _sections;
 		    int line_num;
 		    std::istringstream line;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct a section reader, which reads from the given input
 		    /// stream.
 		    SectionReader(std::istream& is)
 		      : _is(&is), local_is(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a section reader, which reads from the given file.
 		    SectionReader(const std::string& fn)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true),
 		        _filename(fn) {
 		      if (!(*_is)) {
 		        delete _is;
 		        throw IoError("Cannot open file", fn);
+		      }
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct a section reader, which reads from the given file.
 		    SectionReader(const char* fn)
 		      : _is(new std::ifstream(fn)), local_is(true),
 		        _filename(fn) {
 		      if (!(*_is)) {
 		        delete _is;
 		        throw IoError("Cannot open file", fn);
+		      }
+		    }
 		    /// \brief Destructor
 		    ~SectionReader() {
 		      for (Sections::iterator it = _sections.begin();
 		           it != _sections.end(); ++it) {
 		        delete it->second;
+		      }
 		      if (local_is) {
 		        delete _is;
+		      }
+		    }
 		  private:
 		    friend SectionReader sectionReader(std::istream& is);
 		    friend SectionReader sectionReader(const std::string& fn);
 		    friend SectionReader sectionReader(const char* fn);
 		    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&);
 		  public:
-		    /// \name Section readers
+		    /// \name Section Readers
 		    /// @{
 		    /// \brief Add a section processor with line oriented reading
 		    ///
 		    /// The first parameter is the type descriptor of the section, the
 		    /// second is a functor, which takes just one \c std::string
 		    /// parameter. At the reading process, each line of the section
 		    /// will be given to the functor object. However, the empty lines
 		    /// and the comment lines are filtered out, and the leading
 		    /// whitespaces are trimmed from each processed string.
 		    ///
 		    /// For example let's see a section, which contain several
 		    /// integers, which should be inserted into a vector.
 		    ///\code
 		    ///  @numbers
 		    ///  12 45 23
 		    ///  4
 		    ///  23 6
 		    ///\endcode
 		    ///
 		    /// The functor is implemented as a struct:
 		    ///\code
 		    ///  struct NumberSection {
 		    ///    std::vector<int>& _data;
 		    ///    NumberSection(std::vector<int>& data) : _data(data) {}
 		    ///    void operator()(const std::string& line) {
 		    ///      std::istringstream ls(line);
 		    ///      int value;
 		    ///      while (ls >> value) _data.push_back(value);
 		    ///    }
 		    ///  };
 		    ///
 		    ///  // ...
 		    ///
 		    ///  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,
 		        new _reader_bits::LineSection<Functor>(functor)));
 		      return *this;
+		    }
 		    /// \brief Add a section processor with stream oriented reading
 		    ///
 		    /// The first parameter is the type of the section, the second is
 		    /// a functor, which takes an \c std::istream& and an \c int&
 		    /// parameter, the latter regard to the line number of stream. The
 		    /// functor can read the input while the section go on, and the
 		    /// line number should be modified accordingly.
 		    template <typename Functor>
 		    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;
+		    }
 		    /// @}
 		  private:
 		    bool readLine() {
 		      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;
+		        }
+		      }
 		      return false;
+		    }
 		    bool readSuccess() {
 		      return static_cast<bool>(*_is);
+		    }
 		    void skipSection() {
 		      char c;
 		      while (readSuccess() && line >> c && c != '@') {
 		        readLine();
+		      }
 		      if (readSuccess()) {
 		        line.putback(c);
+		      }
+		    }
 		  public:
-		    /// \name Execution of the reader
+		    /// \name Execution of the Reader
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// 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;
 		      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 FormatError("Extra character at the end of line");
 		          if (extra_sections.find(section) != extra_sections.end()) {
 		            std::ostringstream msg;
 		            msg << "Multiple occurence of section: " << section;
 		            throw FormatError(msg.str());
+		          }
 		          Sections::iterator it = _sections.find(section);
 		          if (it != _sections.end()) {
 		            extra_sections.insert(section);
 		            it->second->process(*_is, line_num);
+		          }
 		          readLine();
 		          skipSection();
 		        } catch (FormatError& error) {
 		          error.line(line_num);
 		          error.file(_filename);
 		          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 FormatError(os.str());
+		        }
+		      }
+		    }
 		    /// @}
 		  };
 		  /// \brief Return a \ref SectionReader class
 		  ///
 		  /// This function just returns a \ref SectionReader class.
 		  /// \relates SectionReader
 		  inline SectionReader sectionReader(std::istream& is) {
 		    SectionReader tmp(is);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref SectionReader class
 		  ///
 		  /// This function just returns a \ref SectionReader class.
 		  /// \relates SectionReader
 		  inline SectionReader sectionReader(const std::string& fn) {
 		    SectionReader tmp(fn);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref SectionReader class
 		  ///
 		  /// This function just returns a \ref SectionReader class.
 		  /// \relates SectionReader
 		  inline SectionReader sectionReader(const char* fn) {
 		    SectionReader tmp(fn);
 		    return tmp;
+		  }
 		  /// \ingroup lemon_io
 		  ///
 		  /// \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
 		  /// the attributes from a file. Usually, the LEMON programs know
 		  /// that, which type of graph, which maps and which attributes
 		  /// should be read from a file, but in general tools (like glemon)
 		  /// the contents of an LGF file should be guessed somehow. This class
 		  /// reads the graph and stores the appropriate information for
 		  /// reading the graph.
 		  ///
 		  ///\code
 		  /// LgfContents contents("graph.lgf");
 		  /// contents.run();
 		  ///
 		  /// // Does it contain any node section and arc section?
 		  /// if (contents.nodeSectionNum() == 0 || contents.arcSectionNum()) {
 		  ///   std::cerr << "Failure, cannot find graph." << std::endl;
 		  ///   return -1;
 		  /// }
 		  /// std::cout << "The name of the default node section: "
 		  ///           << contents.nodeSection(0) << std::endl;
 		  /// std::cout << "The number of the arc maps: "
 		  ///           << contents.arcMaps(0).size() << std::endl;
 		  /// std::cout << "The name of second arc map: "
 		  ///           << contents.arcMaps(0)[1] << std::endl;
 		  ///\endcode
 		  class LgfContents {
 		  private:
 		    std::istream* _is;
 		    bool local_is;
 		    std::vector<std::string> _node_sections;
 		    std::vector<std::string> _edge_sections;
 		    std::vector<std::string> _attribute_sections;
 		    std::vector<std::string> _extra_sections;
 		    std::vector<bool> _arc_sections;
 		    std::vector<std::vector<std::string> > _node_maps;
 		    std::vector<std::vector<std::string> > _edge_maps;
 		    std::vector<std::vector<std::string> > _attributes;
 		    int line_num;
 		    std::istringstream line;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct an \e LGF contents reader, which reads from the given
 		    /// input stream.
 		    LgfContents(std::istream& is)
 		      : _is(&is), local_is(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct an \e LGF contents reader, which reads from the given
 		    /// file.
 		    LgfContents(const std::string& fn)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true) {
 		      if (!(*_is)) {
 		        delete _is;
 		        throw IoError("Cannot open file", fn);
+		      }
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct an \e LGF contents reader, which reads from the given
 		    /// file.
 		    LgfContents(const char* fn)
 		      : _is(new std::ifstream(fn)), local_is(true) {
 		      if (!(*_is)) {
 		        delete _is;
 		        throw IoError("Cannot open file", fn);
+		      }
+		    }
 		    /// \brief Destructor
 		    ~LgfContents() {
 		      if (local_is) delete _is;
+		    }
 		  private:
 		    LgfContents(const LgfContents&);
 		    LgfContents& operator=(const LgfContents&);
 		  public:
-		    /// \name Node sections
+		    /// \name Node Sections
 		    /// @{
 		    /// \brief Gives back the number of node sections in the file.
 		    ///
 		    /// Gives back the number of node sections in the file.
 		    int nodeSectionNum() const {
 		      return _node_sections.size();
+		    }
 		    /// \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];
+		    }
 		    /// \brief Gives back the node maps for the given section.
 		    ///
 		    /// Gives back the node maps for the given section.
 		    const std::vector<std::string>& nodeMapNames(int i) const {
 		      return _node_maps[i];
+		    }
 		    /// @}
-		    /// \name Arc/Edge sections
+		    /// \name Arc/Edge Sections
 		    /// @{
 		    /// \brief Gives back the number of arc/edge sections in the file.
 		    ///
 		    /// Gives back the number of arc/edge sections in the file.
 		    /// \note It is synonym of \c edgeSectionNum().
 		    int arcSectionNum() const {
 		      return _edge_sections.size();
+		    }
 		    /// \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 {
 		      return _edge_sections[i];
+		    }
 		    /// \brief Gives back the arc/edge maps for the given section.
 		    ///
 		    /// Gives back the arc/edge maps for the given section.
 		    /// \note It is synonym of \c edgeMapNames().
 		    const std::vector<std::string>& arcMapNames(int i) const {
 		      return _edge_maps[i];
+		    }
 		    /// @}
 		    /// \name Synonyms
 		    /// @{
 		    /// \brief Gives back the number of arc/edge sections in the file.
 		    ///
 		    /// Gives back the number of arc/edge sections in the file.
 		    /// \note It is synonym of \c arcSectionNum().
 		    int edgeSectionNum() const {
 		      return _edge_sections.size();
+		    }
 		    /// \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 {
 		      return _edge_sections[i];
+		    }
 		    /// \brief Gives back the edge maps for the given section.
 		    ///
 		    /// Gives back the edge maps for the given section.
 		    /// \note It is synonym of \c arcMapNames().
 		    const std::vector<std::string>& edgeMapNames(int i) const {
 		      return _edge_maps[i];
+		    }
 		    /// @}
-		    /// \name Attribute sections
+		    /// \name Attribute Sections
 		    /// @{
 		    /// \brief Gives back the number of attribute sections in the file.
 		    ///
 		    /// Gives back the number of attribute sections in the file.
 		    int attributeSectionNum() const {
 		      return _attribute_sections.size();
+		    }
 		    /// \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];
+		    }
 		    /// \brief Gives back the attributes for the given section.
 		    ///
 		    /// Gives back the attributes for the given section.
 		    const std::vector<std::string>& attributes(int i) const {
 		      return _attributes[i];
+		    }
 		    /// @}
-		    /// \name Extra sections
+		    /// \name Extra Sections
 		    /// @{
 		    /// \brief Gives back the number of extra sections in the file.
 		    ///
 		    /// Gives back the number of extra sections in the file.
 		    int extraSectionNum() const {
 		      return _extra_sections.size();
+		    }
 		    /// \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];
+		    }
 		    /// @}
 		  private:
 		    bool readLine() {
 		      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;
+		        }
+		      }
 		      return false;
+		    }
 		    bool readSuccess() {
 		      return static_cast<bool>(*_is);
+		    }
 		    void skipSection() {
 		      char c;
 		      while (readSuccess() && line >> c && c != '@') {
 		        readLine();
+		      }
 		      if (readSuccess()) {
 		        line.putback(c);
+		      }
+		    }
 		    void readMaps(std::vector<std::string>& maps) {
 		      char c;
 		      if (!readLine() || !(line >> c) || c == '@') {
 		        if (readSuccess() && line) line.putback(c);
 		        return;
+		      }
 		      line.putback(c);
 		      std::string map;
 		      while (_reader_bits::readToken(line, map)) {
 		        maps.push_back(map);
+		      }
+		    }
 		    void readAttributes(std::vector<std::string>& attrs) {
 		      readLine();
 		      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);
+		    }
 		  public:
-		    /// \name Execution of the contents reader
+		    /// \name Execution of the Contents Reader
 		    /// @{
 		    /// \brief Starts the reading
 		    ///
 		    /// This function starts the reading.
 		    void run() {
 		      readLine();
 		      skipSection();
 		      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();
+		        }
+		      }
+		    }
 		    /// @}
 		  };
+		}
 		#endif

lemon/lgf_writer.h

Show inline comments

@@ -29,1749 +29,1749 @@
 		#include <sstream>
 		#include <algorithm>
 		#include <vector>
 		#include <functional>
 		#include <lemon/core.h>
 		#include <lemon/maps.h>
 		#include <lemon/concept_check.h>
 		#include <lemon/concepts/maps.h>
 		namespace lemon {
 		  namespace _writer_bits {
 		    template <typename Value>
 		    struct DefaultConverter {
 		      std::string operator()(const Value& value) {
 		        std::ostringstream os;
 		        os << value;
 		        return os.str();
+		      }
 		    };
 		    template <typename T>
 		    bool operator<(const T&, const T&) {
 		      throw FormatError("Label map is not comparable");
+		    }
 		    template <typename _Map>
 		    class MapLess {
 		    public:
 		      typedef _Map Map;
 		      typedef typename Map::Key Item;
 		    private:
 		      const Map& _map;
 		    public:
 		      MapLess(const Map& map) : _map(map) {}
 		      bool operator()(const Item& left, const Item& right) {
 		        return _map[left] < _map[right];
+		      }
 		    };
 		    template <typename _Graph, bool _dir, typename _Map>
 		    class GraphArcMapLess {
 		    public:
 		      typedef _Map Map;
 		      typedef _Graph Graph;
 		      typedef typename Graph::Edge Item;
 		    private:
 		      const Graph& _graph;
 		      const Map& _map;
 		    public:
 		      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)];
+		      }
 		    };
 		    template <typename _Item>
 		    class MapStorageBase {
 		    public:
 		      typedef _Item Item;
 		    public:
 		      MapStorageBase() {}
 		      virtual ~MapStorageBase() {}
 		      virtual std::string get(const Item& item) = 0;
 		      virtual void sort(std::vector<Item>&) = 0;
 		    };
 		    template <typename _Item, typename _Map,
 		              typename _Converter = DefaultConverter<typename _Map::Value> >
 		    class MapStorage : public MapStorageBase<_Item> {
 		    public:
 		      typedef _Map Map;
 		      typedef _Converter Converter;
 		      typedef _Item Item;
 		    private:
 		      const Map& _map;
 		      Converter _converter;
 		    public:
 		      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]);
+		      }
 		      virtual void sort(std::vector<Item>& items) {
 		        MapLess<Map> less(_map);
 		        std::sort(items.begin(), items.end(), less);
+		      }
 		    };
 		    template <typename _Graph, bool _dir, typename _Map,
 		              typename _Converter = DefaultConverter<typename _Map::Value> >
 		    class GraphArcMapStorage : public MapStorageBase<typename _Graph::Edge> {
 		    public:
 		      typedef _Map Map;
 		      typedef _Converter Converter;
 		      typedef _Graph Graph;
 		      typedef typename Graph::Edge Item;
 		      static const bool dir = _dir;
 		    private:
 		      const Graph& _graph;
 		      const Map& _map;
 		      Converter _converter;
 		    public:
 		      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)]);
+		      }
 		      virtual void sort(std::vector<Item>& items) {
 		        GraphArcMapLess<Graph, dir, Map> less(_graph, _map);
 		        std::sort(items.begin(), items.end(), less);
+		      }
 		    };
 		    class ValueStorageBase {
 		    public:
 		      ValueStorageBase() {}
 		      virtual ~ValueStorageBase() {}
 		      virtual std::string get() = 0;
 		    };
 		    template <typename _Value, typename _Converter = DefaultConverter<_Value> >
 		    class ValueStorage : public ValueStorageBase {
 		    public:
 		      typedef _Value Value;
 		      typedef _Converter Converter;
 		    private:
 		      const Value& _value;
 		      Converter _converter;
 		    public:
 		      ValueStorage(const Value& value, const Converter& converter = Converter())
 		        : _value(value), _converter(converter) {}
 		      virtual std::string get() {
 		        return _converter(_value);
+		      }
 		    };
 		    template <typename Value>
 		    struct MapLookUpConverter {
 		      const std::map<Value, std::string>& _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 FormatError("Item not found");
+		        }
 		        return it->second;
+		      }
 		    };
 		    template <typename Graph>
 		    struct GraphArcLookUpConverter {
 		      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) {}
 		      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 FormatError("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';
+		    }
 		    inline bool isEscaped(char c) {
 		      return c == '\\' || c == '\"' || c == '\'' ||
 		        c == '\a' || c == '\b';
+		    }
 		    inline static void writeEscape(std::ostream& os, char c) {
 		      switch (c) {
 		      case '\\':
 		        os << "\\\\";
 		        return;
 		      case '\"':
 		        os << "\\\"";
 		        return;
 		      case '\a':
 		        os << "\\a";
 		        return;
 		      case '\b':
 		        os << "\\b";
 		        return;
 		      case '\f':
 		        os << "\\f";
 		        return;
 		      case '\r':
 		        os << "\\r";
 		        return;
 		      case '\n':
 		        os << "\\n";
 		        return;
 		      case '\t':
 		        os << "\\t";
 		        return;
 		      case '\v':
 		        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;
+		      }
+		    }
 		    inline bool requireEscape(const std::string& str) {
 		      if (str.empty() || str[0] == '@') return true;
 		      std::istringstream is(str);
 		      char c;
 		      while (is.get(c)) {
 		        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 << '\"';
 		      } else {
 		        os << str;
+		      }
 		      return os;
+		    }
 		    class Section {
 		    public:
 		      virtual ~Section() {}
 		      virtual void process(std::ostream& os) = 0;
 		    };
 		    template <typename Functor>
 		    class LineSection : public Section {
 		    private:
 		      Functor _functor;
 		    public:
 		      LineSection(const Functor& functor) : _functor(functor) {}
 		      virtual ~LineSection() {}
 		      virtual void process(std::ostream& os) {
 		        std::string line;
 		        while (!(line = _functor()).empty()) os << line << std::endl;
+		      }
 		    };
 		    template <typename Functor>
 		    class StreamSection : public Section {
 		    private:
 		      Functor _functor;
 		    public:
 		      StreamSection(const Functor& functor) : _functor(functor) {}
 		      virtual ~StreamSection() {}
 		      virtual void process(std::ostream& os) {
 		        _functor(os);
+		      }
 		    };
+		  }
 		  template <typename Digraph>
 		  class DigraphWriter;
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       std::ostream& os = std::cout);
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       const std::string& fn);
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       const char* fn);
 		  /// \ingroup lemon_io
 		  ///
 		  /// \brief \ref lgf-format "LGF" writer for directed graphs
 		  ///
 		  /// This utility writes an \ref lgf-format "LGF" file.
 		  ///
 		  /// The writing method does a batch processing. The user creates a
 		  /// writer object, then various writing rules can be added to the
 		  /// writer, and eventually the writing is executed with the \c run()
 		  /// member function. A map writing rule can be added to the writer
 		  /// with the \c nodeMap() or \c arcMap() members. An optional
 		  /// converter parameter can also be added as a standard functor
 		  /// converting from the value type of the map to \c std::string. If it
 		  /// is set, it will determine how the value type of the map is written to
 		  /// the output stream. If the functor is not set, then a default
 		  /// conversion will be used. The \c attribute(), \c node() and \c
 		  /// arc() functions are used to add attribute writing rules.
 		  ///
 		  ///\code
 		  /// DigraphWriter<Digraph>(digraph, std::cout).
 		  ///   nodeMap("coordinates", coord_map).
 		  ///   nodeMap("size", size).
 		  ///   nodeMap("title", title).
 		  ///   arcMap("capacity", cap_map).
 		  ///   node("source", src).
 		  ///   node("target", trg).
 		  ///   attribute("caption", caption).
 		  ///   run();
 		  ///\endcode
 		  ///
 		  ///
 		  /// By default, the writer does not write additional captions to the
 		  /// sections, but they can be give as an optional parameter of
 		  /// the \c nodes(), \c arcs() or \c
 		  /// attributes() functions.
 		  ///
 		  /// The \c skipNodes() and \c skipArcs() functions forbid the
 		  /// writing of the sections. If two arc sections should be written
 		  /// to the output, it can be done in two passes, the first pass
 		  /// writes the node section and the first arc section, then the
 		  /// second pass skips the node section and writes just the arc
 		  /// section to the stream. The output stream can be retrieved with
 		  /// the \c ostream() function, hence the second pass can append its
 		  /// output to the output of the first pass.
 		  template <typename GR>
 		  class DigraphWriter {
 		  public:
 		    typedef GR Digraph;
 		    TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
 		  private:
 		    std::ostream* _os;
 		    bool local_os;
 		    const Digraph& _digraph;
 		    std::string _nodes_caption;
 		    std::string _arcs_caption;
 		    std::string _attributes_caption;
 		    typedef std::map<Node, std::string> NodeIndex;
 		    NodeIndex _node_index;
 		    typedef std::map<Arc, std::string> ArcIndex;
 		    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,
 		      _writer_bits::MapStorageBase<Arc>* > >ArcMaps;
 		    ArcMaps _arc_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::ValueStorageBase*> > Attributes;
 		    Attributes _attributes;
 		    bool _skip_nodes;
 		    bool _skip_arcs;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output stream.
 		    DigraphWriter(const Digraph& digraph, std::ostream& os = std::cout)
 		      : _os(&os), local_os(false), _digraph(digraph),
 		        _skip_nodes(false), _skip_arcs(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    DigraphWriter(const Digraph& digraph, const std::string& fn)
 		      : _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph),
 		        _skip_nodes(false), _skip_arcs(false) {
 		      if (!(*_os)) {
 		        delete _os;
 		        throw IoError("Cannot write file", fn);
+		      }
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    DigraphWriter(const Digraph& digraph, const char* fn)
 		      : _os(new std::ofstream(fn)), local_os(true), _digraph(digraph),
 		        _skip_nodes(false), _skip_arcs(false) {
 		      if (!(*_os)) {
 		        delete _os;
 		        throw IoError("Cannot write file", fn);
+		      }
+		    }
 		    /// \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;
+		      }
 		      if (local_os) {
 		        delete _os;
+		      }
+		    }
 		  private:
 		    template <typename DGR>
 		    friend DigraphWriter<DGR> digraphWriter(const DGR& digraph,
 		                                            std::ostream& os);
 		    template <typename DGR>
 		    friend DigraphWriter<DGR> digraphWriter(const DGR& digraph,
 		                                            const std::string& fn);
 		    template <typename DGR>
 		    friend DigraphWriter<DGR> digraphWriter(const DGR& digraph,
 		                                            const char *fn);
 		    DigraphWriter(DigraphWriter& other)
 		      : _os(other._os), local_os(other.local_os), _digraph(other._digraph),
 		        _skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
 		      other._os = 0;
 		      other.local_os = false;
 		      _node_index.swap(other._node_index);
 		      _arc_index.swap(other._arc_index);
 		      _node_maps.swap(other._node_maps);
 		      _arc_maps.swap(other._arc_maps);
 		      _attributes.swap(other._attributes);
 		      _nodes_caption = other._nodes_caption;
 		      _arcs_caption = other._arcs_caption;
 		      _attributes_caption = other._attributes_caption;
+		    }
 		    DigraphWriter& operator=(const DigraphWriter&);
 		  public:
-		    /// \name Writing rules
+		    /// \name Writing Rules
 		    /// @{
 		    /// \brief Node map writing rule
 		    ///
 		    /// Add a node map writing rule to the writer.
 		    template <typename Map>
 		    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);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node map writing rule
 		    ///
 		    /// Add a node map writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Map, typename 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);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map writing rule
 		    ///
 		    /// Add an arc map writing rule to the writer.
 		    template <typename Map>
 		    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);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map writing rule
 		    ///
 		    /// Add an arc map writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Map, typename 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);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute writing rule
 		    ///
 		    /// Add an attribute writing rule to the writer.
 		    template <typename Value>
 		    DigraphWriter& attribute(const std::string& caption, const Value& value) {
 		      _writer_bits::ValueStorageBase* storage =
 		        new _writer_bits::ValueStorage<Value>(value);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute writing rule
 		    ///
 		    /// Add an attribute writing rule with specialized converter to the
 		    /// 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);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node writing rule
 		    ///
 		    /// Add a node writing rule to the writer.
 		    DigraphWriter& node(const std::string& caption, const Node& node) {
 		      typedef _writer_bits::MapLookUpConverter<Node> Converter;
 		      Converter converter(_node_index);
 		      _writer_bits::ValueStorageBase* storage =
 		        new _writer_bits::ValueStorage<Node, Converter>(node, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc writing rule
 		    ///
 		    /// Add an arc writing rule to writer.
 		    DigraphWriter& arc(const std::string& caption, const Arc& arc) {
 		      typedef _writer_bits::MapLookUpConverter<Arc> Converter;
 		      Converter converter(_arc_index);
 		      _writer_bits::ValueStorageBase* storage =
 		        new _writer_bits::ValueStorage<Arc, Converter>(arc, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
-		    /// \name Section captions
+		    /// \name Section Captions
 		    /// @{
 		    /// \brief Add an additional caption to the \c \@nodes section
 		    ///
 		    /// Add an additional caption to the \c \@nodes section.
 		    DigraphWriter& nodes(const std::string& caption) {
 		      _nodes_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Add an additional caption to the \c \@arcs section
 		    ///
 		    /// Add an additional caption to the \c \@arcs section.
 		    DigraphWriter& arcs(const std::string& caption) {
 		      _arcs_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Add an additional caption to the \c \@attributes section
 		    ///
 		    /// Add an additional caption to the \c \@attributes section.
 		    DigraphWriter& attributes(const std::string& caption) {
 		      _attributes_caption = caption;
 		      return *this;
+		    }
-		    /// \name Skipping section
+		    /// \name Skipping Section
 		    /// @{
 		    /// \brief Skip writing the node set
 		    ///
 		    /// The \c \@nodes section will not be written to the stream.
 		    DigraphWriter& skipNodes() {
 		      LEMON_ASSERT(!_skip_nodes, "Multiple usage of skipNodes() member");
 		      _skip_nodes = true;
 		      return *this;
+		    }
 		    /// \brief Skip writing arc set
 		    ///
 		    /// The \c \@arcs section will not be written to the stream.
 		    DigraphWriter& skipArcs() {
 		      LEMON_ASSERT(!_skip_arcs, "Multiple usage of skipArcs() member");
 		      _skip_arcs = true;
 		      return *this;
+		    }
 		    /// @}
 		  private:
 		    void writeNodes() {
 		      _writer_bits::MapStorageBase<Node>* label = 0;
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 		           it != _node_maps.end(); ++it) {
 		        if (it->first == "label") {
 		          label = it->second;
 		          break;
+		        }
+		      }
 		      *_os << "@nodes";
 		      if (!_nodes_caption.empty()) {
 		        _writer_bits::writeToken(*_os << ' ', _nodes_caption);
+		      }
 		      *_os << std::endl;
 		      if (label == 0) {
 		        *_os << "label" << '\t';
+		      }
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 		           it != _node_maps.end(); ++it) {
 		        _writer_bits::writeToken(*_os, it->first) << '\t';
+		      }
 		      *_os << std::endl;
 		      std::vector<Node> nodes;
 		      for (NodeIt n(_digraph); n != INVALID; ++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);
 		      } else {
 		        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;
+		      }
+		    }
 		    void createNodeIndex() {
 		      _writer_bits::MapStorageBase<Node>* label = 0;
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 		           it != _node_maps.end(); ++it) {
 		        if (it->first == "label") {
 		          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()));
+		        }
 		      } else {
 		        for (NodeIt n(_digraph); n != INVALID; ++n) {
 		          std::string value = label->get(n);
 		          _node_index.insert(std::make_pair(n, value));
+		        }
+		      }
+		    }
 		    void writeArcs() {
 		      _writer_bits::MapStorageBase<Arc>* label = 0;
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 		           it != _arc_maps.end(); ++it) {
 		        if (it->first == "label") {
 		          label = it->second;
 		          break;
+		        }
+		      }
 		      *_os << "@arcs";
 		      if (!_arcs_caption.empty()) {
 		        _writer_bits::writeToken(*_os << ' ', _arcs_caption);
+		      }
 		      *_os << std::endl;
 		      *_os << '\t' << '\t';
 		      if (label == 0) {
 		        *_os << "label" << '\t';
+		      }
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 		           it != _arc_maps.end(); ++it) {
 		        _writer_bits::writeToken(*_os, it->first) << '\t';
+		      }
 		      *_os << std::endl;
 		      std::vector<Arc> arcs;
 		      for (ArcIt n(_digraph); n != INVALID; ++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);
 		      } else {
 		        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;
+		      }
+		    }
 		    void createArcIndex() {
 		      _writer_bits::MapStorageBase<Arc>* label = 0;
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 		           it != _arc_maps.end(); ++it) {
 		        if (it->first == "label") {
 		          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()));
+		        }
 		      } else {
 		        for (ArcIt a(_digraph); a != INVALID; ++a) {
 		          std::string value = label->get(a);
 		          _arc_index.insert(std::make_pair(a, value));
+		        }
+		      }
+		    }
 		    void writeAttributes() {
 		      if (_attributes.empty()) return;
 		      *_os << "@attributes";
 		      if (!_attributes_caption.empty()) {
 		        _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;
+		      }
+		    }
 		  public:
-		    /// \name Execution of the writer
+		    /// \name Execution of the Writer
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// This function starts the batch processing.
 		    void run() {
 		      if (!_skip_nodes) {
 		        writeNodes();
 		      } else {
 		        createNodeIndex();
+		      }
 		      if (!_skip_arcs) {
 		        writeArcs();
 		      } else {
 		        createArcIndex();
+		      }
 		      writeAttributes();
+		    }
 		    /// \brief Give back the stream of the writer
 		    ///
 		    /// Give back the stream of the writer.
 		    std::ostream& ostream() {
 		      return *_os;
+		    }
 		    /// @}
 		  };
 		  /// \brief Return a \ref DigraphWriter class
 		  ///
 		  /// This function just returns a \ref DigraphWriter class.
 		  /// \relates DigraphWriter
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       std::ostream& os) {
 		    DigraphWriter<Digraph> tmp(digraph, os);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref DigraphWriter class
 		  ///
 		  /// This function just returns a \ref DigraphWriter class.
 		  /// \relates DigraphWriter
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       const std::string& fn) {
 		    DigraphWriter<Digraph> tmp(digraph, fn);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref DigraphWriter class
 		  ///
 		  /// This function just returns a \ref DigraphWriter class.
 		  /// \relates DigraphWriter
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const Digraph& digraph,
 		                                       const char* fn) {
 		    DigraphWriter<Digraph> tmp(digraph, fn);
 		    return tmp;
+		  }
 		  template <typename Graph>
 		  class GraphWriter;
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(const Graph& graph,
 		                                 std::ostream& os = std::cout);
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn);
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(const Graph& graph, const char* fn);
 		  /// \ingroup lemon_io
 		  ///
 		  /// \brief \ref lgf-format "LGF" writer for directed graphs
 		  ///
 		  /// This utility writes an \ref lgf-format "LGF" file.
 		  ///
 		  /// It can be used almost the same way as \c DigraphWriter.
 		  /// The only difference is that this class can handle edges and
 		  /// edge maps as well as arcs and arc maps.
 		  ///
 		  /// The arc maps are written into the file as two columns, the
 		  /// caption of the columns are the name of the map prefixed with \c
 		  /// '+' and \c '-'. The arcs are written into the \c \@attributes
 		  /// section as a \c '+' or a \c '-' prefix (depends on the direction
 		  /// of the arc) and the label of corresponding edge.
 		  template <typename GR>
 		  class GraphWriter {
 		  public:
 		    typedef GR Graph;
 		    TEMPLATE_GRAPH_TYPEDEFS(Graph);
 		  private:
 		    std::ostream* _os;
 		    bool local_os;
 		    const Graph& _graph;
 		    std::string _nodes_caption;
 		    std::string _edges_caption;
 		    std::string _attributes_caption;
 		    typedef std::map<Node, std::string> NodeIndex;
 		    NodeIndex _node_index;
 		    typedef std::map<Edge, std::string> EdgeIndex;
 		    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,
 		      _writer_bits::MapStorageBase<Edge>* > >EdgeMaps;
 		    EdgeMaps _edge_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::ValueStorageBase*> > Attributes;
 		    Attributes _attributes;
 		    bool _skip_nodes;
 		    bool _skip_edges;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output stream.
 		    GraphWriter(const Graph& graph, std::ostream& os = std::cout)
 		      : _os(&os), local_os(false), _graph(graph),
 		        _skip_nodes(false), _skip_edges(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    GraphWriter(const Graph& graph, const std::string& fn)
 		      : _os(new std::ofstream(fn.c_str())), local_os(true), _graph(graph),
 		        _skip_nodes(false), _skip_edges(false) {
 		      if (!(*_os)) {
 		        delete _os;
 		        throw IoError("Cannot write file", fn);
+		      }
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    GraphWriter(const Graph& graph, const char* fn)
 		      : _os(new std::ofstream(fn)), local_os(true), _graph(graph),
 		        _skip_nodes(false), _skip_edges(false) {
 		      if (!(*_os)) {
 		        delete _os;
 		        throw IoError("Cannot write file", fn);
+		      }
+		    }
 		    /// \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;
+		      }
 		      if (local_os) {
 		        delete _os;
+		      }
+		    }
 		  private:
 		    template <typename Graph>
 		    friend GraphWriter<Graph> graphWriter(const Graph& graph,
 		                                          std::ostream& os);
 		    template <typename Graph>
 		    friend GraphWriter<Graph> graphWriter(const Graph& graph,
 		                                          const std::string& fn);
 		    template <typename Graph>
 		    friend GraphWriter<Graph> graphWriter(const Graph& graph,
 		                                          const char *fn);
 		    GraphWriter(GraphWriter& other)
 		      : _os(other._os), local_os(other.local_os), _graph(other._graph),
 		        _skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) {
 		      other._os = 0;
 		      other.local_os = false;
 		      _node_index.swap(other._node_index);
 		      _edge_index.swap(other._edge_index);
 		      _node_maps.swap(other._node_maps);
 		      _edge_maps.swap(other._edge_maps);
 		      _attributes.swap(other._attributes);
 		      _nodes_caption = other._nodes_caption;
 		      _edges_caption = other._edges_caption;
 		      _attributes_caption = other._attributes_caption;
+		    }
 		    GraphWriter& operator=(const GraphWriter&);
 		  public:
-		    /// \name Writing rules
+		    /// \name Writing Rules
 		    /// @{
 		    /// \brief Node map writing rule
 		    ///
 		    /// Add a node map writing rule to the writer.
 		    template <typename Map>
 		    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);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node map writing rule
 		    ///
 		    /// Add a node map writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Map, typename 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);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge map writing rule
 		    ///
 		    /// Add an edge map writing rule to the writer.
 		    template <typename Map>
 		    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);
 		      _edge_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge map writing rule
 		    ///
 		    /// Add an edge map writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Map, typename 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);
 		      _edge_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map writing rule
 		    ///
 		    /// Add an arc map writing rule to the writer.
 		    template <typename Map>
 		    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);
 		      _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);
 		      _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
 		      return *this;
+		    }
 		    /// \brief Arc map writing rule
 		    ///
 		    /// Add an arc map writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Map, typename 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);
 		      _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);
 		      _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
 		      return *this;
+		    }
 		    /// \brief Attribute writing rule
 		    ///
 		    /// Add an attribute writing rule to the writer.
 		    template <typename Value>
 		    GraphWriter& attribute(const std::string& caption, const Value& value) {
 		      _writer_bits::ValueStorageBase* storage =
 		        new _writer_bits::ValueStorage<Value>(value);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute writing rule
 		    ///
 		    /// Add an attribute writing rule with specialized converter to the
 		    /// 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);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node writing rule
 		    ///
 		    /// Add a node writing rule to the writer.
 		    GraphWriter& node(const std::string& caption, const Node& node) {
 		      typedef _writer_bits::MapLookUpConverter<Node> Converter;
 		      Converter converter(_node_index);
 		      _writer_bits::ValueStorageBase* storage =
 		        new _writer_bits::ValueStorage<Node, Converter>(node, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge writing rule
 		    ///
 		    /// Add an edge writing rule to writer.
 		    GraphWriter& edge(const std::string& caption, const Edge& edge) {
 		      typedef _writer_bits::MapLookUpConverter<Edge> Converter;
 		      Converter converter(_edge_index);
 		      _writer_bits::ValueStorageBase* storage =
 		        new _writer_bits::ValueStorage<Edge, Converter>(edge, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc writing rule
 		    ///
 		    /// Add an arc writing rule to writer.
 		    GraphWriter& arc(const std::string& caption, const Arc& arc) {
 		      typedef _writer_bits::GraphArcLookUpConverter<Graph> Converter;
 		      Converter converter(_graph, _edge_index);
 		      _writer_bits::ValueStorageBase* storage =
 		        new _writer_bits::ValueStorage<Arc, Converter>(arc, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
-		    /// \name Section captions
+		    /// \name Section Captions
 		    /// @{
 		    /// \brief Add an additional caption to the \c \@nodes section
 		    ///
 		    /// Add an additional caption to the \c \@nodes section.
 		    GraphWriter& nodes(const std::string& caption) {
 		      _nodes_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Add an additional caption to the \c \@arcs section
 		    ///
 		    /// Add an additional caption to the \c \@arcs section.
 		    GraphWriter& edges(const std::string& caption) {
 		      _edges_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Add an additional caption to the \c \@attributes section
 		    ///
 		    /// Add an additional caption to the \c \@attributes section.
 		    GraphWriter& attributes(const std::string& caption) {
 		      _attributes_caption = caption;
 		      return *this;
+		    }
-		    /// \name Skipping section
+		    /// \name Skipping Section
 		    /// @{
 		    /// \brief Skip writing the node set
 		    ///
 		    /// The \c \@nodes section will not be written to the stream.
 		    GraphWriter& skipNodes() {
 		      LEMON_ASSERT(!_skip_nodes, "Multiple usage of skipNodes() member");
 		      _skip_nodes = true;
 		      return *this;
+		    }
 		    /// \brief Skip writing edge set
 		    ///
 		    /// The \c \@edges section will not be written to the stream.
 		    GraphWriter& skipEdges() {
 		      LEMON_ASSERT(!_skip_edges, "Multiple usage of skipEdges() member");
 		      _skip_edges = true;
 		      return *this;
+		    }
 		    /// @}
 		  private:
 		    void writeNodes() {
 		      _writer_bits::MapStorageBase<Node>* label = 0;
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 		           it != _node_maps.end(); ++it) {
 		        if (it->first == "label") {
 		          label = it->second;
 		          break;
+		        }
+		      }
 		      *_os << "@nodes";
 		      if (!_nodes_caption.empty()) {
 		        _writer_bits::writeToken(*_os << ' ', _nodes_caption);
+		      }
 		      *_os << std::endl;
 		      if (label == 0) {
 		        *_os << "label" << '\t';
+		      }
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 		           it != _node_maps.end(); ++it) {
 		        _writer_bits::writeToken(*_os, it->first) << '\t';
+		      }
 		      *_os << std::endl;
 		      std::vector<Node> nodes;
 		      for (NodeIt n(_graph); n != INVALID; ++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);
 		      } else {
 		        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;
+		      }
+		    }
 		    void createNodeIndex() {
 		      _writer_bits::MapStorageBase<Node>* label = 0;
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 		           it != _node_maps.end(); ++it) {
 		        if (it->first == "label") {
 		          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()));
+		        }
 		      } else {
 		        for (NodeIt n(_graph); n != INVALID; ++n) {
 		          std::string value = label->get(n);
 		          _node_index.insert(std::make_pair(n, value));
+		        }
+		      }
+		    }
 		    void writeEdges() {
 		      _writer_bits::MapStorageBase<Edge>* label = 0;
 		      for (typename EdgeMaps::iterator it = _edge_maps.begin();
 		           it != _edge_maps.end(); ++it) {
 		        if (it->first == "label") {
 		          label = it->second;
 		          break;
+		        }
+		      }
 		      *_os << "@edges";
 		      if (!_edges_caption.empty()) {
 		        _writer_bits::writeToken(*_os << ' ', _edges_caption);
+		      }
 		      *_os << std::endl;
 		      *_os << '\t' << '\t';
 		      if (label == 0) {
 		        *_os << "label" << '\t';
+		      }
 		      for (typename EdgeMaps::iterator it = _edge_maps.begin();
 		           it != _edge_maps.end(); ++it) {
 		        _writer_bits::writeToken(*_os, it->first) << '\t';
+		      }
 		      *_os << std::endl;
 		      std::vector<Edge> edges;
 		      for (EdgeIt n(_graph); n != INVALID; ++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);
 		      } else {
 		        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;
+		      }
+		    }
 		    void createEdgeIndex() {
 		      _writer_bits::MapStorageBase<Edge>* label = 0;
 		      for (typename EdgeMaps::iterator it = _edge_maps.begin();
 		           it != _edge_maps.end(); ++it) {
 		        if (it->first == "label") {
 		          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()));
+		        }
 		      } else {
 		        for (EdgeIt e(_graph); e != INVALID; ++e) {
 		          std::string value = label->get(e);
 		          _edge_index.insert(std::make_pair(e, value));
+		        }
+		      }
+		    }
 		    void writeAttributes() {
 		      if (_attributes.empty()) return;
 		      *_os << "@attributes";
 		      if (!_attributes_caption.empty()) {
 		        _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;
+		      }
+		    }
 		  public:
-		    /// \name Execution of the writer
+		    /// \name Execution of the Writer
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// This function starts the batch processing.
 		    void run() {
 		      if (!_skip_nodes) {
 		        writeNodes();
 		      } else {
 		        createNodeIndex();
+		      }
 		      if (!_skip_edges) {
 		        writeEdges();
 		      } else {
 		        createEdgeIndex();
+		      }
 		      writeAttributes();
+		    }
 		    /// \brief Give back the stream of the writer
 		    ///
 		    /// Give back the stream of the writer
 		    std::ostream& ostream() {
 		      return *_os;
+		    }
 		    /// @}
 		  };
 		  /// \brief Return a \ref GraphWriter class
 		  ///
 		  /// This function just returns a \ref GraphWriter class.
 		  /// \relates GraphWriter
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(const Graph& graph,
 		                                 std::ostream& os) {
 		    GraphWriter<Graph> tmp(graph, os);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref GraphWriter class
 		  ///
 		  /// This function just returns a \ref GraphWriter class.
 		  /// \relates GraphWriter
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn) {
 		    GraphWriter<Graph> tmp(graph, fn);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref GraphWriter class
 		  ///
 		  /// This function just returns a \ref GraphWriter class.
 		  /// \relates GraphWriter
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(const Graph& graph, const char* fn) {
 		    GraphWriter<Graph> tmp(graph, fn);
 		    return tmp;
+		  }
 		  class SectionWriter;
 		  SectionWriter sectionWriter(std::istream& is);
 		  SectionWriter sectionWriter(const std::string& fn);
 		  SectionWriter sectionWriter(const char* fn);
 		  /// \ingroup lemon_io
 		  ///
 		  /// \brief Section writer class
 		  ///
 		  /// In the \ref lgf-format "LGF" file extra sections can be placed,
 		  /// which contain any data in arbitrary format. Such sections can be
 		  /// written with this class. A writing rule can be added to the
 		  /// class with two different functions. With the \c sectionLines()
 		  /// function a generator can write the section line-by-line, while
 		  /// with the \c sectionStream() member the section can be written to
 		  /// an output stream.
 		  class SectionWriter {
 		  private:
 		    std::ostream* _os;
 		    bool local_os;
 		    typedef std::vector<std::pair<std::string, _writer_bits::Section*> >
 		    Sections;
 		    Sections _sections;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct a section writer, which writes to the given output
 		    /// stream.
 		    SectionWriter(std::ostream& os)
 		      : _os(&os), local_os(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a section writer, which writes into the given file.
 		    SectionWriter(const std::string& fn)
 		      : _os(new std::ofstream(fn.c_str())), local_os(true) {
 		      if (!(*_os)) {
 		        delete _os;
 		        throw IoError("Cannot write file", fn);
+		      }
+		    }
 		    /// \brief Constructor
 		    ///
 		    /// Construct a section writer, which writes into the given file.
 		    SectionWriter(const char* fn)
 		      : _os(new std::ofstream(fn)), local_os(true) {
 		      if (!(*_os)) {
 		        delete _os;
 		        throw IoError("Cannot write file", fn);
+		      }
+		    }
 		    /// \brief Destructor
 		    ~SectionWriter() {
 		      for (Sections::iterator it = _sections.begin();
 		           it != _sections.end(); ++it) {
 		        delete it->second;
+		      }
 		      if (local_os) {
 		        delete _os;
+		      }
+		    }
 		  private:
 		    friend SectionWriter sectionWriter(std::ostream& os);
 		    friend SectionWriter sectionWriter(const std::string& fn);
 		    friend SectionWriter sectionWriter(const char* fn);
 		    SectionWriter(SectionWriter& other)
 		      : _os(other._os), local_os(other.local_os) {
 		      other._os = 0;
 		      other.local_os = false;
 		      _sections.swap(other._sections);
+		    }
 		    SectionWriter& operator=(const SectionWriter&);
 		  public:
-		    /// \name Section writers
+		    /// \name Section Writers
 		    /// @{
 		    /// \brief Add a section writer with line oriented writing
 		    ///
 		    /// The first parameter is the type descriptor of the section, the
 		    /// second is a generator with std::string values. At the writing
 		    /// process, the returned \c std::string will be written into the
 		    /// output file until it is an empty string.
 		    ///
 		    /// For example, an integer vector is written into a section.
 		    ///\code
 		    ///  @numbers
 		    ///  12 45 23 78
 		    ///  4 28 38 28
 		    ///  23 6 16
 		    ///\endcode
 		    ///
 		    /// The generator is implemented as a struct.
 		    ///\code
 		    ///  struct NumberSection {
 		    ///    std::vector<int>::const_iterator _it, _end;
 		    ///    NumberSection(const std::vector<int>& data)
 		    ///      : _it(data.begin()), _end(data.end()) {}
 		    ///    std::string operator()() {
 		    ///      int rem_in_line = 4;
 		    ///      std::ostringstream ls;
 		    ///      while (rem_in_line > 0 && _it != _end) {
 		    ///        ls << *(_it++) << ' ';
 		    ///        --rem_in_line;
 		    ///      }
 		    ///      return ls.str();
 		    ///    }
 		    ///  };
 		    ///
 		    ///  // ...
 		    ///
 		    ///  writer.sectionLines("numbers", NumberSection(vec));
 		    ///\endcode
 		    template <typename Functor>
 		    SectionWriter& sectionLines(const std::string& type, Functor functor) {
 		      LEMON_ASSERT(!type.empty(), "Type is empty.");
 		      _sections.push_back(std::make_pair(type,
 		        new _writer_bits::LineSection<Functor>(functor)));
 		      return *this;
+		    }
 		    /// \brief Add a section writer with stream oriented writing
 		    ///
 		    /// The first parameter is the type of the section, the second is
 		    /// a functor, which takes a \c std::ostream& parameter. The
 		    /// functor writes the section to the output stream.
 		    /// \warning The last line must be closed with end-line character.
 		    template <typename Functor>
 		    SectionWriter& sectionStream(const std::string& type, Functor functor) {
 		      LEMON_ASSERT(!type.empty(), "Type is empty.");
 		      _sections.push_back(std::make_pair(type,
 		         new _writer_bits::StreamSection<Functor>(functor)));
 		      return *this;
+		    }
 		    /// @}
 		  public:
-		    /// \name Execution of the writer
+		    /// \name Execution of the Writer
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// This function starts the batch processing.
 		    void run() {
 		      LEMON_ASSERT(_os != 0, "This writer is assigned to an other writer");
 		      for (Sections::iterator it = _sections.begin();
 		           it != _sections.end(); ++it) {
 		        (*_os) << '@' << it->first << std::endl;
 		        it->second->process(*_os);
+		      }
+		    }
 		    /// \brief Give back the stream of the writer
 		    ///
 		    /// Returns the stream of the writer
 		    std::ostream& ostream() {
 		      return *_os;
+		    }
 		    /// @}
 		  };
 		  /// \brief Return a \ref SectionWriter class
 		  ///
 		  /// This function just returns a \ref SectionWriter class.
 		  /// \relates SectionWriter
 		  inline SectionWriter sectionWriter(std::ostream& os) {
 		    SectionWriter tmp(os);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref SectionWriter class
 		  ///
 		  /// This function just returns a \ref SectionWriter class.
 		  /// \relates SectionWriter
 		  inline SectionWriter sectionWriter(const std::string& fn) {
 		    SectionWriter tmp(fn);
 		    return tmp;
+		  }
 		  /// \brief Return a \ref SectionWriter class
 		  ///
 		  /// This function just returns a \ref SectionWriter class.
 		  /// \relates SectionWriter
 		  inline SectionWriter sectionWriter(const char* fn) {
 		    SectionWriter tmp(fn);
 		    return tmp;
+		  }
+		}
 		#endif

lemon/lp_base.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_LP_BASE_H
 		#define LEMON_LP_BASE_H
 		#include<iostream>
 		#include<vector>
 		#include<map>
 		#include<limits>
 		#include<lemon/math.h>
 		#include<lemon/error.h>
 		#include<lemon/assert.h>
 		#include<lemon/core.h>
 		#include<lemon/bits/solver_bits.h>
 		///\file
 		///\brief The interface of the LP solver interface.
 		///\ingroup lp_group
 		namespace lemon {
 		  ///Common base class for LP and MIP solvers
 		  ///Usually this class is not used directly, please use one of the concrete
 		  ///implementations of the solver interface.
 		  ///\ingroup lp_group
 		  class LpBase {
 		  protected:
 		    _solver_bits::VarIndex rows;
 		    _solver_bits::VarIndex cols;
 		  public:
 		    ///Possible outcomes of an LP solving procedure
 		    enum SolveExitStatus {
-		      ///This means that the problem has been successfully solved: either
+		      /// = 0. It means that the problem has been successfully solved: either
 		      ///an optimal solution has been found or infeasibility/unboundedness
 		      ///has been proved.
 		      SOLVED = 0,
 		      ///Any other case (including the case when some user specified
 		      ///limit has been exceeded)
 		      /// = 1. Any other case (including the case when some user specified
 		      ///limit has been exceeded).
 		      UNSOLVED = 1
 		    };
 		    ///Direction of the optimization
 		    enum Sense {
 		      /// Minimization
 		      MIN,
 		      /// Maximization
 		      MAX
 		    };
 		    ///Enum for \c messageLevel() parameter
 		    enum MessageLevel {
-		      /// no output (default value)
+		      /// No output (default value).
 		      MESSAGE_NOTHING,
-		      /// error messages only
+		      /// Error messages only.
 		      MESSAGE_ERROR,
-		      /// warnings
+		      /// Warnings.
 		      MESSAGE_WARNING,
-		      /// normal output
+		      /// Normal output.
 		      MESSAGE_NORMAL,
-		      /// verbose output
+		      /// Verbose output.
 		      MESSAGE_VERBOSE
 		    };
 		    ///The floating point type used by the solver
 		    typedef double Value;
 		    ///The infinity constant
 		    static const Value INF;
 		    ///The not a number constant
 		    static const Value NaN;
 		    friend class Col;
 		    friend class ColIt;
 		    friend class Row;
 		    friend class RowIt;
 		    ///Refer to a column of the LP.
 		    ///This type is used to refer to a column of the LP.
 		    ///
 		    ///Its value remains valid and correct even after the addition or erase of
 		    ///other columns.
 		    ///
 		    ///\note This class is similar to other Item types in LEMON, like
 		    ///Node and Arc types in digraph.
 		    class Col {
 		      friend class LpBase;
 		    protected:
 		      int _id;
 		      explicit Col(int id) : _id(id) {}
 		    public:
 		      typedef Value ExprValue;
 		      typedef True LpCol;
 		      /// Default constructor
 		      /// \warning The default constructor sets the Col to an
 		      /// undefined value.
 		      Col() {}
 		      /// Invalid constructor \& conversion.
 		      /// This constructor initializes the Col to be invalid.
 		      /// \sa Invalid for more details.
 		      Col(const Invalid&) : _id(-1) {}
 		      /// Equality operator
 		      /// Two \ref Col "Col"s are equal if and only if they point to
 		      /// the same LP column or both are invalid.
 		      bool operator==(Col c) const  {return _id == c._id;}
 		      /// Inequality operator
 		      /// \sa operator==(Col c)
 		      ///
 		      bool operator!=(Col c) const  {return _id != c._id;}
 		      /// Artificial ordering operator.
 		      /// To allow the use of this object 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<(Col c) const  {return _id < c._id;}
 		    };
 		    ///Iterator for iterate over the columns of an LP problem
 		    /// Its usage is quite simple, for example you can count the number
 		    /// of columns in an LP \c lp:
 		    ///\code
 		    /// int count=0;
 		    /// for (LpBase::ColIt c(lp); c!=INVALID; ++c) ++count;
 		    ///\endcode
 		    class ColIt : public Col {
 		      const LpBase *_solver;
 		    public:
 		      /// Default constructor
 		      /// \warning The default constructor sets the iterator
 		      /// to an undefined value.
 		      ColIt() {}
 		      /// Sets the iterator to the first Col
 		      /// Sets the iterator to the first Col.
 		      ///
 		      ColIt(const LpBase &solver) : _solver(&solver)
+		      {
 		        _solver->cols.firstItem(_id);
+		      }
 		      /// Invalid constructor \& conversion
 		      /// Initialize the iterator to be invalid.
 		      /// \sa Invalid for more details.
 		      ColIt(const Invalid&) : Col(INVALID) {}
 		      /// Next column
 		      /// Assign the iterator to the next column.
 		      ///
 		      ColIt &operator++()
+		      {
 		        _solver->cols.nextItem(_id);
 		        return *this;
+		      }
 		    };
 		    /// \brief Returns the ID of the column.
 		    static int id(const Col& col) { return col._id; }
 		    /// \brief Returns the column with the given ID.
 		    ///
 		    /// \pre The argument should be a valid column ID in the LP problem.
 		    static Col colFromId(int id) { return Col(id); }
 		    ///Refer to a row of the LP.
 		    ///This type is used to refer to a row of the LP.
 		    ///
 		    ///Its value remains valid and correct even after the addition or erase of
 		    ///other rows.
 		    ///
 		    ///\note This class is similar to other Item types in LEMON, like
 		    ///Node and Arc types in digraph.
 		    class Row {
 		      friend class LpBase;
 		    protected:
 		      int _id;
 		      explicit Row(int id) : _id(id) {}
 		    public:
 		      typedef Value ExprValue;
 		      typedef True LpRow;
 		      /// Default constructor
 		      /// \warning The default constructor sets the Row to an
 		      /// undefined value.
 		      Row() {}
 		      /// Invalid constructor \& conversion.
 		      /// This constructor initializes the Row to be invalid.
 		      /// \sa Invalid for more details.
 		      Row(const Invalid&) : _id(-1) {}
 		      /// Equality operator
 		      /// Two \ref Row "Row"s are equal if and only if they point to
 		      /// the same LP row or both are invalid.
 		      bool operator==(Row r) const  {return _id == r._id;}
 		      /// Inequality operator
 		      /// \sa operator==(Row r)
 		      ///
 		      bool operator!=(Row r) const  {return _id != r._id;}
 		      /// Artificial ordering operator.
 		      /// To allow the use of this object 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<(Row r) const  {return _id < r._id;}
 		    };
 		    ///Iterator for iterate over the rows of an LP problem
 		    /// Its usage is quite simple, for example you can count the number
 		    /// of rows in an LP \c lp:
 		    ///\code
 		    /// int count=0;
 		    /// for (LpBase::RowIt c(lp); c!=INVALID; ++c) ++count;
 		    ///\endcode
 		    class RowIt : public Row {
 		      const LpBase *_solver;
 		    public:
 		      /// Default constructor
 		      /// \warning The default constructor sets the iterator
 		      /// to an undefined value.
 		      RowIt() {}
 		      /// Sets the iterator to the first Row
 		      /// Sets the iterator to the first Row.
 		      ///
 		      RowIt(const LpBase &solver) : _solver(&solver)
+		      {
 		        _solver->rows.firstItem(_id);
+		      }
 		      /// Invalid constructor \& conversion
 		      /// Initialize the iterator to be invalid.
 		      /// \sa Invalid for more details.
 		      RowIt(const Invalid&) : Row(INVALID) {}
 		      /// Next row
 		      /// Assign the iterator to the next row.
 		      ///
 		      RowIt &operator++()
+		      {
 		        _solver->rows.nextItem(_id);
 		        return *this;
+		      }
 		    };
 		    /// \brief Returns the ID of the row.
 		    static int id(const Row& row) { return row._id; }
 		    /// \brief Returns the row with the given ID.
 		    ///
 		    /// \pre The argument should be a valid row ID in the LP problem.
 		    static Row rowFromId(int id) { return Row(id); }
 		  public:
 		    ///Linear expression of variables and a constant component
 		    ///This data structure stores a linear expression of the variables
 		    ///(\ref Col "Col"s) and also has a constant component.
 		    ///
 		    ///There are several ways to access and modify the contents of this
 		    ///container.
 		    ///\code
 		    ///e[v]=5;
 		    ///e[v]+=12;
 		    ///e.erase(v);
 		    ///\endcode
 		    ///or you can also iterate through its elements.
 		    ///\code
 		    ///double s=0;
 		    ///for(LpBase::Expr::ConstCoeffIt i(e);i!=INVALID;++i)
 		    ///  s+=*i * primal(i);
 		    ///\endcode
 		    ///(This code computes the primal value of the expression).
 		    ///- Numbers (<tt>double</tt>'s)
 		    ///and variables (\ref Col "Col"s) directly convert to an
 		    ///\ref Expr and the usual linear operations are defined, so
 		    ///\code
 		    ///v+w
 		    ///2*v-3.12*(v-w/2)+2
 		    ///v*2.1+(3*v+(v*12+w+6)*3)/2
 		    ///\endcode
 		    ///are valid expressions.
 		    ///The usual assignment operations are also defined.
 		    ///\code
 		    ///e=v+w;
 		    ///e+=2*v-3.12*(v-w/2)+2;
 		    ///e*=3.4;
 		    ///e/=5;
 		    ///\endcode
 		    ///- The constant member can be set and read by dereference
 		    ///  operator (unary *)
 		    ///
 		    ///\code
 		    ///*e=12;
 		    ///double c=*e;
 		    ///\endcode
 		    ///
 		    ///\sa Constr
 		    class Expr {
 		      friend class LpBase;
 		    public:
 		      /// The key type of the expression
 		      typedef LpBase::Col Key;
 		      /// The value type of the expression
 		      typedef LpBase::Value Value;
 		    protected:
 		      Value const_comp;
 		      std::map<int, Value> comps;
 		    public:
 		      typedef True SolverExpr;
 		      /// Default constructor
 		      /// Construct an empty expression, the coefficients and
 		      /// the constant component are initialized to zero.
 		      Expr() : const_comp(0) {}
 		      /// Construct an expression from a column
 		      /// Construct an expression, which has a term with \c c variable
 		      /// and 1.0 coefficient.
 		      Expr(const Col &c) : const_comp(0) {
 		        typedef std::map<int, Value>::value_type pair_type;
 		        comps.insert(pair_type(id(c), 1));
+		      }
 		      /// Construct an expression from a constant
 		      /// Construct an expression, which's constant component is \c v.
 		      ///
 		      Expr(const Value &v) : const_comp(v) {}
 		      /// Returns the coefficient of the column
 		      Value operator[](const Col& c) const {
 		        std::map<int, Value>::const_iterator it=comps.find(id(c));
 		        if (it != comps.end()) {
 		          return it->second;
 		        } else {
 		          return 0;
+		        }
+		      }
 		      /// Returns the coefficient of the column
 		      Value& operator[](const Col& c) {
 		        return comps[id(c)];
+		      }
 		      /// Sets the coefficient of the column
 		      void set(const Col &c, const Value &v) {
 		        if (v != 0.0) {
 		          typedef std::map<int, Value>::value_type pair_type;
 		          comps.insert(pair_type(id(c), v));
 		        } else {
 		          comps.erase(id(c));
+		        }
+		      }
 		      /// Returns the constant component of the expression
 		      Value& operator*() { return const_comp; }
 		      /// Returns the constant component of the expression
 		      const Value& operator*() const { return const_comp; }
 		      /// \brief Removes the coefficients which's absolute value does
 		      /// not exceed \c epsilon. It also sets to zero the constant
 		      /// component, if it does not exceed epsilon in absolute value.
 		      void simplify(Value epsilon = 0.0) {
 		        std::map<int, Value>::iterator it=comps.begin();
 		        while (it != comps.end()) {
 		          std::map<int, Value>::iterator jt=it;
 		          ++jt;
 		          if (std::fabs((*it).second) <= epsilon) comps.erase(it);
 		          it=jt;
+		        }
 		        if (std::fabs(const_comp) <= epsilon) const_comp = 0;
+		      }
 		      void simplify(Value epsilon = 0.0) const {
 		        const_cast<Expr*>(this)->simplify(epsilon);
+		      }
 		      ///Sets all coefficients and the constant component to 0.
 		      void clear() {
 		        comps.clear();
 		        const_comp=0;
+		      }
 		      ///Compound assignment
 		      Expr &operator+=(const Expr &e) {
 		        for (std::map<int, Value>::const_iterator it=e.comps.begin();
 		             it!=e.comps.end(); ++it)
 		          comps[it->first]+=it->second;
 		        const_comp+=e.const_comp;
 		        return *this;
+		      }
 		      ///Compound assignment
 		      Expr &operator-=(const Expr &e) {
 		        for (std::map<int, Value>::const_iterator it=e.comps.begin();
 		             it!=e.comps.end(); ++it)
 		          comps[it->first]-=it->second;
 		        const_comp-=e.const_comp;
 		        return *this;
+		      }
 		      ///Multiply with a constant
 		      Expr &operator*=(const Value &v) {
 		        for (std::map<int, Value>::iterator it=comps.begin();
 		             it!=comps.end(); ++it)
 		          it->second*=v;
 		        const_comp*=v;
 		        return *this;
+		      }
 		      ///Division with a constant
 		      Expr &operator/=(const Value &c) {
 		        for (std::map<int, Value>::iterator it=comps.begin();
 		             it!=comps.end(); ++it)
 		          it->second/=c;
 		        const_comp/=c;
 		        return *this;
+		      }
 		      ///Iterator over the expression
 		      ///The iterator iterates over the terms of the expression.
 		      ///
 		      ///\code
 		      ///double s=0;
 		      ///for(LpBase::Expr::CoeffIt i(e);i!=INVALID;++i)
 		      ///  s+= *i * primal(i);
 		      ///\endcode
 		      class CoeffIt {
 		      private:
 		        std::map<int, Value>::iterator _it, _end;
 		      public:
 		        /// Sets the iterator to the first term
 		        /// Sets the iterator to the first term of the expression.
 		        ///
 		        CoeffIt(Expr& e)
 		          : _it(e.comps.begin()), _end(e.comps.end()){}
 		        /// Convert the iterator to the column of the term
 		        operator Col() const {
 		          return colFromId(_it->first);
+		        }
 		        /// Returns the coefficient of the term
 		        Value& operator*() { return _it->second; }
 		        /// Returns the coefficient of the term
 		        const Value& operator*() const { return _it->second; }
 		        /// Next term
 		        /// Assign the iterator to the next term.
 		        ///
 		        CoeffIt& operator++() { ++_it; return *this; }
 		        /// Equality operator
 		        bool operator==(Invalid) const { return _it == _end; }
 		        /// Inequality operator
 		        bool operator!=(Invalid) const { return _it != _end; }
 		      };
 		      /// Const iterator over the expression
 		      ///The iterator iterates over the terms of the expression.
 		      ///
 		      ///\code
 		      ///double s=0;
 		      ///for(LpBase::Expr::ConstCoeffIt i(e);i!=INVALID;++i)
 		      ///  s+=*i * primal(i);
 		      ///\endcode
 		      class ConstCoeffIt {
 		      private:
 		        std::map<int, Value>::const_iterator _it, _end;
 		      public:
 		        /// Sets the iterator to the first term
 		        /// Sets the iterator to the first term of the expression.
 		        ///
 		        ConstCoeffIt(const Expr& e)
 		          : _it(e.comps.begin()), _end(e.comps.end()){}
 		        /// Convert the iterator to the column of the term
 		        operator Col() const {
 		          return colFromId(_it->first);
+		        }
 		        /// Returns the coefficient of the term
 		        const Value& operator*() const { return _it->second; }
 		        /// Next term
 		        /// Assign the iterator to the next term.
 		        ///
 		        ConstCoeffIt& operator++() { ++_it; return *this; }
 		        /// Equality operator
 		        bool operator==(Invalid) const { return _it == _end; }
 		        /// Inequality operator
 		        bool operator!=(Invalid) const { return _it != _end; }
 		      };
 		    };
 		    ///Linear constraint
 		    ///This data stucture represents a linear constraint in the LP.
 		    ///Basically it is a linear expression with a lower or an upper bound
 		    ///(or both). These parts of the constraint can be obtained by the member
 		    ///functions \ref expr(), \ref lowerBound() and \ref upperBound(),
 		    ///respectively.
 		    ///There are two ways to construct a constraint.
 		    ///- You can set the linear expression and the bounds directly
 		    ///  by the functions above.
 		    ///- The operators <tt>\<=</tt>, <tt>==</tt> and  <tt>\>=</tt>
 		    ///  are defined between expressions, or even between constraints whenever
 		    ///  it makes sense. Therefore if \c e and \c f are linear expressions and
 		    ///  \c s and \c t are numbers, then the followings are valid expressions
 		    ///  and thus they can be used directly e.g. in \ref addRow() whenever
 		    ///  it makes sense.
 		    ///\code
 		    ///  e<=s
 		    ///  e<=f
 		    ///  e==f
 		    ///  s<=e<=t
 		    ///  e>=t
 		    ///\endcode
 		    ///\warning The validity of a constraint is checked only at run
 		    ///time, so e.g. \ref addRow(<tt>x[1]\<=x[2]<=5</tt>) will
 		    ///compile, but will fail an assertion.
 		    class Constr
+		    {
 		    public:
 		      typedef LpBase::Expr Expr;
 		      typedef Expr::Key Key;
 		      typedef Expr::Value Value;
 		    protected:
 		      Expr _expr;
 		      Value _lb,_ub;
 		    public:
 		      ///\e
 		      Constr() : _expr(), _lb(NaN), _ub(NaN) {}
 		      ///\e
 		      Constr(Value lb, const Expr &e, Value ub) :
 		        _expr(e), _lb(lb), _ub(ub) {}
 		      Constr(const Expr &e) :
 		        _expr(e), _lb(NaN), _ub(NaN) {}
 		      ///\e
 		      void clear()
+		      {
 		        _expr.clear();
 		        _lb=_ub=NaN;
+		      }
 		      ///Reference to the linear expression
 		      Expr &expr() { return _expr; }
 		      ///Cont reference to the linear expression
 		      const Expr &expr() const { return _expr; }
 		      ///Reference to the lower bound.
 		      ///\return
 		      ///- \ref INF "INF": the constraint is lower unbounded.
 		      ///- \ref NaN "NaN": lower bound has not been set.
 		      ///- finite number: the lower bound
 		      Value &lowerBound() { return _lb; }
 		      ///The const version of \ref lowerBound()
 		      const Value &lowerBound() const { return _lb; }
 		      ///Reference to the upper bound.
 		      ///\return
 		      ///- \ref INF "INF": the constraint is upper unbounded.
 		      ///- \ref NaN "NaN": upper bound has not been set.
 		      ///- finite number: the upper bound
 		      Value &upperBound() { return _ub; }
 		      ///The const version of \ref upperBound()
 		      const Value &upperBound() const { return _ub; }
 		      ///Is the constraint lower bounded?
 		      bool lowerBounded() const {
 		        return _lb != -INF && !isNaN(_lb);
+		      }
 		      ///Is the constraint upper bounded?
 		      bool upperBounded() const {
 		        return _ub != INF && !isNaN(_ub);
+		      }
 		    };
 		    ///Linear expression of rows
 		    ///This data structure represents a column of the matrix,
 		    ///thas is it strores a linear expression of the dual variables
 		    ///(\ref Row "Row"s).
 		    ///
 		    ///There are several ways to access and modify the contents of this
 		    ///container.
 		    ///\code
 		    ///e[v]=5;
 		    ///e[v]+=12;
 		    ///e.erase(v);
 		    ///\endcode
 		    ///or you can also iterate through its elements.
 		    ///\code
 		    ///double s=0;
 		    ///for(LpBase::DualExpr::ConstCoeffIt i(e);i!=INVALID;++i)
 		    ///  s+=*i;
 		    ///\endcode
 		    ///(This code computes the sum of all coefficients).
 		    ///- Numbers (<tt>double</tt>'s)
 		    ///and variables (\ref Row "Row"s) directly convert to an
 		    ///\ref DualExpr and the usual linear operations are defined, so
 		    ///\code
 		    ///v+w
 		    ///2*v-3.12*(v-w/2)
 		    ///v*2.1+(3*v+(v*12+w)*3)/2
 		    ///\endcode
 		    ///are valid \ref DualExpr dual expressions.
 		    ///The usual assignment operations are also defined.
 		    ///\code
 		    ///e=v+w;
 		    ///e+=2*v-3.12*(v-w/2);
 		    ///e*=3.4;
 		    ///e/=5;
 		    ///\endcode
 		    ///
 		    ///\sa Expr
 		    class DualExpr {
 		      friend class LpBase;
 		    public:
 		      /// The key type of the expression
 		      typedef LpBase::Row Key;
 		      /// The value type of the expression
 		      typedef LpBase::Value Value;
 		    protected:
 		      std::map<int, Value> comps;
 		    public:
 		      typedef True SolverExpr;
 		      /// Default constructor
 		      /// Construct an empty expression, the coefficients are
 		      /// initialized to zero.
 		      DualExpr() {}
 		      /// Construct an expression from a row
 		      /// Construct an expression, which has a term with \c r dual
 		      /// variable and 1.0 coefficient.
 		      DualExpr(const Row &r) {
 		        typedef std::map<int, Value>::value_type pair_type;
 		        comps.insert(pair_type(id(r), 1));
+		      }
 		      /// Returns the coefficient of the row
 		      Value operator[](const Row& r) const {
 		        std::map<int, Value>::const_iterator it = comps.find(id(r));
 		        if (it != comps.end()) {
 		          return it->second;
 		        } else {
 		          return 0;
+		        }
+		      }
 		      /// Returns the coefficient of the row
 		      Value& operator[](const Row& r) {
 		        return comps[id(r)];
+		      }
 		      /// Sets the coefficient of the row
 		      void set(const Row &r, const Value &v) {
 		        if (v != 0.0) {
 		          typedef std::map<int, Value>::value_type pair_type;
 		          comps.insert(pair_type(id(r), v));
 		        } else {
 		          comps.erase(id(r));
+		        }
+		      }
 		      /// \brief Removes the coefficients which's absolute value does
 		      /// not exceed \c epsilon.
 		      void simplify(Value epsilon = 0.0) {
 		        std::map<int, Value>::iterator it=comps.begin();
 		        while (it != comps.end()) {
 		          std::map<int, Value>::iterator jt=it;
 		          ++jt;
 		          if (std::fabs((*it).second) <= epsilon) comps.erase(it);
 		          it=jt;
+		        }
+		      }
 		      void simplify(Value epsilon = 0.0) const {
 		        const_cast<DualExpr*>(this)->simplify(epsilon);
+		      }
 		      ///Sets all coefficients to 0.
 		      void clear() {
 		        comps.clear();
+		      }
 		      ///Compound assignment
 		      DualExpr &operator+=(const DualExpr &e) {
 		        for (std::map<int, Value>::const_iterator it=e.comps.begin();
 		             it!=e.comps.end(); ++it)
 		          comps[it->first]+=it->second;
 		        return *this;
+		      }
 		      ///Compound assignment
 		      DualExpr &operator-=(const DualExpr &e) {
 		        for (std::map<int, Value>::const_iterator it=e.comps.begin();
 		             it!=e.comps.end(); ++it)
 		          comps[it->first]-=it->second;
 		        return *this;
+		      }
 		      ///Multiply with a constant
 		      DualExpr &operator*=(const Value &v) {
 		        for (std::map<int, Value>::iterator it=comps.begin();
 		             it!=comps.end(); ++it)
 		          it->second*=v;
 		        return *this;
+		      }
 		      ///Division with a constant
 		      DualExpr &operator/=(const Value &v) {
 		        for (std::map<int, Value>::iterator it=comps.begin();
 		             it!=comps.end(); ++it)
 		          it->second/=v;
 		        return *this;
+		      }
 		      ///Iterator over the expression
 		      ///The iterator iterates over the terms of the expression.
 		      ///
 		      ///\code
 		      ///double s=0;
 		      ///for(LpBase::DualExpr::CoeffIt i(e);i!=INVALID;++i)
 		      ///  s+= *i * dual(i);
 		      ///\endcode
 		      class CoeffIt {
 		      private:
 		        std::map<int, Value>::iterator _it, _end;
 		      public:
 		        /// Sets the iterator to the first term
 		        /// Sets the iterator to the first term of the expression.
 		        ///
 		        CoeffIt(DualExpr& e)
 		          : _it(e.comps.begin()), _end(e.comps.end()){}
 		        /// Convert the iterator to the row of the term
 		        operator Row() const {
 		          return rowFromId(_it->first);
+		        }
 		        /// Returns the coefficient of the term
 		        Value& operator*() { return _it->second; }
 		        /// Returns the coefficient of the term
 		        const Value& operator*() const { return _it->second; }
 		        /// Next term
 		        /// Assign the iterator to the next term.
 		        ///
 		        CoeffIt& operator++() { ++_it; return *this; }
 		        /// Equality operator
 		        bool operator==(Invalid) const { return _it == _end; }
 		        /// Inequality operator
 		        bool operator!=(Invalid) const { return _it != _end; }
 		      };
 		      ///Iterator over the expression
 		      ///The iterator iterates over the terms of the expression.
 		      ///
 		      ///\code
 		      ///double s=0;
 		      ///for(LpBase::DualExpr::ConstCoeffIt i(e);i!=INVALID;++i)
 		      ///  s+= *i * dual(i);
 		      ///\endcode
 		      class ConstCoeffIt {
 		      private:
 		        std::map<int, Value>::const_iterator _it, _end;
 		      public:
 		        /// Sets the iterator to the first term
 		        /// Sets the iterator to the first term of the expression.
 		        ///
 		        ConstCoeffIt(const DualExpr& e)
 		          : _it(e.comps.begin()), _end(e.comps.end()){}
 		        /// Convert the iterator to the row of the term
 		        operator Row() const {
 		          return rowFromId(_it->first);
+		        }
 		        /// Returns the coefficient of the term
 		        const Value& operator*() const { return _it->second; }
 		        /// Next term
 		        /// Assign the iterator to the next term.
 		        ///
 		        ConstCoeffIt& operator++() { ++_it; return *this; }
 		        /// Equality operator
 		        bool operator==(Invalid) const { return _it == _end; }
 		        /// Inequality operator
 		        bool operator!=(Invalid) const { return _it != _end; }
 		      };
 		    };
 		  protected:
 		    class InsertIterator {
 		    private:
 		      std::map<int, Value>& _host;
 		      const _solver_bits::VarIndex& _index;
 		    public:
 		      typedef std::output_iterator_tag iterator_category;
 		      typedef void difference_type;
 		      typedef void value_type;
 		      typedef void reference;
 		      typedef void pointer;
 		      InsertIterator(std::map<int, Value>& host,
 		                   const _solver_bits::VarIndex& index)
 		        : _host(host), _index(index) {}
 		      InsertIterator& operator=(const std::pair<int, Value>& value) {
 		        typedef std::map<int, Value>::value_type pair_type;
 		        _host.insert(pair_type(_index[value.first], value.second));
 		        return *this;
+		      }
 		      InsertIterator& operator*() { return *this; }
 		      InsertIterator& operator++() { return *this; }
 		      InsertIterator operator++(int) { return *this; }
 		    };
 		    class ExprIterator {
 		    private:
 		      std::map<int, Value>::const_iterator _host_it;
 		      const _solver_bits::VarIndex& _index;
 		    public:
 		      typedef std::bidirectional_iterator_tag iterator_category;
 		      typedef std::ptrdiff_t difference_type;
 		      typedef const std::pair<int, Value> value_type;
 		      typedef value_type reference;
 		      class pointer {
 		      public:
 		        pointer(value_type& _value) : value(_value) {}
 		        value_type* operator->() { return &value; }
 		      private:
 		        value_type value;
 		      };
 		      ExprIterator(const std::map<int, Value>::const_iterator& host_it,
 		                   const _solver_bits::VarIndex& index)
 		        : _host_it(host_it), _index(index) {}
 		      reference operator*() {
 		        return std::make_pair(_index(_host_it->first), _host_it->second);
+		      }
 		      pointer operator->() {
 		        return pointer(operator*());
+		      }
 		      ExprIterator& operator++() { ++_host_it; return *this; }
 		      ExprIterator operator++(int) {
 		        ExprIterator tmp(*this); ++_host_it; return tmp;
+		      }
 		      ExprIterator& operator--() { --_host_it; return *this; }
 		      ExprIterator operator--(int) {
 		        ExprIterator tmp(*this); --_host_it; return tmp;
+		      }
 		      bool operator==(const ExprIterator& it) const {
 		        return _host_it == it._host_it;
+		      }
 		      bool operator!=(const ExprIterator& it) const {
 		        return _host_it != it._host_it;
+		      }
 		    };
 		  protected:
 		    //Abstract virtual functions
 		    virtual int _addColId(int col) { return cols.addIndex(col); }
 		    virtual int _addRowId(int row) { return rows.addIndex(row); }
 		    virtual void _eraseColId(int col) { cols.eraseIndex(col); }
 		    virtual void _eraseRowId(int row) { rows.eraseIndex(row); }
 		    virtual int _addCol() = 0;
 		    virtual int _addRow() = 0;
 		    virtual void _eraseCol(int col) = 0;
 		    virtual void _eraseRow(int row) = 0;
 		    virtual void _getColName(int col, std::string& name) const = 0;
 		    virtual void _setColName(int col, const std::string& name) = 0;
 		    virtual int _colByName(const std::string& name) const = 0;
 		    virtual void _getRowName(int row, std::string& name) const = 0;
 		    virtual void _setRowName(int row, const std::string& name) = 0;
 		    virtual int _rowByName(const std::string& name) const = 0;
 		    virtual void _setRowCoeffs(int i, ExprIterator b, ExprIterator e) = 0;
 		    virtual void _getRowCoeffs(int i, InsertIterator b) const = 0;
 		    virtual void _setColCoeffs(int i, ExprIterator b, ExprIterator e) = 0;
 		    virtual void _getColCoeffs(int i, InsertIterator b) const = 0;
 		    virtual void _setCoeff(int row, int col, Value value) = 0;
 		    virtual Value _getCoeff(int row, int col) const = 0;
 		    virtual void _setColLowerBound(int i, Value value) = 0;
 		    virtual Value _getColLowerBound(int i) const = 0;
 		    virtual void _setColUpperBound(int i, Value value) = 0;
 		    virtual Value _getColUpperBound(int i) const = 0;
 		    virtual void _setRowLowerBound(int i, Value value) = 0;
 		    virtual Value _getRowLowerBound(int i) const = 0;
 		    virtual void _setRowUpperBound(int i, Value value) = 0;
 		    virtual Value _getRowUpperBound(int i) const = 0;
 		    virtual void _setObjCoeffs(ExprIterator b, ExprIterator e) = 0;
 		    virtual void _getObjCoeffs(InsertIterator b) const = 0;
 		    virtual void _setObjCoeff(int i, Value obj_coef) = 0;
 		    virtual Value _getObjCoeff(int i) const = 0;
 		    virtual void _setSense(Sense) = 0;
 		    virtual Sense _getSense() const = 0;
 		    virtual void _clear() = 0;
 		    virtual const char* _solverName() const = 0;
 		    virtual void _messageLevel(MessageLevel level) = 0;
 		    //Own protected stuff
 		    //Constant component of the objective function
 		    Value obj_const_comp;
 		    LpBase() : rows(), cols(), obj_const_comp(0) {}
 		  public:
 		    /// Virtual destructor
 		    virtual ~LpBase() {}
 		    ///Gives back the name of the solver.
 		    const char* solverName() const {return _solverName();}
-		    ///\name Build up and modify the LP
+		    ///\name Build Up and Modify the LP
 		    ///@{
 		    ///Add a new empty column (i.e a new variable) to the LP
 		    Col addCol() { Col c; c._id = _addColId(_addCol()); return c;}
 		    ///\brief Adds several new columns (i.e variables) at once
 		    ///
 		    ///This magic function takes a container as its argument and fills
 		    ///its elements with new columns (i.e. variables)
 		    ///\param t can be
 		    ///- a standard STL compatible iterable container with
 		    ///\ref Col as its \c values_type like
 		    ///\code
 		    ///std::vector<LpBase::Col>
 		    ///std::list<LpBase::Col>
 		    ///\endcode
 		    ///- a standard STL compatible iterable container with
 		    ///\ref Col as its \c mapped_type like
 		    ///\code
 		    ///std::map<AnyType,LpBase::Col>
 		    ///\endcode
 		    ///- an iterable lemon \ref concepts::WriteMap "write map" like
 		    ///\code
 		    ///ListGraph::NodeMap<LpBase::Col>
 		    ///ListGraph::ArcMap<LpBase::Col>
 		    ///\endcode
 		    ///\return The number of the created column.
 		#ifdef DOXYGEN
 		    template<class T>
 		    int addColSet(T &t) { return 0;}
 		#else
 		    template<class T>
 		    typename enable_if<typename T::value_type::LpCol,int>::type
 		    addColSet(T &t,dummy<0> = 0) {
 		      int s=0;
 		      for(typename T::iterator i=t.begin();i!=t.end();++i) {*i=addCol();s++;}
 		      return s;
+		    }
 		    template<class T>
 		    typename enable_if<typename T::value_type::second_type::LpCol,
 		                       int>::type
 		    addColSet(T &t,dummy<1> = 1) {
 		      int s=0;
 		      for(typename T::iterator i=t.begin();i!=t.end();++i) {
 		        i->second=addCol();
 		        s++;
+		      }
 		      return s;
+		    }
 		    template<class T>
 		    typename enable_if<typename T::MapIt::Value::LpCol,
 		                       int>::type
 		    addColSet(T &t,dummy<2> = 2) {
 		      int s=0;
 		      for(typename T::MapIt i(t); i!=INVALID; ++i)
+		        {
 		          i.set(addCol());
 		          s++;
+		        }
 		      return s;
+		    }
 		#endif
 		    ///Set a column (i.e a dual constraint) of the LP
 		    ///\param c is the column to be modified
 		    ///\param e is a dual linear expression (see \ref DualExpr)
 		    ///a better one.
 		    void col(Col c, const DualExpr &e) {
 		      e.simplify();
 		      _setColCoeffs(cols(id(c)), ExprIterator(e.comps.begin(), rows),
 		                    ExprIterator(e.comps.end(), rows));
+		    }
 		    ///Get a column (i.e a dual constraint) of the LP
 		    ///\param c is the column to get
 		    ///\return the dual expression associated to the column
 		    DualExpr col(Col c) const {
 		      DualExpr e;
 		      _getColCoeffs(cols(id(c)), InsertIterator(e.comps, rows));
 		      return e;
+		    }
 		    ///Add a new column to the LP
 		    ///\param e is a dual linear expression (see \ref DualExpr)
 		    ///\param o is the corresponding component of the objective
 		    ///function. It is 0 by default.
 		    ///\return The created column.
 		    Col addCol(const DualExpr &e, Value o = 0) {
 		      Col c=addCol();
 		      col(c,e);
 		      objCoeff(c,o);
 		      return c;
+		    }
 		    ///Add a new empty row (i.e a new constraint) to the LP
 		    ///This function adds a new empty row (i.e a new constraint) to the LP.
 		    ///\return The created row
 		    Row addRow() { Row r; r._id = _addRowId(_addRow()); return r;}
 		    ///\brief Add several new rows (i.e constraints) at once
 		    ///
 		    ///This magic function takes a container as its argument and fills
 		    ///its elements with new row (i.e. variables)
 		    ///\param t can be
 		    ///- a standard STL compatible iterable container with
 		    ///\ref Row as its \c values_type like
 		    ///\code
 		    ///std::vector<LpBase::Row>
 		    ///std::list<LpBase::Row>
 		    ///\endcode
 		    ///- a standard STL compatible iterable container with
 		    ///\ref Row as its \c mapped_type like
 		    ///\code
 		    ///std::map<AnyType,LpBase::Row>
 		    ///\endcode
 		    ///- an iterable lemon \ref concepts::WriteMap "write map" like
 		    ///\code
 		    ///ListGraph::NodeMap<LpBase::Row>
 		    ///ListGraph::ArcMap<LpBase::Row>
 		    ///\endcode
 		    ///\return The number of rows created.
 		#ifdef DOXYGEN
 		    template<class T>
 		    int addRowSet(T &t) { return 0;}
 		#else
 		    template<class T>
 		    typename enable_if<typename T::value_type::LpRow,int>::type
 		    addRowSet(T &t, dummy<0> = 0) {
 		      int s=0;
 		      for(typename T::iterator i=t.begin();i!=t.end();++i) {*i=addRow();s++;}
 		      return s;
+		    }
 		    template<class T>
 		    typename enable_if<typename T::value_type::second_type::LpRow, int>::type
 		    addRowSet(T &t, dummy<1> = 1) {
 		      int s=0;
 		      for(typename T::iterator i=t.begin();i!=t.end();++i) {
 		        i->second=addRow();
 		        s++;
+		      }
 		      return s;
+		    }
 		    template<class T>
 		    typename enable_if<typename T::MapIt::Value::LpRow, int>::type
 		    addRowSet(T &t, dummy<2> = 2) {
 		      int s=0;
 		      for(typename T::MapIt i(t); i!=INVALID; ++i)
+		        {
 		          i.set(addRow());
 		          s++;
+		        }
 		      return s;
+		    }
 		#endif
 		    ///Set a row (i.e a constraint) of the LP
 		    ///\param r is the row to be modified
 		    ///\param l is lower bound (-\ref INF means no bound)
 		    ///\param e is a linear expression (see \ref Expr)
 		    ///\param u is the upper bound (\ref INF means no bound)
 		    void row(Row r, Value l, const Expr &e, Value u) {
 		      e.simplify();
 		      _setRowCoeffs(rows(id(r)), ExprIterator(e.comps.begin(), cols),
 		                    ExprIterator(e.comps.end(), cols));
 		      _setRowLowerBound(rows(id(r)),l - *e);
 		      _setRowUpperBound(rows(id(r)),u - *e);
+		    }
 		    ///Set a row (i.e a constraint) of the LP
 		    ///\param r is the row to be modified
 		    ///\param c is a linear expression (see \ref Constr)
 		    void row(Row r, const Constr &c) {
 		      row(r, c.lowerBounded()?c.lowerBound():-INF,
 		          c.expr(), c.upperBounded()?c.upperBound():INF);
+		    }
 		    ///Get a row (i.e a constraint) of the LP
 		    ///\param r is the row to get
 		    ///\return the expression associated to the row
 		    Expr row(Row r) const {
 		      Expr e;
 		      _getRowCoeffs(rows(id(r)), InsertIterator(e.comps, cols));
 		      return e;
+		    }
 		    ///Add a new row (i.e a new constraint) to the LP
 		    ///\param l is the lower bound (-\ref INF means no bound)
 		    ///\param e is a linear expression (see \ref Expr)
 		    ///\param u is the upper bound (\ref INF means no bound)
 		    ///\return The created row.
 		    Row addRow(Value l,const Expr &e, Value u) {
 		      Row r=addRow();
 		      row(r,l,e,u);
 		      return r;
+		    }
 		    ///Add a new row (i.e a new constraint) to the LP
 		    ///\param c is a linear expression (see \ref Constr)
 		    ///\return The created row.
 		    Row addRow(const Constr &c) {
 		      Row r=addRow();
 		      row(r,c);
 		      return r;
+		    }
 		    ///Erase a column (i.e a variable) from the LP
 		    ///\param c is the column to be deleted
 		    void erase(Col c) {
 		      _eraseCol(cols(id(c)));
 		      _eraseColId(cols(id(c)));
+		    }
 		    ///Erase a row (i.e a constraint) from the LP
 		    ///\param r is the row to be deleted
 		    void erase(Row r) {
 		      _eraseRow(rows(id(r)));
 		      _eraseRowId(rows(id(r)));
+		    }
 		    /// Get the name of a column
 		    ///\param c is the coresponding column
 		    ///\return The name of the colunm
 		    std::string colName(Col c) const {
 		      std::string name;
 		      _getColName(cols(id(c)), name);
 		      return name;
+		    }
 		    /// Set the name of a column
 		    ///\param c is the coresponding column
 		    ///\param name The name to be given
 		    void colName(Col c, const std::string& name) {
 		      _setColName(cols(id(c)), name);
+		    }
 		    /// Get the column by its name
 		    ///\param name The name of the column
 		    ///\return the proper column or \c INVALID
 		    Col colByName(const std::string& name) const {
 		      int k = _colByName(name);
 		      return k != -1 ? Col(cols[k]) : Col(INVALID);
+		    }
 		    /// Get the name of a row
 		    ///\param r is the coresponding row
 		    ///\return The name of the row
 		    std::string rowName(Row r) const {
 		      std::string name;
 		      _getRowName(rows(id(r)), name);
 		      return name;
+		    }
 		    /// Set the name of a row
 		    ///\param r is the coresponding row
 		    ///\param name The name to be given
 		    void rowName(Row r, const std::string& name) {
 		      _setRowName(rows(id(r)), name);
+		    }
 		    /// Get the row by its name
 		    ///\param name The name of the row
 		    ///\return the proper row or \c INVALID
 		    Row rowByName(const std::string& name) const {
 		      int k = _rowByName(name);
 		      return k != -1 ? Row(rows[k]) : Row(INVALID);
+		    }
 		    /// Set an element of the coefficient matrix of the LP
 		    ///\param r is the row of the element to be modified
 		    ///\param c is the column of the element to be modified
 		    ///\param val is the new value of the coefficient
 		    void coeff(Row r, Col c, Value val) {
 		      _setCoeff(rows(id(r)),cols(id(c)), val);
+		    }
 		    /// Get an element of the coefficient matrix of the LP
 		    ///\param r is the row of the element
 		    ///\param c is the column of the element
 		    ///\return the corresponding coefficient
 		    Value coeff(Row r, Col c) const {
 		      return _getCoeff(rows(id(r)),cols(id(c)));
+		    }
 		    /// Set the lower bound of a column (i.e a variable)
 		    /// The lower bound of a variable (column) has to be given by an
 		    /// extended number of type Value, i.e. a finite number of type
 		    /// Value or -\ref INF.
 		    void colLowerBound(Col c, Value value) {
 		      _setColLowerBound(cols(id(c)),value);
+		    }
 		    /// Get the lower bound of a column (i.e a variable)
 		    /// This function returns the lower bound for column (variable) \c c
 		    /// (this might be -\ref INF as well).
 		    ///\return The lower bound for column \c c
 		    Value colLowerBound(Col c) const {
 		      return _getColLowerBound(cols(id(c)));
+		    }
 		    ///\brief Set the lower bound of  several columns
 		    ///(i.e variables) at once
 		    ///
 		    ///This magic function takes a container as its argument
 		    ///and applies the function on all of its elements.
 		    ///The lower bound of a variable (column) has to be given by an
 		    ///extended number of type Value, i.e. a finite number of type
 		    ///Value or -\ref INF.
 		#ifdef DOXYGEN
 		    template<class T>
 		    void colLowerBound(T &t, Value value) { return 0;}
 		#else
 		    template<class T>
 		    typename enable_if<typename T::value_type::LpCol,void>::type
 		    colLowerBound(T &t, Value value,dummy<0> = 0) {
 		      for(typename T::iterator i=t.begin();i!=t.end();++i) {
 		        colLowerBound(*i, value);
+		      }
+		    }
 		    template<class T>
 		    typename enable_if<typename T::value_type::second_type::LpCol,
 		                       void>::type
 		    colLowerBound(T &t, Value value,dummy<1> = 1) {
 		      for(typename T::iterator i=t.begin();i!=t.end();++i) {
 		        colLowerBound(i->second, value);
+		      }
+		    }
 		    template<class T>
 		    typename enable_if<typename T::MapIt::Value::LpCol,
 		                       void>::type
 		    colLowerBound(T &t, Value value,dummy<2> = 2) {
 		      for(typename T::MapIt i(t); i!=INVALID; ++i){
 		        colLowerBound(*i, value);
+		      }
+		    }
 		#endif
 		    /// Set the upper bound of a column (i.e a variable)
 		    /// The upper bound of a variable (column) has to be given by an
 		    /// extended number of type Value, i.e. a finite number of type
 		    /// Value or \ref INF.
 		    void colUpperBound(Col c, Value value) {
 		      _setColUpperBound(cols(id(c)),value);
 		    };
 		    /// Get the upper bound of a column (i.e a variable)
 		    /// This function returns the upper bound for column (variable) \c c
 		    /// (this might be \ref INF as well).
 		    /// \return The upper bound for column \c c
 		    Value colUpperBound(Col c) const {
 		      return _getColUpperBound(cols(id(c)));
+		    }
 		    ///\brief Set the upper bound of  several columns
 		    ///(i.e variables) at once
 		    ///
 		    ///This magic function takes a container as its argument
 		    ///and applies the function on all of its elements.
 		    ///The upper bound of a variable (column) has to be given by an
 		    ///extended number of type Value, i.e. a finite number of type
 		    ///Value or \ref INF.
 		#ifdef DOXYGEN
 		    template<class T>
 		    void colUpperBound(T &t, Value value) { return 0;}
 		#else
 		    template<class T1>
 		    typename enable_if<typename T1::value_type::LpCol,void>::type
 		    colUpperBound(T1 &t, Value value,dummy<0> = 0) {
 		      for(typename T1::iterator i=t.begin();i!=t.end();++i) {
 		        colUpperBound(*i, value);
+		      }
+		    }
 		    template<class T1>
 		    typename enable_if<typename T1::value_type::second_type::LpCol,
 		                       void>::type
 		    colUpperBound(T1 &t, Value value,dummy<1> = 1) {
 		      for(typename T1::iterator i=t.begin();i!=t.end();++i) {
 		        colUpperBound(i->second, value);
+		      }
+		    }
 		    template<class T1>
 		    typename enable_if<typename T1::MapIt::Value::LpCol,
 		                       void>::type
 		    colUpperBound(T1 &t, Value value,dummy<2> = 2) {
 		      for(typename T1::MapIt i(t); i!=INVALID; ++i){
 		        colUpperBound(*i, value);
+		      }
+		    }
 		#endif
 		    /// Set the lower and the upper bounds of a column (i.e a variable)
 		    /// The lower and the upper bounds of
 		    /// a variable (column) have to be given by an
 		    /// extended number of type Value, i.e. a finite number of type
 		    /// Value, -\ref INF or \ref INF.
 		    void colBounds(Col c, Value lower, Value upper) {
 		      _setColLowerBound(cols(id(c)),lower);
 		      _setColUpperBound(cols(id(c)),upper);
+		    }
 		    ///\brief Set the lower and the upper bound of several columns
 		    ///(i.e variables) at once
 		    ///
 		    ///This magic function takes a container as its argument
 		    ///and applies the function on all of its elements.
 		    /// The lower and the upper bounds of
 		    /// a variable (column) have to be given by an
 		    /// extended number of type Value, i.e. a finite number of type
 		    /// Value, -\ref INF or \ref INF.
 		#ifdef DOXYGEN
 		    template<class T>
 		    void colBounds(T &t, Value lower, Value upper) { return 0;}
 		#else
 		    template<class T2>
 		    typename enable_if<typename T2::value_type::LpCol,void>::type
 		    colBounds(T2 &t, Value lower, Value upper,dummy<0> = 0) {
 		      for(typename T2::iterator i=t.begin();i!=t.end();++i) {
 		        colBounds(*i, lower, upper);
+		      }
+		    }
 		    template<class T2>
 		    typename enable_if<typename T2::value_type::second_type::LpCol, void>::type
 		    colBounds(T2 &t, Value lower, Value upper,dummy<1> = 1) {
 		      for(typename T2::iterator i=t.begin();i!=t.end();++i) {
 		        colBounds(i->second, lower, upper);
+		      }
+		    }
 		    template<class T2>
 		    typename enable_if<typename T2::MapIt::Value::LpCol, void>::type
 		    colBounds(T2 &t, Value lower, Value upper,dummy<2> = 2) {
 		      for(typename T2::MapIt i(t); i!=INVALID; ++i){
 		        colBounds(*i, lower, upper);
+		      }
+		    }
 		#endif
 		    /// Set the lower bound of a row (i.e a constraint)
 		    /// The lower bound of a constraint (row) has to be given by an
 		    /// extended number of type Value, i.e. a finite number of type
 		    /// Value or -\ref INF.
 		    void rowLowerBound(Row r, Value value) {
 		      _setRowLowerBound(rows(id(r)),value);
+		    }
 		    /// Get the lower bound of a row (i.e a constraint)
 		    /// This function returns the lower bound for row (constraint) \c c
 		    /// (this might be -\ref INF as well).
 		    ///\return The lower bound for row \c r
 		    Value rowLowerBound(Row r) const {
 		      return _getRowLowerBound(rows(id(r)));
+		    }
 		    /// Set the upper bound of a row (i.e a constraint)
 		    /// The upper bound of a constraint (row) has to be given by an
 		    /// extended number of type Value, i.e. a finite number of type
 		    /// Value or -\ref INF.
 		    void rowUpperBound(Row r, Value value) {
 		      _setRowUpperBound(rows(id(r)),value);
+		    }
 		    /// Get the upper bound of a row (i.e a constraint)
 		    /// This function returns the upper bound for row (constraint) \c c
 		    /// (this might be -\ref INF as well).
 		    ///\return The upper bound for row \c r
 		    Value rowUpperBound(Row r) const {
 		      return _getRowUpperBound(rows(id(r)));
+		    }
 		    ///Set an element of the objective function
 		    void objCoeff(Col c, Value v) {_setObjCoeff(cols(id(c)),v); };
 		    ///Get an element of the objective function
 		    Value objCoeff(Col c) const { return _getObjCoeff(cols(id(c))); };
 		    ///Set the objective function
 		    ///\param e is a linear expression of type \ref Expr.
 		    ///
 		    void obj(const Expr& e) {
 		      _setObjCoeffs(ExprIterator(e.comps.begin(), cols),
 		                    ExprIterator(e.comps.end(), cols));
 		      obj_const_comp = *e;
+		    }
 		    ///Get the objective function
 		    ///\return the objective function as a linear expression of type
 		    ///Expr.
 		    Expr obj() const {
 		      Expr e;
 		      _getObjCoeffs(InsertIterator(e.comps, cols));
 		      *e = obj_const_comp;
 		      return e;
+		    }
 		    ///Set the direction of optimization
 		    void sense(Sense sense) { _setSense(sense); }
 		    ///Query the direction of the optimization
 		    Sense sense() const {return _getSense(); }
 		    ///Set the sense to maximization
 		    void max() { _setSense(MAX); }
 		    ///Set the sense to maximization
 		    void min() { _setSense(MIN); }
 		    ///Clears the problem
 		    void clear() { _clear(); }
 		    /// Sets the message level of the solver
 		    void messageLevel(MessageLevel level) { _messageLevel(level); }
 		    ///@}
 		  };
 		  /// Addition
 		  ///\relates LpBase::Expr
 		  ///
 		  inline LpBase::Expr operator+(const LpBase::Expr &a, const LpBase::Expr &b) {
 		    LpBase::Expr tmp(a);
 		    tmp+=b;
 		    return tmp;
+		  }
 		  ///Substraction
 		  ///\relates LpBase::Expr
 		  ///
 		  inline LpBase::Expr operator-(const LpBase::Expr &a, const LpBase::Expr &b) {
 		    LpBase::Expr tmp(a);
 		    tmp-=b;
 		    return tmp;
+		  }
 		  ///Multiply with constant
 		  ///\relates LpBase::Expr
 		  ///
 		  inline LpBase::Expr operator*(const LpBase::Expr &a, const LpBase::Value &b) {
 		    LpBase::Expr tmp(a);
 		    tmp*=b;
 		    return tmp;
+		  }
 		  ///Multiply with constant
 		  ///\relates LpBase::Expr
 		  ///
 		  inline LpBase::Expr operator*(const LpBase::Value &a, const LpBase::Expr &b) {
 		    LpBase::Expr tmp(b);
 		    tmp*=a;
 		    return tmp;
+		  }
 		  ///Divide with constant
 		  ///\relates LpBase::Expr
 		  ///
 		  inline LpBase::Expr operator/(const LpBase::Expr &a, const LpBase::Value &b) {
 		    LpBase::Expr tmp(a);
 		    tmp/=b;
 		    return tmp;
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator<=(const LpBase::Expr &e,
 		                                   const LpBase::Expr &f) {
 		    return LpBase::Constr(0, f - e, LpBase::INF);
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator<=(const LpBase::Value &e,
 		                                   const LpBase::Expr &f) {
 		    return LpBase::Constr(e, f, LpBase::NaN);
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator<=(const LpBase::Expr &e,
 		                                   const LpBase::Value &f) {
 		    return LpBase::Constr(- LpBase::INF, e, f);
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator>=(const LpBase::Expr &e,
 		                                   const LpBase::Expr &f) {
 		    return LpBase::Constr(0, e - f, LpBase::INF);
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator>=(const LpBase::Value &e,
 		                                   const LpBase::Expr &f) {
 		    return LpBase::Constr(LpBase::NaN, f, e);
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator>=(const LpBase::Expr &e,
 		                                   const LpBase::Value &f) {
 		    return LpBase::Constr(f, e, LpBase::INF);
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator==(const LpBase::Expr &e,
 		                                   const LpBase::Value &f) {
 		    return LpBase::Constr(f, e, f);
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator==(const LpBase::Expr &e,
 		                                   const LpBase::Expr &f) {
 		    return LpBase::Constr(0, f - e, 0);
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator<=(const LpBase::Value &n,
 		                                   const LpBase::Constr &c) {
 		    LpBase::Constr tmp(c);
 		    LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint");
 		    tmp.lowerBound()=n;
 		    return tmp;
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator<=(const LpBase::Constr &c,
 		                                   const LpBase::Value &n)
+		  {
 		    LpBase::Constr tmp(c);
 		    LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint");
 		    tmp.upperBound()=n;
 		    return tmp;
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator>=(const LpBase::Value &n,
 		                                   const LpBase::Constr &c) {
 		    LpBase::Constr tmp(c);
 		    LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint");
 		    tmp.upperBound()=n;
 		    return tmp;
+		  }
 		  ///Create constraint
 		  ///\relates LpBase::Constr
 		  ///
 		  inline LpBase::Constr operator>=(const LpBase::Constr &c,
 		                                   const LpBase::Value &n)
+		  {
 		    LpBase::Constr tmp(c);
 		    LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint");
 		    tmp.lowerBound()=n;
 		    return tmp;
+		  }
 		  ///Addition
 		  ///\relates LpBase::DualExpr
 		  ///
 		  inline LpBase::DualExpr operator+(const LpBase::DualExpr &a,
 		                                    const LpBase::DualExpr &b) {
 		    LpBase::DualExpr tmp(a);
 		    tmp+=b;
 		    return tmp;
+		  }
 		  ///Substraction
 		  ///\relates LpBase::DualExpr
 		  ///
 		  inline LpBase::DualExpr operator-(const LpBase::DualExpr &a,
 		                                    const LpBase::DualExpr &b) {
 		    LpBase::DualExpr tmp(a);
 		    tmp-=b;
 		    return tmp;
+		  }
 		  ///Multiply with constant
 		  ///\relates LpBase::DualExpr
 		  ///
 		  inline LpBase::DualExpr operator*(const LpBase::DualExpr &a,
 		                                    const LpBase::Value &b) {
 		    LpBase::DualExpr tmp(a);
 		    tmp*=b;
 		    return tmp;
+		  }
 		  ///Multiply with constant
 		  ///\relates LpBase::DualExpr
 		  ///
 		  inline LpBase::DualExpr operator*(const LpBase::Value &a,
 		                                    const LpBase::DualExpr &b) {
 		    LpBase::DualExpr tmp(b);
 		    tmp*=a;
 		    return tmp;
+		  }
 		  ///Divide with constant
 		  ///\relates LpBase::DualExpr
 		  ///
 		  inline LpBase::DualExpr operator/(const LpBase::DualExpr &a,
 		                                    const LpBase::Value &b) {
 		    LpBase::DualExpr tmp(a);
 		    tmp/=b;
 		    return tmp;
+		  }
 		  /// \ingroup lp_group
 		  ///
 		  /// \brief Common base class for LP solvers
 		  ///
 		  /// This class is an abstract base class for LP solvers. This class
 		  /// provides a full interface for set and modify an LP problem,
 		  /// solve it and retrieve the solution. You can use one of the
 		  /// descendants as a concrete implementation, or the \c Lp
 		  /// default LP solver. However, if you would like to handle LP
 		  /// solvers as reference or pointer in a generic way, you can use
 		  /// this class directly.
 		  class LpSolver : virtual public LpBase {
 		  public:
 		    /// The problem types for primal and dual problems
 		    enum ProblemType {
 		      ///Feasible solution hasn't been found (but may exist).
+		      /// = 0. Feasible solution hasn't been found (but may exist).
 		      UNDEFINED = 0,
 		      ///The problem has no feasible solution
+		      /// = 1. The problem has no feasible solution.
 		      INFEASIBLE = 1,
 		      ///Feasible solution found
+		      /// = 2. Feasible solution found.
 		      FEASIBLE = 2,
 		      ///Optimal solution exists and found
+		      /// = 3. Optimal solution exists and found.
 		      OPTIMAL = 3,
 		      ///The cost function is unbounded
+		      /// = 4. The cost function is unbounded.
 		      UNBOUNDED = 4
 		    };
 		    ///The basis status of variables
 		    enum VarStatus {
 		      /// The variable is in the basis
 		      BASIC,
 		      /// The variable is free, but not basic
 		      FREE,
 		      /// The variable has active lower bound
 		      LOWER,
 		      /// The variable has active upper bound
 		      UPPER,
 		      /// The variable is non-basic and fixed
 		      FIXED
 		    };
 		  protected:
 		    virtual SolveExitStatus _solve() = 0;
 		    virtual Value _getPrimal(int i) const = 0;
 		    virtual Value _getDual(int i) const = 0;
 		    virtual Value _getPrimalRay(int i) const = 0;
 		    virtual Value _getDualRay(int i) const = 0;
 		    virtual Value _getPrimalValue() const = 0;
 		    virtual VarStatus _getColStatus(int i) const = 0;
 		    virtual VarStatus _getRowStatus(int i) const = 0;
 		    virtual ProblemType _getPrimalType() const = 0;
 		    virtual ProblemType _getDualType() const = 0;
 		  public:
 		    ///Allocate a new LP problem instance
 		    virtual LpSolver* newSolver() const = 0;
 		    ///Make a copy of the LP problem
 		    virtual LpSolver* cloneSolver() const = 0;
 		    ///\name Solve the LP
 		    ///@{
 		    ///\e Solve the LP problem at hand
 		    ///
 		    ///\return The result of the optimization procedure. Possible
 		    ///values and their meanings can be found in the documentation of
 		    ///\ref SolveExitStatus.
 		    SolveExitStatus solve() { return _solve(); }
 		    ///@}
-		    ///\name Obtain the solution
+		    ///\name Obtain the Solution
 		    ///@{
 		    /// The type of the primal problem
 		    ProblemType primalType() const {
 		      return _getPrimalType();
+		    }
 		    /// The type of the dual problem
 		    ProblemType dualType() const {
 		      return _getDualType();
+		    }
 		    /// Return the primal value of the column
 		    /// Return the primal value of the column.
 		    /// \pre The problem is solved.
 		    Value primal(Col c) const { return _getPrimal(cols(id(c))); }
 		    /// Return the primal value of the expression
 		    /// Return the primal value of the expression, i.e. the dot
 		    /// product of the primal solution and the expression.
 		    /// \pre The problem is solved.
 		    Value primal(const Expr& e) const {
 		      double res = *e;
 		      for (Expr::ConstCoeffIt c(e); c != INVALID; ++c) {
 		        res += *c * primal(c);
+		      }
 		      return res;
+		    }
 		    /// Returns a component of the primal ray
 		    /// The primal ray is solution of the modified primal problem,
 		    /// where we change each finite bound to 0, and we looking for a
 		    /// negative objective value in case of minimization, and positive
 		    /// objective value for maximization. If there is such solution,
 		    /// that proofs the unsolvability of the dual problem, and if a
 		    /// feasible primal solution exists, then the unboundness of
 		    /// primal problem.
 		    ///
 		    /// \pre The problem is solved and the dual problem is infeasible.
 		    /// \note Some solvers does not provide primal ray calculation
 		    /// functions.
 		    Value primalRay(Col c) const { return _getPrimalRay(cols(id(c))); }
 		    /// Return the dual value of the row
 		    /// Return the dual value of the row.
 		    /// \pre The problem is solved.
 		    Value dual(Row r) const { return _getDual(rows(id(r))); }
 		    /// Return the dual value of the dual expression
 		    /// Return the dual value of the dual expression, i.e. the dot
 		    /// product of the dual solution and the dual expression.
 		    /// \pre The problem is solved.
 		    Value dual(const DualExpr& e) const {
 		      double res = 0.0;
 		      for (DualExpr::ConstCoeffIt r(e); r != INVALID; ++r) {
 		        res += *r * dual(r);
+		      }
 		      return res;
+		    }
 		    /// Returns a component of the dual ray
 		    /// The dual ray is solution of the modified primal problem, where
 		    /// we change each finite bound to 0 (i.e. the objective function
 		    /// coefficients in the primal problem), and we looking for a
 		    /// ositive objective value. If there is such solution, that
 		    /// proofs the unsolvability of the primal problem, and if a
 		    /// feasible dual solution exists, then the unboundness of
 		    /// dual problem.
 		    ///
 		    /// \pre The problem is solved and the primal problem is infeasible.
 		    /// \note Some solvers does not provide dual ray calculation
 		    /// functions.
 		    Value dualRay(Row r) const { return _getDualRay(rows(id(r))); }
 		    /// Return the basis status of the column
 		    /// \see VarStatus
 		    VarStatus colStatus(Col c) const { return _getColStatus(cols(id(c))); }
 		    /// Return the basis status of the row
 		    /// \see VarStatus
 		    VarStatus rowStatus(Row r) const { return _getRowStatus(rows(id(r))); }
 		    ///The value of the objective function
 		    ///\return
 		    ///- \ref INF or -\ref INF means either infeasibility or unboundedness
 		    /// of the primal problem, depending on whether we minimize or maximize.
 		    ///- \ref NaN if no primal solution is found.
 		    ///- The (finite) objective value if an optimal solution is found.
 		    Value primal() const { return _getPrimalValue()+obj_const_comp;}
 		    ///@}
 		  protected:
 		  };
 		  /// \ingroup lp_group
 		  ///
 		  /// \brief Common base class for MIP solvers
 		  ///
 		  /// This class is an abstract base class for MIP solvers. This class
 		  /// provides a full interface for set and modify an MIP problem,
 		  /// solve it and retrieve the solution. You can use one of the
 		  /// descendants as a concrete implementation, or the \c Lp
 		  /// default MIP solver. However, if you would like to handle MIP
 		  /// solvers as reference or pointer in a generic way, you can use
 		  /// this class directly.
 		  class MipSolver : virtual public LpBase {
 		  public:
 		    /// The problem types for MIP problems
 		    enum ProblemType {
 		      ///Feasible solution hasn't been found (but may exist).
+		      /// = 0. Feasible solution hasn't been found (but may exist).
 		      UNDEFINED = 0,
 		      ///The problem has no feasible solution
+		      /// = 1. The problem has no feasible solution.
 		      INFEASIBLE = 1,
 		      ///Feasible solution found
+		      /// = 2. Feasible solution found.
 		      FEASIBLE = 2,
 		      ///Optimal solution exists and found
+		      /// = 3. Optimal solution exists and found.
 		      OPTIMAL = 3,
 		      ///The cost function is unbounded
 		      ///
-		      ///The Mip or at least the relaxed problem is unbounded
+		      /// = 4. The cost function is unbounded.
 		      ///The Mip or at least the relaxed problem is unbounded.
 		      UNBOUNDED = 4
 		    };
 		    ///Allocate a new MIP problem instance
 		    virtual MipSolver* newSolver() const = 0;
 		    ///Make a copy of the MIP problem
 		    virtual MipSolver* cloneSolver() const = 0;
 		    ///\name Solve the MIP
 		    ///@{
 		    /// Solve the MIP problem at hand
 		    ///
 		    ///\return The result of the optimization procedure. Possible
 		    ///values and their meanings can be found in the documentation of
 		    ///\ref SolveExitStatus.
 		    SolveExitStatus solve() { return _solve(); }
 		    ///@}
-		    ///\name Setting column type
+		    ///\name Set Column Type
 		    ///@{
 		    ///Possible variable (column) types (e.g. real, integer, binary etc.)
 		    enum ColTypes {
 		      ///Continuous variable (default)
+		      /// = 0. Continuous variable (default).
 		      REAL = 0,
 		      ///Integer variable
+		      /// = 1. Integer variable.
 		      INTEGER = 1
 		    };
 		    ///Sets the type of the given column to the given type
 		    ///Sets the type of the given column to the given type.
 		    ///
 		    void colType(Col c, ColTypes col_type) {
 		      _setColType(cols(id(c)),col_type);
+		    }
 		    ///Gives back the type of the column.
 		    ///Gives back the type of the column.
 		    ///
 		    ColTypes colType(Col c) const {
 		      return _getColType(cols(id(c)));
+		    }
 		    ///@}
-		    ///\name Obtain the solution
+		    ///\name Obtain the Solution
 		    ///@{
 		    /// The type of the MIP problem
 		    ProblemType type() const {
 		      return _getType();
+		    }
 		    /// Return the value of the row in the solution
 		    ///  Return the value of the row in the solution.
 		    /// \pre The problem is solved.
 		    Value sol(Col c) const { return _getSol(cols(id(c))); }
 		    /// Return the value of the expression in the solution
 		    /// Return the value of the expression in the solution, i.e. the
 		    /// dot product of the solution and the expression.
 		    /// \pre The problem is solved.
 		    Value sol(const Expr& e) const {
 		      double res = *e;
 		      for (Expr::ConstCoeffIt c(e); c != INVALID; ++c) {
 		        res += *c * sol(c);
+		      }
 		      return res;
+		    }
 		    ///The value of the objective function
 		    ///\return
 		    ///- \ref INF or -\ref INF means either infeasibility or unboundedness
 		    /// of the problem, depending on whether we minimize or maximize.
 		    ///- \ref NaN if no primal solution is found.
 		    ///- The (finite) objective value if an optimal solution is found.
 		    Value solValue() const { return _getSolValue()+obj_const_comp;}
 		    ///@}
 		  protected:
 		    virtual SolveExitStatus _solve() = 0;
 		    virtual ColTypes _getColType(int col) const = 0;
 		    virtual void _setColType(int col, ColTypes col_type) = 0;
 		    virtual ProblemType _getType() const = 0;
 		    virtual Value _getSol(int i) const = 0;
 		    virtual Value _getSolValue() const = 0;
 		  };
 		} //namespace lemon
 		#endif //LEMON_LP_BASE_H

lemon/maps.h

Show inline comments

@@ -2219,564 +2219,564 @@
 		    /// \c AlterationNotifier.
 		    virtual void clear() {
 		      _inv_map.clear();
 		      Map::clear();
+		    }
 		  public:
 		    /// \brief Returns the maximal value plus one.
 		    ///
 		    /// Returns the maximal value plus one in the map.
 		    unsigned int size() const {
 		      return _inv_map.size();
+		    }
 		    /// \brief Swaps the position of the two items in the map.
 		    ///
 		    /// Swaps the position of the two items in the map.
 		    void swap(const Item& p, const Item& q) {
 		      int pi = Map::operator[](p);
 		      int qi = Map::operator[](q);
 		      Map::set(p, qi);
 		      _inv_map[qi] = p;
 		      Map::set(q, pi);
 		      _inv_map[pi] = q;
+		    }
 		    /// \brief Gives back the \e RangeId of the item
 		    ///
 		    /// Gives back the \e RangeId of the item.
 		    int operator[](const Item& item) const {
 		      return Map::operator[](item);
+		    }
 		    /// \brief Gives back the item belonging to a \e RangeId
 		    ///
 		    /// Gives back the item belonging to a \e RangeId.
 		    Item operator()(int id) const {
 		      return _inv_map[id];
+		    }
 		  private:
 		    typedef std::vector<Item> Container;
 		    Container _inv_map;
 		  public:
 		    /// \brief The inverse map type of RangeIdMap.
 		    ///
 		    /// The inverse map type of RangeIdMap.
 		    class InverseMap {
 		    public:
 		      /// \brief Constructor
 		      ///
 		      /// Constructor of the InverseMap.
 		      explicit InverseMap(const RangeIdMap& inverted)
 		        : _inverted(inverted) {}
 		      /// The value type of the InverseMap.
 		      typedef typename RangeIdMap::Key Value;
 		      /// The key type of the InverseMap.
 		      typedef typename RangeIdMap::Value Key;
 		      /// \brief Subscript operator.
 		      ///
 		      /// Subscript operator. It gives back the item
 		      /// that the descriptor currently belongs to.
 		      Value operator[](const Key& key) const {
 		        return _inverted(key);
+		      }
 		      /// \brief Size of the map.
 		      ///
 		      /// Returns the size of the map.
 		      unsigned int size() const {
 		        return _inverted.size();
+		      }
 		    private:
 		      const RangeIdMap& _inverted;
 		    };
 		    /// \brief Gives back the inverse of the map.
 		    ///
 		    /// Gives back the inverse of the map.
 		    const InverseMap inverse() const {
 		      return InverseMap(*this);
+		    }
 		  };
 		  /// \brief Map of the source nodes of arcs in a digraph.
 		  ///
 		  /// SourceMap provides access for the source node of each arc in a digraph,
 		  /// which is returned by the \c source() function of the digraph.
 		  /// \tparam GR The digraph type.
 		  /// \see TargetMap
 		  template <typename GR>
 		  class SourceMap {
 		  public:
 		    ///\e
 		    typedef typename GR::Arc Key;
 		    ///\e
 		    typedef typename GR::Node Value;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor.
 		    /// \param digraph The digraph that the map belongs to.
 		    explicit SourceMap(const GR& digraph) : _graph(digraph) {}
 		    /// \brief Returns the source node of the given arc.
 		    ///
 		    /// Returns the source node of the given arc.
 		    Value operator[](const Key& arc) const {
 		      return _graph.source(arc);
+		    }
 		  private:
 		    const GR& _graph;
 		  };
 		  /// \brief Returns a \c SourceMap class.
 		  ///
 		  /// This function just returns an \c SourceMap class.
 		  /// \relates SourceMap
 		  template <typename GR>
 		  inline SourceMap<GR> sourceMap(const GR& graph) {
 		    return SourceMap<GR>(graph);
+		  }
 		  /// \brief Map of the target nodes of arcs in a digraph.
 		  ///
 		  /// TargetMap provides access for the target node of each arc in a digraph,
 		  /// which is returned by the \c target() function of the digraph.
 		  /// \tparam GR The digraph type.
 		  /// \see SourceMap
 		  template <typename GR>
 		  class TargetMap {
 		  public:
 		    ///\e
 		    typedef typename GR::Arc Key;
 		    ///\e
 		    typedef typename GR::Node Value;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor.
 		    /// \param digraph The digraph that the map belongs to.
 		    explicit TargetMap(const GR& digraph) : _graph(digraph) {}
 		    /// \brief Returns the target node of the given arc.
 		    ///
 		    /// Returns the target node of the given arc.
 		    Value operator[](const Key& e) const {
 		      return _graph.target(e);
+		    }
 		  private:
 		    const GR& _graph;
 		  };
 		  /// \brief Returns a \c TargetMap class.
 		  ///
 		  /// This function just returns a \c TargetMap class.
 		  /// \relates TargetMap
 		  template <typename GR>
 		  inline TargetMap<GR> targetMap(const GR& graph) {
 		    return TargetMap<GR>(graph);
+		  }
 		  /// \brief Map of the "forward" directed arc view of edges in a graph.
 		  ///
 		  /// ForwardMap provides access for the "forward" directed arc view of
 		  /// each edge in a graph, which is returned by the \c direct() function
 		  /// of the graph with \c true parameter.
 		  /// \tparam GR The graph type.
 		  /// \see BackwardMap
 		  template <typename GR>
 		  class ForwardMap {
 		  public:
 		    typedef typename GR::Arc Value;
 		    typedef typename GR::Edge Key;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor.
 		    /// \param graph The graph that the map belongs to.
 		    explicit ForwardMap(const GR& graph) : _graph(graph) {}
 		    /// \brief Returns the "forward" directed arc view of the given edge.
 		    ///
 		    /// Returns the "forward" directed arc view of the given edge.
 		    Value operator[](const Key& key) const {
 		      return _graph.direct(key, true);
+		    }
 		  private:
 		    const GR& _graph;
 		  };
 		  /// \brief Returns a \c ForwardMap class.
 		  ///
 		  /// This function just returns an \c ForwardMap class.
 		  /// \relates ForwardMap
 		  template <typename GR>
 		  inline ForwardMap<GR> forwardMap(const GR& graph) {
 		    return ForwardMap<GR>(graph);
+		  }
 		  /// \brief Map of the "backward" directed arc view of edges in a graph.
 		  ///
 		  /// BackwardMap provides access for the "backward" directed arc view of
 		  /// each edge in a graph, which is returned by the \c direct() function
 		  /// of the graph with \c false parameter.
 		  /// \tparam GR The graph type.
 		  /// \see ForwardMap
 		  template <typename GR>
 		  class BackwardMap {
 		  public:
 		    typedef typename GR::Arc Value;
 		    typedef typename GR::Edge Key;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor.
 		    /// \param graph The graph that the map belongs to.
 		    explicit BackwardMap(const GR& graph) : _graph(graph) {}
 		    /// \brief Returns the "backward" directed arc view of the given edge.
 		    ///
 		    /// Returns the "backward" directed arc view of the given edge.
 		    Value operator[](const Key& key) const {
 		      return _graph.direct(key, false);
+		    }
 		  private:
 		    const GR& _graph;
 		  };
 		  /// \brief Returns a \c BackwardMap class
 		  /// This function just returns a \c BackwardMap class.
 		  /// \relates BackwardMap
 		  template <typename GR>
 		  inline BackwardMap<GR> backwardMap(const GR& graph) {
 		    return BackwardMap<GR>(graph);
+		  }
 		  /// \brief Map of the in-degrees of nodes in a digraph.
 		  ///
 		  /// This map returns the in-degree of a node. Once it is constructed,
 		  /// the degrees are stored in a standard \c NodeMap, so each query is done
 		  /// in constant time. On the other hand, the values are updated automatically
 		  /// whenever the digraph changes.
 		  ///
 		  /// \warning Besides \c addNode() and \c addArc(), a digraph structure
 		  /// may provide alternative ways to modify the digraph.
 		  /// The correct behavior of InDegMap is not guarantied if these additional
 		  /// features are used. For example the functions
 		  /// \ref ListDigraph::changeSource() "changeSource()",
 		  /// \ref ListDigraph::changeTarget() "changeTarget()" and
 		  /// \ref ListDigraph::reverseArc() "reverseArc()"
 		  /// of \ref ListDigraph will \e not update the degree values correctly.
 		  ///
 		  /// \sa OutDegMap
 		  template <typename GR>
 		  class InDegMap
 		    : protected ItemSetTraits<GR, typename GR::Arc>
 		      ::ItemNotifier::ObserverBase {
 		  public:
 		    /// The digraph type
 		    typedef GR Digraph;
 		    /// The key type
 		    typedef typename Digraph::Node Key;
 		    /// The value type
 		    typedef int Value;
 		    typedef typename ItemSetTraits<Digraph, typename Digraph::Arc>
 		    ::ItemNotifier::ObserverBase Parent;
 		  private:
 		    class AutoNodeMap
 		      : public ItemSetTraits<Digraph, Key>::template Map<int>::Type {
 		    public:
 		      typedef typename ItemSetTraits<Digraph, Key>::
 		      template Map<int>::Type Parent;
 		      AutoNodeMap(const Digraph& digraph) : Parent(digraph, 0) {}
 		      virtual void add(const Key& key) {
 		        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);
+		        }
+		      }
 		      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);
+		        }
+		      }
 		    };
 		  public:
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor for creating an in-degree map.
 		    explicit InDegMap(const Digraph& graph)
 		      : _digraph(graph), _deg(graph) {
 		      Parent::attach(_digraph.notifier(typename Digraph::Arc()));
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = countInArcs(_digraph, it);
+		      }
+		    }
 		    /// \brief Gives back the in-degree of a Node.
 		    ///
 		    /// Gives back the in-degree of a Node.
 		    int operator[](const Key& key) const {
 		      return _deg[key];
+		    }
 		  protected:
 		    typedef typename Digraph::Arc Arc;
 		    virtual void add(const Arc& arc) {
 		      ++_deg[_digraph.target(arc)];
+		    }
 		    virtual void add(const std::vector<Arc>& arcs) {
 		      for (int i = 0; i < int(arcs.size()); ++i) {
 		        ++_deg[_digraph.target(arcs[i])];
+		      }
+		    }
 		    virtual void erase(const Arc& arc) {
 		      --_deg[_digraph.target(arc)];
+		    }
 		    virtual void erase(const std::vector<Arc>& arcs) {
 		      for (int i = 0; i < int(arcs.size()); ++i) {
 		        --_deg[_digraph.target(arcs[i])];
+		      }
+		    }
 		    virtual void build() {
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = countInArcs(_digraph, it);
+		      }
+		    }
 		    virtual void clear() {
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = 0;
+		      }
+		    }
 		  private:
 		    const Digraph& _digraph;
 		    AutoNodeMap _deg;
 		  };
 		  /// \brief Map of the out-degrees of nodes in a digraph.
 		  ///
 		  /// This map returns the out-degree of a node. Once it is constructed,
 		  /// the degrees are stored in a standard \c NodeMap, so each query is done
 		  /// in constant time. On the other hand, the values are updated automatically
 		  /// whenever the digraph changes.
 		  ///
 		  /// \warning Besides \c addNode() and \c addArc(), a digraph structure
 		  /// may provide alternative ways to modify the digraph.
 		  /// The correct behavior of OutDegMap is not guarantied if these additional
 		  /// features are used. For example the functions
 		  /// \ref ListDigraph::changeSource() "changeSource()",
 		  /// \ref ListDigraph::changeTarget() "changeTarget()" and
 		  /// \ref ListDigraph::reverseArc() "reverseArc()"
 		  /// of \ref ListDigraph will \e not update the degree values correctly.
 		  ///
 		  /// \sa InDegMap
 		  template <typename GR>
 		  class OutDegMap
 		    : protected ItemSetTraits<GR, typename GR::Arc>
 		      ::ItemNotifier::ObserverBase {
 		  public:
 		    /// The digraph type
 		    typedef GR Digraph;
 		    /// The key type
 		    typedef typename Digraph::Node Key;
 		    /// The value type
 		    typedef int Value;
 		    typedef typename ItemSetTraits<Digraph, typename Digraph::Arc>
 		    ::ItemNotifier::ObserverBase Parent;
 		  private:
 		    class AutoNodeMap
 		      : public ItemSetTraits<Digraph, Key>::template Map<int>::Type {
 		    public:
 		      typedef typename ItemSetTraits<Digraph, Key>::
 		      template Map<int>::Type Parent;
 		      AutoNodeMap(const Digraph& digraph) : Parent(digraph, 0) {}
 		      virtual void add(const Key& key) {
 		        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);
+		        }
+		      }
 		      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);
+		        }
+		      }
 		    };
 		  public:
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor for creating an out-degree map.
 		    explicit OutDegMap(const Digraph& graph)
 		      : _digraph(graph), _deg(graph) {
 		      Parent::attach(_digraph.notifier(typename Digraph::Arc()));
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = countOutArcs(_digraph, it);
+		      }
+		    }
 		    /// \brief Gives back the out-degree of a Node.
 		    ///
 		    /// Gives back the out-degree of a Node.
 		    int operator[](const Key& key) const {
 		      return _deg[key];
+		    }
 		  protected:
 		    typedef typename Digraph::Arc Arc;
 		    virtual void add(const Arc& arc) {
 		      ++_deg[_digraph.source(arc)];
+		    }
 		    virtual void add(const std::vector<Arc>& arcs) {
 		      for (int i = 0; i < int(arcs.size()); ++i) {
 		        ++_deg[_digraph.source(arcs[i])];
+		      }
+		    }
 		    virtual void erase(const Arc& arc) {
 		      --_deg[_digraph.source(arc)];
+		    }
 		    virtual void erase(const std::vector<Arc>& arcs) {
 		      for (int i = 0; i < int(arcs.size()); ++i) {
 		        --_deg[_digraph.source(arcs[i])];
+		      }
+		    }
 		    virtual void build() {
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = countOutArcs(_digraph, it);
+		      }
+		    }
 		    virtual void clear() {
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = 0;
+		      }
+		    }
 		  private:
 		    const Digraph& _digraph;
 		    AutoNodeMap _deg;
 		  };
 		  /// \brief Potential difference map
 		  ///
 		  /// PotentialMap returns the difference between the potentials of the
 		  /// source and target nodes of each arc in a digraph, i.e. it returns
 		  /// PotentialDifferenceMap returns the difference between the potentials of
 		  /// the source and target nodes of each arc in a digraph, i.e. it returns
 		  /// \code
 		  ///   potential[gr.target(arc)] - potential[gr.source(arc)].
 		  /// \endcode
 		  /// \tparam GR The digraph type.
 		  /// \tparam POT A node map storing the potentials.
 		  template <typename GR, typename POT>
 		  class PotentialDifferenceMap {
 		  public:
 		    /// Key type
 		    typedef typename GR::Arc Key;
 		    /// Value type
 		    typedef typename POT::Value Value;
 		    /// \brief Constructor
 		    ///
 		    /// Contructor of the map.
 		    explicit PotentialDifferenceMap(const GR& gr,
 		                                    const POT& potential)
 		      : _digraph(gr), _potential(potential) {}
 		    /// \brief Returns the potential difference for the given arc.
 		    ///
 		    /// Returns the potential difference for the given arc, i.e.
 		    /// \code
 		    ///   potential[gr.target(arc)] - potential[gr.source(arc)].
 		    /// \endcode
 		    Value operator[](const Key& arc) const {
 		      return _potential[_digraph.target(arc)] -
 		        _potential[_digraph.source(arc)];
+		    }
 		  private:
 		    const GR& _digraph;
 		    const POT& _potential;
 		  };
 		  /// \brief Returns a PotentialDifferenceMap.
 		  ///
 		  /// This function just returns a PotentialDifferenceMap.
 		  /// \relates PotentialDifferenceMap
 		  template <typename GR, typename POT>
 		  PotentialDifferenceMap<GR, POT>
 		  potentialDifferenceMap(const GR& gr, const POT& potential) {
 		    return PotentialDifferenceMap<GR, POT>(gr, potential);
+		  }
 		  /// @}
+		}
 		#endif // LEMON_MAPS_H

lemon/min_cost_arborescence.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_MIN_COST_ARBORESCENCE_H
 		#define LEMON_MIN_COST_ARBORESCENCE_H
 		///\ingroup spantree
 		///\file
 		///\brief Minimum Cost Arborescence algorithm.
 		#include <vector>
 		#include <lemon/list_graph.h>
 		#include <lemon/bin_heap.h>
 		#include <lemon/assert.h>
 		namespace lemon {
 		  /// \brief Default traits class for MinCostArborescence class.
 		  ///
 		  /// Default traits class for MinCostArborescence class.
 		  /// \param GR Digraph type.
 		  /// \param CM Type of cost map.
 		  template <class GR, class CM>
 		  struct MinCostArborescenceDefaultTraits{
 		    /// \brief The digraph type the algorithm runs on.
 		    typedef GR Digraph;
 		    /// \brief The type of the map that stores the arc costs.
 		    ///
 		    /// The type of the map that stores the arc costs.
 		    /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
 		    typedef CM CostMap;
 		    /// \brief The value type of the costs.
 		    ///
 		    /// The value type of the costs.
 		    typedef typename CostMap::Value Value;
 		    /// \brief The type of the map that stores which arcs are in the
 		    /// arborescence.
 		    ///
 		    /// The type of the map that stores which arcs are in the
 		    /// arborescence.  It must meet the \ref concepts::WriteMap
 		    /// "WriteMap" concept.  Initially it will be set to false on each
 		    /// arc. After it will set all arborescence arcs once.
 		    typedef typename Digraph::template ArcMap<bool> ArborescenceMap;
 		    /// \brief Instantiates a \c ArborescenceMap.
 		    ///
 		    /// This function instantiates a \c ArborescenceMap.
 		    /// \param digraph is the graph, to which we would like to
 		    /// calculate the \c ArborescenceMap.
 		    static ArborescenceMap *createArborescenceMap(const Digraph &digraph){
 		      return new ArborescenceMap(digraph);
+		    }
 		    /// \brief The type of the \c PredMap
 		    ///
 		    /// The type of the \c PredMap. It is a node map with an arc value type.
 		    typedef typename Digraph::template NodeMap<typename Digraph::Arc> PredMap;
 		    /// \brief Instantiates a \c PredMap.
 		    ///
 		    /// This function instantiates a \c PredMap.
 		    /// \param digraph The digraph to which we would like to define the
 		    /// \c PredMap.
 		    static PredMap *createPredMap(const Digraph &digraph){
 		      return new PredMap(digraph);
+		    }
 		  };
 		  /// \ingroup spantree
 		  ///
-		  /// \brief %MinCostArborescence algorithm class.
+		  /// \brief Minimum Cost Arborescence algorithm class.
 		  ///
 		  /// This class provides an efficient implementation of
-		  /// %MinCostArborescence algorithm. The arborescence is a tree
+		  /// Minimum Cost Arborescence algorithm. The arborescence is a tree
 		  /// which is directed from a given source node of the digraph. One or
 		  /// more sources should be given for the algorithm and it will calculate
 		  /// the minimum cost subgraph which are union of arborescences with the
 		  /// given sources and spans all the nodes which are reachable from the
 		  /// sources. The time complexity of the algorithm is O(n<sup>2</sup>+e).
 		  ///
 		  /// The algorithm provides also an optimal dual solution, therefore
 		  /// the optimality of the solution can be checked.
 		  ///
 		  /// \param GR The digraph type the algorithm runs on. The default value
 		  /// is \ref ListDigraph.
 		  /// \param CM This read-only ArcMap determines the costs of the
 		  /// arcs. It is read once for each arc, so the map may involve in
 		  /// relatively time consuming process to compute the arc cost if
 		  /// it is necessary. The default map type is \ref
 		  /// concepts::Digraph::ArcMap "Digraph::ArcMap<int>".
 		  /// \param TR Traits class to set various data types used
 		  /// by the algorithm. The default traits class is
 		  /// \ref MinCostArborescenceDefaultTraits
 		  /// "MinCostArborescenceDefaultTraits<GR, CM>".  See \ref
 		  /// MinCostArborescenceDefaultTraits for the documentation of a
 		  /// MinCostArborescence traits class.
 		#ifndef DOXYGEN
 		  template <typename GR = ListDigraph,
 		            typename CM = typename GR::template ArcMap<int>,
 		            typename TR =
 		              MinCostArborescenceDefaultTraits<GR, CM> >
 		#else
 		  template <typename GR, typename CM, typedef TR>
 		#endif
 		  class MinCostArborescence {
 		  public:
 		    /// The traits.
 		    typedef TR Traits;
 		    /// The type of the underlying digraph.
 		    typedef typename Traits::Digraph Digraph;
 		    /// The type of the map that stores the arc costs.
 		    typedef typename Traits::CostMap CostMap;
 		    ///The type of the costs of the arcs.
 		    typedef typename Traits::Value Value;
 		    ///The type of the predecessor map.
 		    typedef typename Traits::PredMap PredMap;
 		    ///The type of the map that stores which arcs are in the arborescence.
 		    typedef typename Traits::ArborescenceMap ArborescenceMap;
 		    typedef MinCostArborescence Create;
 		  private:
 		    TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
 		    struct CostArc {
 		      Arc arc;
 		      Value value;
 		      CostArc() {}
 		      CostArc(Arc _arc, Value _value) : arc(_arc), value(_value) {}
 		    };
 		    const Digraph *_digraph;
 		    const CostMap *_cost;
 		    PredMap *_pred;
 		    bool local_pred;
 		    ArborescenceMap *_arborescence;
 		    bool local_arborescence;
 		    typedef typename Digraph::template ArcMap<int> ArcOrder;
 		    ArcOrder *_arc_order;
 		    typedef typename Digraph::template NodeMap<int> NodeOrder;
 		    NodeOrder *_node_order;
 		    typedef typename Digraph::template NodeMap<CostArc> CostArcMap;
 		    CostArcMap *_cost_arcs;
 		    struct StackLevel {
 		      std::vector<CostArc> arcs;
 		      int node_level;
 		    };
 		    std::vector<StackLevel> level_stack;
 		    std::vector<Node> queue;
 		    typedef std::vector<typename Digraph::Node> DualNodeList;
 		    DualNodeList _dual_node_list;
 		    struct DualVariable {
 		      int begin, end;
 		      Value value;
 		      DualVariable(int _begin, int _end, Value _value)
 		        : begin(_begin), end(_end), value(_value) {}
 		    };
 		    typedef std::vector<DualVariable> DualVariables;
 		    DualVariables _dual_variables;
 		    typedef typename Digraph::template NodeMap<int> HeapCrossRef;
 		    HeapCrossRef *_heap_cross_ref;
 		    typedef BinHeap<int, HeapCrossRef> Heap;
 		    Heap *_heap;
 		  protected:
 		    MinCostArborescence() {}
 		  private:
 		    void createStructures() {
 		      if (!_pred) {
 		        local_pred = true;
 		        _pred = Traits::createPredMap(*_digraph);
+		      }
 		      if (!_arborescence) {
 		        local_arborescence = true;
 		        _arborescence = Traits::createArborescenceMap(*_digraph);
+		      }
 		      if (!_arc_order) {
 		        _arc_order = new ArcOrder(*_digraph);
+		      }
 		      if (!_node_order) {
 		        _node_order = new NodeOrder(*_digraph);
+		      }
 		      if (!_cost_arcs) {
 		        _cost_arcs = new CostArcMap(*_digraph);
+		      }
 		      if (!_heap_cross_ref) {
 		        _heap_cross_ref = new HeapCrossRef(*_digraph, -1);
+		      }
 		      if (!_heap) {
 		        _heap = new Heap(*_heap_cross_ref);
+		      }
+		    }
 		    void destroyStructures() {
 		      if (local_arborescence) {
 		        delete _arborescence;
+		      }
 		      if (local_pred) {
 		        delete _pred;
+		      }
 		      if (_arc_order) {
 		        delete _arc_order;
+		      }
 		      if (_node_order) {
 		        delete _node_order;
+		      }
 		      if (_cost_arcs) {
 		        delete _cost_arcs;
+		      }
 		      if (_heap) {
 		        delete _heap;
+		      }
 		      if (_heap_cross_ref) {
 		        delete _heap_cross_ref;
+		      }
+		    }
 		    Arc prepare(Node node) {
 		      std::vector<Node> nodes;
 		      (*_node_order)[node] = _dual_node_list.size();
 		      StackLevel level;
 		      level.node_level = _dual_node_list.size();
 		      _dual_node_list.push_back(node);
 		      for (InArcIt it(*_digraph, node); it != INVALID; ++it) {
 		        Arc arc = it;
 		        Node source = _digraph->source(arc);
 		        Value value = (*_cost)[it];
 		        if (source == node || (*_node_order)[source] == -3) continue;
 		        if ((*_cost_arcs)[source].arc == INVALID) {
 		          (*_cost_arcs)[source].arc = arc;
 		          (*_cost_arcs)[source].value = value;
 		          nodes.push_back(source);
 		        } else {
 		          if ((*_cost_arcs)[source].value > value) {
 		            (*_cost_arcs)[source].arc = arc;
 		            (*_cost_arcs)[source].value = value;
+		          }
+		        }
+		      }
 		      CostArc minimum = (*_cost_arcs)[nodes[0]];
 		      for (int i = 1; i < int(nodes.size()); ++i) {
 		        if ((*_cost_arcs)[nodes[i]].value < minimum.value) {
 		          minimum = (*_cost_arcs)[nodes[i]];
+		        }
+		      }
 		      (*_arc_order)[minimum.arc] = _dual_variables.size();
 		      DualVariable var(_dual_node_list.size() - 1,
 		                       _dual_node_list.size(), minimum.value);
 		      _dual_variables.push_back(var);
 		      for (int i = 0; i < int(nodes.size()); ++i) {
 		        (*_cost_arcs)[nodes[i]].value -= minimum.value;
 		        level.arcs.push_back((*_cost_arcs)[nodes[i]]);
 		        (*_cost_arcs)[nodes[i]].arc = INVALID;
+		      }
 		      level_stack.push_back(level);
 		      return minimum.arc;
+		    }
 		    Arc contract(Node node) {
 		      int node_bottom = bottom(node);
 		      std::vector<Node> nodes;
 		      while (!level_stack.empty() &&
 		             level_stack.back().node_level >= node_bottom) {
 		        for (int i = 0; i < int(level_stack.back().arcs.size()); ++i) {
 		          Arc arc = level_stack.back().arcs[i].arc;
 		          Node source = _digraph->source(arc);
 		          Value value = level_stack.back().arcs[i].value;
 		          if ((*_node_order)[source] >= node_bottom) continue;
 		          if ((*_cost_arcs)[source].arc == INVALID) {
 		            (*_cost_arcs)[source].arc = arc;
 		            (*_cost_arcs)[source].value = value;
 		            nodes.push_back(source);
 		          } else {
 		            if ((*_cost_arcs)[source].value > value) {
 		              (*_cost_arcs)[source].arc = arc;
 		              (*_cost_arcs)[source].value = value;
+		            }
+		          }
+		        }
 		        level_stack.pop_back();
+		      }
 		      CostArc minimum = (*_cost_arcs)[nodes[0]];
 		      for (int i = 1; i < int(nodes.size()); ++i) {
 		        if ((*_cost_arcs)[nodes[i]].value < minimum.value) {
 		          minimum = (*_cost_arcs)[nodes[i]];
+		        }
+		      }
 		      (*_arc_order)[minimum.arc] = _dual_variables.size();
 		      DualVariable var(node_bottom, _dual_node_list.size(), minimum.value);
 		      _dual_variables.push_back(var);
 		      StackLevel level;
 		      level.node_level = node_bottom;
 		      for (int i = 0; i < int(nodes.size()); ++i) {
 		        (*_cost_arcs)[nodes[i]].value -= minimum.value;
 		        level.arcs.push_back((*_cost_arcs)[nodes[i]]);
 		        (*_cost_arcs)[nodes[i]].arc = INVALID;
+		      }
 		      level_stack.push_back(level);
 		      return minimum.arc;
+		    }
 		    int bottom(Node node) {
 		      int k = level_stack.size() - 1;
 		      while (level_stack[k].node_level > (*_node_order)[node]) {
 		        --k;
+		      }
 		      return level_stack[k].node_level;
+		    }
 		    void finalize(Arc arc) {
 		      Node node = _digraph->target(arc);
 		      _heap->push(node, (*_arc_order)[arc]);
 		      _pred->set(node, arc);
 		      while (!_heap->empty()) {
 		        Node source = _heap->top();
 		        _heap->pop();
 		        (*_node_order)[source] = -1;
 		        for (OutArcIt it(*_digraph, source); it != INVALID; ++it) {
 		          if ((*_arc_order)[it] < 0) continue;
 		          Node target = _digraph->target(it);
 		          switch(_heap->state(target)) {
 		          case Heap::PRE_HEAP:
 		            _heap->push(target, (*_arc_order)[it]);
 		            _pred->set(target, it);
 		            break;
 		          case Heap::IN_HEAP:
 		            if ((*_arc_order)[it] < (*_heap)[target]) {
 		              _heap->decrease(target, (*_arc_order)[it]);
 		              _pred->set(target, it);
+		            }
 		            break;
 		          case Heap::POST_HEAP:
 		            break;
+		          }
+		        }
 		        _arborescence->set((*_pred)[source], true);
+		      }
+		    }
 		  public:
-		    /// \name Named template parameters
+		    /// \name Named Template Parameters
 		    /// @{
 		    template <class T>
 		    struct DefArborescenceMapTraits : public Traits {
 		      typedef T ArborescenceMap;
 		      static ArborescenceMap *createArborescenceMap(const Digraph &)
+		      {
 		        LEMON_ASSERT(false, "ArborescenceMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for
 		    /// setting ArborescenceMap type
 		    ///
 		    /// \ref named-templ-param "Named parameter" for setting
 		    /// ArborescenceMap type
 		    template <class T>
 		    struct DefArborescenceMap
 		      : public MinCostArborescence<Digraph, CostMap,
 		                                   DefArborescenceMapTraits<T> > {
 		    };
 		    template <class T>
 		    struct DefPredMapTraits : public Traits {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &)
+		      {
 		        LEMON_ASSERT(false, "PredMap is not initialized");
+		      }
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for
 		    /// setting PredMap type
 		    ///
 		    /// \ref named-templ-param "Named parameter" for setting
 		    /// PredMap type
 		    template <class T>
 		    struct DefPredMap
 		      : public MinCostArborescence<Digraph, CostMap, DefPredMapTraits<T> > {
 		    };
 		    /// @}
 		    /// \brief Constructor.
 		    ///
 		    /// \param digraph The digraph the algorithm will run on.
 		    /// \param cost The cost map used by the algorithm.
 		    MinCostArborescence(const Digraph& digraph, const CostMap& cost)
 		      : _digraph(&digraph), _cost(&cost), _pred(0), local_pred(false),
 		        _arborescence(0), local_arborescence(false),
 		        _arc_order(0), _node_order(0), _cost_arcs(0),
 		        _heap_cross_ref(0), _heap(0) {}
 		    /// \brief Destructor.
 		    ~MinCostArborescence() {
 		      destroyStructures();
+		    }
 		    /// \brief Sets the arborescence map.
 		    ///
 		    /// Sets the arborescence map.
 		    /// \return <tt>(*this)</tt>
 		    MinCostArborescence& arborescenceMap(ArborescenceMap& m) {
 		      if (local_arborescence) {
 		        delete _arborescence;
+		      }
 		      local_arborescence = false;
 		      _arborescence = &m;
 		      return *this;
+		    }
 		    /// \brief Sets the arborescence map.
 		    ///
 		    /// Sets the arborescence map.
 		    /// \return <tt>(*this)</tt>
 		    MinCostArborescence& predMap(PredMap& m) {
 		      if (local_pred) {
 		        delete _pred;
+		      }
 		      local_pred = false;
 		      _pred = &m;
 		      return *this;
+		    }
 		    /// \name Query Functions
 		    /// The result of the %MinCostArborescence algorithm can be obtained
 		    /// using these functions.\n
 		    /// Before the use of these functions,
 		    /// either run() or start() must be called.
 		    /// @{
 		    /// \brief Returns a reference to the arborescence map.
 		    ///
 		    /// Returns a reference to the arborescence map.
 		    const ArborescenceMap& arborescenceMap() const {
 		      return *_arborescence;
+		    }
 		    /// \brief Returns true if the arc is in the arborescence.
 		    ///
 		    /// Returns true if the arc is in the arborescence.
 		    /// \param arc The arc of the digraph.
 		    /// \pre \ref run() must be called before using this function.
 		    bool arborescence(Arc arc) const {
 		      return (*_pred)[_digraph->target(arc)] == arc;
+		    }
 		    /// \brief Returns a reference to the pred map.
 		    ///
 		    /// Returns a reference to the pred map.
 		    const PredMap& predMap() const {
 		      return *_pred;
+		    }
 		    /// \brief Returns the predecessor arc of the given node.
 		    ///
 		    /// Returns the predecessor arc of the given node.
 		    Arc pred(Node node) const {
 		      return (*_pred)[node];
+		    }
 		    /// \brief Returns the cost of the arborescence.
 		    ///
 		    /// Returns the cost of the arborescence.
 		    Value arborescenceValue() const {
 		      Value sum = 0;
 		      for (ArcIt it(*_digraph); it != INVALID; ++it) {
 		        if (arborescence(it)) {
 		          sum += (*_cost)[it];
+		        }
+		      }
 		      return sum;
+		    }
 		    /// \brief Indicates that a node is reachable from the sources.
 		    ///
 		    /// Indicates that a node is reachable from the sources.
 		    bool reached(Node node) const {
 		      return (*_node_order)[node] != -3;
+		    }
 		    /// \brief Indicates that a node is processed.
 		    ///
 		    /// Indicates that a node is processed. The arborescence path exists
 		    /// from the source to the given node.
 		    bool processed(Node node) const {
 		      return (*_node_order)[node] == -1;
+		    }
 		    /// \brief Returns the number of the dual variables in basis.
 		    ///
 		    /// Returns the number of the dual variables in basis.
 		    int dualNum() const {
 		      return _dual_variables.size();
+		    }
 		    /// \brief Returns the value of the dual solution.
 		    ///
 		    /// Returns the value of the dual solution. It should be
 		    /// equal to the arborescence value.
 		    Value dualValue() const {
 		      Value sum = 0;
 		      for (int i = 0; i < int(_dual_variables.size()); ++i) {
 		        sum += _dual_variables[i].value;
+		      }
 		      return sum;
+		    }
 		    /// \brief Returns the number of the nodes in the dual variable.
 		    ///
 		    /// Returns the number of the nodes in the dual variable.
 		    int dualSize(int k) const {
 		      return _dual_variables[k].end - _dual_variables[k].begin;
+		    }
 		    /// \brief Returns the value of the dual variable.
 		    ///
 		    /// Returns the the value of the dual variable.
 		    const Value& dualValue(int k) const {
 		      return _dual_variables[k].value;
+		    }
 		    /// \brief Lemon iterator for get a dual variable.
 		    ///
 		    /// Lemon iterator for get a dual variable. This class provides
 		    /// a common style lemon iterator which gives back a subset of
 		    /// the nodes.
 		    class DualIt {
 		    public:
 		      /// \brief Constructor.
 		      ///
 		      /// Constructor for get the nodeset of the variable.
 		      DualIt(const MinCostArborescence& algorithm, int variable)
 		        : _algorithm(&algorithm)
+		      {
 		        _index = _algorithm->_dual_variables[variable].begin;
 		        _last = _algorithm->_dual_variables[variable].end;
+		      }
 		      /// \brief Conversion to node.
 		      ///
 		      /// Conversion to node.
 		      operator Node() const {
 		        return _algorithm->_dual_node_list[_index];
+		      }
 		      /// \brief Increment operator.
 		      ///
 		      /// Increment operator.
 		      DualIt& operator++() {
 		        ++_index;
 		        return *this;
+		      }
 		      /// \brief Validity checking
 		      ///
 		      /// Checks whether the iterator is invalid.
 		      bool operator==(Invalid) const {
 		        return _index == _last;
+		      }
 		      /// \brief Validity checking
 		      ///
 		      /// Checks whether the iterator is valid.
 		      bool operator!=(Invalid) const {
 		        return _index != _last;
+		      }
 		    private:
 		      const MinCostArborescence* _algorithm;
 		      int _index, _last;
 		    };
 		    /// @}
-		    /// \name Execution control
+		    /// \name Execution Control
 		    /// The simplest way to execute the algorithm is to use
 		    /// one of the member functions called \c run(...). \n
 		    /// If you need more control on the execution,
 		    /// first you must call \ref init(), then you can add several
 		    /// source nodes with \ref addSource().
 		    /// Finally \ref start() will perform the arborescence
 		    /// computation.
 		    ///@{
 		    /// \brief Initializes the internal data structures.
 		    ///
 		    /// Initializes the internal data structures.
 		    ///
 		    void init() {
 		      createStructures();
 		      _heap->clear();
 		      for (NodeIt it(*_digraph); it != INVALID; ++it) {
 		        (*_cost_arcs)[it].arc = INVALID;
 		        (*_node_order)[it] = -3;
 		        (*_heap_cross_ref)[it] = Heap::PRE_HEAP;
 		        _pred->set(it, INVALID);
+		      }
 		      for (ArcIt it(*_digraph); it != INVALID; ++it) {
 		        _arborescence->set(it, false);
 		        (*_arc_order)[it] = -1;
+		      }
 		      _dual_node_list.clear();
 		      _dual_variables.clear();
+		    }
 		    /// \brief Adds a new source node.
 		    ///
 		    /// Adds a new source node to the algorithm.
 		    void addSource(Node source) {
 		      std::vector<Node> nodes;
 		      nodes.push_back(source);
 		      while (!nodes.empty()) {
 		        Node node = nodes.back();
 		        nodes.pop_back();
 		        for (OutArcIt it(*_digraph, node); it != INVALID; ++it) {
 		          Node target = _digraph->target(it);
 		          if ((*_node_order)[target] == -3) {
 		            (*_node_order)[target] = -2;
 		            nodes.push_back(target);
 		            queue.push_back(target);
+		          }
+		        }
+		      }
 		      (*_node_order)[source] = -1;
+		    }
 		    /// \brief Processes the next node in the priority queue.
 		    ///
 		    /// Processes the next node in the priority queue.
 		    ///
 		    /// \return The processed node.
 		    ///
 		    /// \warning The queue must not be empty!
 		    Node processNextNode() {
 		      Node node = queue.back();
 		      queue.pop_back();
 		      if ((*_node_order)[node] == -2) {
 		        Arc arc = prepare(node);
 		        Node source = _digraph->source(arc);
 		        while ((*_node_order)[source] != -1) {
 		          if ((*_node_order)[source] >= 0) {
 		            arc = contract(source);
 		          } else {
 		            arc = prepare(source);
+		          }
 		          source = _digraph->source(arc);
+		        }
 		        finalize(arc);
 		        level_stack.clear();
+		      }
 		      return node;
+		    }
 		    /// \brief Returns the number of the nodes to be processed.
 		    ///
 		    /// Returns the number of the nodes to be processed.
 		    int queueSize() const {
 		      return queue.size();
+		    }
 		    /// \brief Returns \c false if there are nodes to be processed.
 		    ///
 		    /// Returns \c false if there are nodes to be processed.
 		    bool emptyQueue() const {
 		      return queue.empty();
+		    }
 		    /// \brief Executes the algorithm.
 		    ///
 		    /// Executes the algorithm.
 		    ///
 		    /// \pre init() must be called and at least one node should be added
 		    /// with addSource() before using this function.
 		    ///
 		    ///\note mca.start() is just a shortcut of the following code.
 		    ///\code
 		    ///while (!mca.emptyQueue()) {
 		    ///  mca.processNextNode();
 		    ///}
 		    ///\endcode
 		    void start() {
 		      while (!emptyQueue()) {
 		        processNextNode();
+		      }
+		    }
 		    /// \brief Runs %MinCostArborescence algorithm from node \c s.
 		    ///
 		    /// This method runs the %MinCostArborescence algorithm from
 		    /// a root node \c s.
 		    ///
 		    /// \note mca.run(s) is just a shortcut of the following code.
 		    /// \code
 		    /// mca.init();
 		    /// mca.addSource(s);
 		    /// mca.start();
 		    /// \endcode
 		    void run(Node node) {
 		      init();
 		      addSource(node);
 		      start();
+		    }
 		    ///@}
 		  };
 		  /// \ingroup spantree
 		  ///
 		  /// \brief Function type interface for MinCostArborescence algorithm.
 		  ///
 		  /// Function type interface for MinCostArborescence algorithm.
 		  /// \param digraph The Digraph that the algorithm runs on.
 		  /// \param cost The CostMap of the arcs.
 		  /// \param source The source of the arborescence.
 		  /// \retval arborescence The bool ArcMap which stores the arborescence.
 		  /// \return The cost of the arborescence.
 		  ///
 		  /// \sa MinCostArborescence
 		  template <typename Digraph, typename CostMap, typename ArborescenceMap>
 		  typename CostMap::Value minCostArborescence(const Digraph& digraph,
 		                                              const CostMap& cost,
 		                                              typename Digraph::Node source,
 		                                              ArborescenceMap& arborescence) {
 		    typename MinCostArborescence<Digraph, CostMap>
 		      ::template DefArborescenceMap<ArborescenceMap>
 		      ::Create mca(digraph, cost);
 		    mca.arborescenceMap(arborescence);
 		    mca.run(source);
 		    return mca.arborescenceValue();
+		  }
+		}
 		#endif

lemon/random.h

Show inline comments

@@ -150,856 +150,856 @@
 		    template <typename _Word>
 		    class RandomCore {
 		    public:
 		      typedef _Word Word;
 		    private:
 		      static const int bits = RandomTraits<Word>::bits;
 		      static const int length = RandomTraits<Word>::length;
 		      static const int shift = RandomTraits<Word>::shift;
 		    public:
 		      void initState() {
 		        static const Word seedArray[4] = {
 x12345u, 0x23456u, 0x34567u, 0x45678u
 		        };
 		        initState(seedArray, seedArray + 4);
+		      }
 		      void initState(Word seed) {
 		        static const Word mul = RandomTraits<Word>::mul;
 		        current = state;
 		        Word *curr = state + length - 1;
 		        curr[0] = seed; --curr;
 		        for (int i = 1; i < length; ++i) {
 		          curr[0] = (mul * ( curr[1] ^ (curr[1] >> (bits - 2)) ) + i);
 		          --curr;
+		        }
+		      }
 		      template <typename Iterator>
 		      void initState(Iterator begin, Iterator end) {
 		        static const Word init = RandomTraits<Word>::arrayInit;
 		        static const Word mul1 = RandomTraits<Word>::arrayMul1;
 		        static const Word mul2 = RandomTraits<Word>::arrayMul2;
 		        Word *curr = state + length - 1; --curr;
 		        Iterator it = begin; int cnt = 0;
 		        int num;
 		        initState(init);
 		        num = length > end - begin ? length : end - begin;
 		        while (num--) {
 		          curr[0] = (curr[0] ^ ((curr[1] ^ (curr[1] >> (bits - 2))) * mul1))
 		            + *it + cnt;
 		          ++it; ++cnt;
 		          if (it == end) {
 		            it = begin; cnt = 0;
+		          }
 		          if (curr == state) {
 		            curr = state + length - 1; curr[0] = state[0];
+		          }
 		          --curr;
+		        }
 		        num = length - 1; cnt = length - (curr - state) - 1;
 		        while (num--) {
 		          curr[0] = (curr[0] ^ ((curr[1] ^ (curr[1] >> (bits - 2))) * mul2))
 		            - cnt;
 		          --curr; ++cnt;
 		          if (curr == state) {
 		            curr = state + length - 1; curr[0] = state[0]; --curr;
 		            cnt = 1;
+		          }
+		        }
 		        state[length - 1] = Word(1) << (bits - 1);
+		      }
 		      void copyState(const RandomCore& other) {
 		        std::copy(other.state, other.state + length, state);
 		        current = state + (other.current - other.state);
+		      }
 		      Word operator()() {
 		        if (current == state) fillState();
 		        --current;
 		        Word rnd = *current;
 		        return RandomTraits<Word>::tempering(rnd);
+		      }
 		    private:
 		      void fillState() {
 		        static const Word mask[2] = { 0x0ul, RandomTraits<Word>::mask };
 		        static const Word loMask = RandomTraits<Word>::loMask;
 		        static const Word hiMask = RandomTraits<Word>::hiMask;
 		        current = state + length;
 		        register Word *curr = state + length - 1;
 		        register long num;
 		        num = length - shift;
 		        while (num--) {
 		          curr[0] = (((curr[0] & hiMask) | (curr[-1] & loMask)) >> 1) ^
 		            curr[- shift] ^ mask[curr[-1] & 1ul];
 		          --curr;
+		        }
 		        num = shift - 1;
 		        while (num--) {
 		          curr[0] = (((curr[0] & hiMask) | (curr[-1] & loMask)) >> 1) ^
 		            curr[length - shift] ^ mask[curr[-1] & 1ul];
 		          --curr;
+		        }
 		        state[0] = (((state[0] & hiMask) | (curr[length - 1] & loMask)) >> 1) ^
 		          curr[length - shift] ^ mask[curr[length - 1] & 1ul];
+		      }
 		      Word *current;
 		      Word state[length];
 		    };
 		    template <typename Result,
 		              int shift = (std::numeric_limits<Result>::digits + 1) / 2>
 		    struct Masker {
 		      static Result mask(const Result& result) {
 		        return Masker<Result, (shift + 1) / 2>::
 		          mask(static_cast<Result>(result | (result >> shift)));
+		      }
 		    };
 		    template <typename Result>
 		    struct Masker<Result, 1> {
 		      static Result mask(const Result& result) {
 		        return static_cast<Result>(result | (result >> 1));
+		      }
 		    };
 		    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>
 		    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) |
 		          IntConversion<Result, Word, rest - bits, shift + bits>::convert(rnd);
+		      }
 		    };
 		    template <typename Result, typename Word,
 		              bool one_word = (std::numeric_limits<Word>::digits <
 		                               std::numeric_limits<Result>::digits) >
 		    struct Mapping {
 		      static Result map(RandomCore<Word>& rnd, const Result& bound) {
 		        Word max = Word(bound - 1);
 		        Result mask = Masker<Result>::mask(bound - 1);
 		        Result num;
 		        do {
 		          num = IntConversion<Result, Word>::convert(rnd) & mask;
 		        } while (num > max);
 		        return num;
+		      }
 		    };
 		    template <typename Result, typename Word>
 		    struct Mapping<Result, Word, false> {
 		      static Result map(RandomCore<Word>& rnd, const Result& bound) {
 		        Word max = Word(bound - 1);
 		        Word mask = Masker<Word, (std::numeric_limits<Result>::digits + 1) / 2>
 		          ::mask(max);
 		        Word num;
 		        do {
 		          num = rnd() & mask;
 		        } while (num > max);
 		        return num;
+		      }
 		    };
 		    template <typename Result, int exp>
 		    struct ShiftMultiplier {
 		      static const Result multiplier() {
 		        Result res = ShiftMultiplier<Result, exp / 2>::multiplier();
 		        res *= res;
 		        if ((exp & 1) == 1) res *= static_cast<Result>(0.5);
 		        return res;
+		      }
 		    };
 		    template <typename Result>
 		    struct ShiftMultiplier<Result, 0> {
 		      static const Result multiplier() {
 		        return static_cast<Result>(1.0);
+		      }
 		    };
 		    template <typename Result>
 		    struct ShiftMultiplier<Result, 20> {
 		      static const Result multiplier() {
 		        return static_cast<Result>(1.0/1048576.0);
+		      }
 		    };
 		    template <typename Result>
 		    struct ShiftMultiplier<Result, 32> {
 		      static const Result multiplier() {
 		        return static_cast<Result>(1.0/4294967296.0);
+		      }
 		    };
 		    template <typename Result>
 		    struct ShiftMultiplier<Result, 53> {
 		      static const Result multiplier() {
 		        return static_cast<Result>(1.0/9007199254740992.0);
+		      }
 		    };
 		    template <typename Result>
 		    struct ShiftMultiplier<Result, 64> {
 		      static const Result multiplier() {
 		        return static_cast<Result>(1.0/18446744073709551616.0);
+		      }
 		    };
 		    template <typename Result, int exp>
 		    struct Shifting {
 		      static Result shift(const Result& result) {
 		        return result * ShiftMultiplier<Result, exp>::multiplier();
+		      }
 		    };
 		    template <typename Result, typename Word,
 		              int rest = std::numeric_limits<Result>::digits, int shift = 0,
 		              bool last = rest <= std::numeric_limits<Word>::digits>
 		    struct RealConversion{
 		      static const int bits = std::numeric_limits<Word>::digits;
 		      static Result convert(RandomCore<Word>& rnd) {
 		        return Shifting<Result, shift + rest>::
 		          shift(static_cast<Result>(rnd() >> (bits - rest)));
+		      }
 		    };
 		    template <typename Result, typename Word, int rest, int shift>
 		    struct RealConversion<Result, Word, rest, shift, false> {
 		      static const int bits = std::numeric_limits<Word>::digits;
 		      static Result convert(RandomCore<Word>& rnd) {
 		        return Shifting<Result, shift + bits>::
 		          shift(static_cast<Result>(rnd())) +
 		          RealConversion<Result, Word, rest-bits, shift + bits>::
 		          convert(rnd);
+		      }
 		    };
 		    template <typename Result, typename Word>
 		    struct Initializer {
 		      template <typename Iterator>
 		      static void init(RandomCore<Word>& rnd, Iterator begin, Iterator end) {
 		        std::vector<Word> ws;
 		        for (Iterator it = begin; it != end; ++it) {
 		          ws.push_back(Word(*it));
+		        }
 		        rnd.initState(ws.begin(), ws.end());
+		      }
 		      static void init(RandomCore<Word>& rnd, Result seed) {
 		        rnd.initState(seed);
+		      }
 		    };
 		    template <typename Word>
 		    struct BoolConversion {
 		      static bool convert(RandomCore<Word>& rnd) {
 		        return (rnd() & 1) == 1;
+		      }
 		    };
 		    template <typename Word>
 		    struct BoolProducer {
 		      Word buffer;
 		      int num;
 		      BoolProducer() : num(0) {}
 		      bool convert(RandomCore<Word>& rnd) {
 		        if (num == 0) {
 		          buffer = rnd();
 		          num = RandomTraits<Word>::bits;
+		        }
 		        bool r = (buffer & 1);
 		        buffer >>= 1;
 		        --num;
 		        return r;
+		      }
 		    };
+		  }
 		  /// \ingroup misc
 		  ///
 		  /// \brief Mersenne Twister random number generator
 		  ///
 		  /// The Mersenne Twister is a twisted generalized feedback
 		  /// shift-register generator of Matsumoto and Nishimura. The period
 		  /// of this generator is \f$ 2^{19937} - 1 \f$ and it is
 		  /// equi-distributed in 623 dimensions for 32-bit numbers. The time
 		  /// performance of this generator is comparable to the commonly used
 		  /// generators.
 		  ///
 		  /// This implementation is specialized for both 32-bit and 64-bit
 		  /// architectures. The generators differ sligthly in the
 		  /// initialization and generation phase so they produce two
 		  /// completly different sequences.
 		  ///
 		  /// The generator gives back random numbers of serveral types. To
 		  /// get a random number from a range of a floating point type you
 		  /// can use one form of the \c operator() or the \c real() member
 		  /// function. If you want to get random number from the {0, 1, ...,
 		  /// n-1} integer range use the \c operator[] or the \c integer()
 		  /// method. And to get random number from the whole range of an
 		  /// integer type you can use the argumentless \c integer() or \c
 		  /// uinteger() functions. After all you can get random bool with
 		  /// equal chance of true and false or given probability of true
 		  /// result with the \c boolean() member functions.
 		  ///
 		  ///\code
 		  /// // The commented code is identical to the other
 		  /// double a = rnd();                     // [0.0, 1.0)
 		  /// // double a = rnd.real();             // [0.0, 1.0)
 		  /// double b = rnd(100.0);                // [0.0, 100.0)
 		  /// // double b = rnd.real(100.0);        // [0.0, 100.0)
 		  /// double c = rnd(1.0, 2.0);             // [1.0, 2.0)
 		  /// // double c = rnd.real(1.0, 2.0);     // [1.0, 2.0)
 		  /// int d = rnd[100000];                  // 0..99999
 		  /// // int d = rnd.integer(100000);       // 0..99999
 		  /// int e = rnd[6] + 1;                   // 1..6
 		  /// // int e = rnd.integer(1, 1 + 6);     // 1..6
 		  /// int b = rnd.uinteger<int>();          // 0 .. 2^31 - 1
 		  /// int c = rnd.integer<int>();           // - 2^31 .. 2^31 - 1
 		  /// bool g = rnd.boolean();               // P(g = true) = 0.5
 		  /// bool h = rnd.boolean(0.8);            // P(h = true) = 0.8
 		  ///\endcode
 		  ///
 		  /// LEMON provides a global instance of the random number
 		  /// generator which name is \ref lemon::rnd "rnd". Usually it is a
 		  /// good programming convenience to use this global generator to get
 		  /// random numbers.
 		  class Random {
 		  private:
 		    // Architecture word
 		    typedef unsigned long Word;
 		    _random_bits::RandomCore<Word> core;
 		    _random_bits::BoolProducer<Word> bool_producer;
 		  public:
 		    ///\name Initialization
 		    ///
 		    /// @{
 		    /// \brief Default constructor
 		    ///
 		    /// Constructor with constant seeding.
 		    Random() { core.initState(); }
 		    /// \brief Constructor with seed
 		    ///
 		    /// Constructor with seed. The current number type will be converted
 		    /// to the architecture word type.
 		    template <typename Number>
 		    Random(Number seed) {
 		      _random_bits::Initializer<Number, Word>::init(core, seed);
+		    }
 		    /// \brief Constructor with array seeding
 		    ///
 		    /// Constructor with array seeding. The given range should contain
 		    /// any number type and the numbers will be converted to the
 		    /// architecture word type.
 		    template <typename Iterator>
 		    Random(Iterator begin, Iterator end) {
 		      typedef typename std::iterator_traits<Iterator>::value_type Number;
 		      _random_bits::Initializer<Number, Word>::init(core, begin, end);
+		    }
 		    /// \brief Copy constructor
 		    ///
 		    /// Copy constructor. The generated sequence will be identical to
 		    /// the other sequence. It can be used to save the current state
 		    /// of the generator and later use it to generate the same
 		    /// sequence.
 		    Random(const Random& other) {
 		      core.copyState(other.core);
+		    }
 		    /// \brief Assign operator
 		    ///
 		    /// Assign operator. The generated sequence will be identical to
 		    /// the other sequence. It can be used to save the current state
 		    /// of the generator and later use it to generate the same
 		    /// sequence.
 		    Random& operator=(const Random& other) {
 		      if (&other != this) {
 		        core.copyState(other.core);
+		      }
 		      return *this;
+		    }
 		    /// \brief Seeding random sequence
 		    ///
 		    /// Seeding the random sequence. The current number type will be
 		    /// converted to the architecture word type.
 		    template <typename Number>
 		    void seed(Number seed) {
 		      _random_bits::Initializer<Number, Word>::init(core, seed);
+		    }
 		    /// \brief Seeding random sequence
 		    ///
 		    /// Seeding the random sequence. The given range should contain
 		    /// any number type and the numbers will be converted to the
 		    /// architecture word type.
 		    template <typename Iterator>
 		    void seed(Iterator begin, Iterator end) {
 		      typedef typename std::iterator_traits<Iterator>::value_type Number;
 		      _random_bits::Initializer<Number, Word>::init(core, begin, end);
+		    }
 		    /// \brief Seeding from file or from process id and time
 		    ///
 		    /// By default, this function calls the \c seedFromFile() member
 		    /// function with the <tt>/dev/urandom</tt> file. If it does not success,
 		    /// it uses the \c seedFromTime().
 		    /// \return Currently always \c true.
 		    bool seed() {
 		#ifndef WIN32
 		      if (seedFromFile("/dev/urandom", 0)) return true;
 		#endif
 		      if (seedFromTime()) return true;
 		      return false;
+		    }
 		    /// \brief Seeding from file
 		    ///
 		    /// Seeding the random sequence from file. The linux kernel has two
 		    /// devices, <tt>/dev/random</tt> and <tt>/dev/urandom</tt> which
 		    /// could give good seed values for pseudo random generators (The
 		    /// difference between two devices is that the <tt>random</tt> may
 		    /// block the reading operation while the kernel can give good
 		    /// source of randomness, while the <tt>urandom</tt> does not
 		    /// block the input, but it could give back bytes with worse
 		    /// entropy).
 		    /// \param file The source file
 		    /// \param offset The offset, from the file read.
 		    /// \return \c true when the seeding successes.
 		#ifndef WIN32
 		    bool seedFromFile(const std::string& file = "/dev/urandom", int offset = 0)
 		#else
 		    bool seedFromFile(const std::string& file = "", int offset = 0)
 		#endif
+		    {
 		      std::ifstream rs(file.c_str());
 		      const int size = 4;
 		      Word buf[size];
 		      if (offset != 0 && !rs.seekg(offset)) return false;
 		      if (!rs.read(reinterpret_cast<char*>(buf), sizeof(buf))) return false;
 		      seed(buf, buf + size);
 		      return true;
+		    }
 		    /// \brief Seding from process id and time
 		    ///
 		    /// Seding from process id and time. This function uses the
 		    /// current process id and the current time for initialize the
 		    /// random sequence.
 		    /// \return Currently always \c true.
 		    bool seedFromTime() {
 		#ifndef WIN32
 		      timeval tv;
 		      gettimeofday(&tv, 0);
 		      seed(getpid() + tv.tv_sec + tv.tv_usec);
 		#else
 		      seed(bits::getWinRndSeed());
 		#endif
 		      return true;
+		    }
 		    /// @}
-		    ///\name Uniform distributions
+		    ///\name Uniform Distributions
 		    ///
 		    /// @{
 		    /// \brief Returns a random real number from the range [0, 1)
 		    ///
 		    /// It returns a random real number from the range [0, 1). The
 		    /// default Number type is \c double.
 		    template <typename Number>
 		    Number real() {
 		      return _random_bits::RealConversion<Number, Word>::convert(core);
+		    }
 		    double real() {
 		      return real<double>();
+		    }
 		    /// \brief Returns a random real number from the range [0, 1)
 		    ///
 		    /// It returns a random double from the range [0, 1).
 		    double operator()() {
 		      return real<double>();
+		    }
 		    /// \brief Returns a random real number from the range [0, b)
 		    ///
 		    /// It returns a random real number from the range [0, b).
 		    double operator()(double b) {
 		      return real<double>() * b;
+		    }
 		    /// \brief Returns a random real number from the range [a, b)
 		    ///
 		    /// It returns a random real number from the range [a, b).
 		    double operator()(double a, double b) {
 		      return real<double>() * (b - a) + a;
+		    }
 		    /// \brief Returns a random integer from a range
 		    ///
 		    /// It returns a random integer from the range {0, 1, ..., b - 1}.
 		    template <typename Number>
 		    Number integer(Number b) {
 		      return _random_bits::Mapping<Number, Word>::map(core, b);
+		    }
 		    /// \brief Returns a random integer from a range
 		    ///
 		    /// It returns a random integer from the range {a, a + 1, ..., b - 1}.
 		    template <typename Number>
 		    Number integer(Number a, Number b) {
 		      return _random_bits::Mapping<Number, Word>::map(core, b - a) + a;
+		    }
 		    /// \brief Returns a random integer from a range
 		    ///
 		    /// It returns a random integer from the range {0, 1, ..., b - 1}.
 		    template <typename Number>
 		    Number operator[](Number b) {
 		      return _random_bits::Mapping<Number, Word>::map(core, b);
+		    }
 		    /// \brief Returns a random non-negative integer
 		    ///
 		    /// It returns a random non-negative integer uniformly from the
 		    /// whole range of the current \c Number type. The default result
 		    /// type of this function is <tt>unsigned int</tt>.
 		    template <typename Number>
 		    Number uinteger() {
 		      return _random_bits::IntConversion<Number, Word>::convert(core);
+		    }
 		    unsigned int uinteger() {
 		      return uinteger<unsigned int>();
+		    }
 		    /// \brief Returns a random integer
 		    ///
 		    /// It returns a random integer uniformly from the whole range of
 		    /// the current \c Number type. The default result type of this
 		    /// function is \c int.
 		    template <typename Number>
 		    Number integer() {
 		      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);
+		    }
 		    int integer() {
 		      return integer<int>();
+		    }
 		    /// \brief Returns a random bool
 		    ///
 		    /// It returns a random bool. The generator holds a buffer for
 		    /// random bits. Every time when it become empty the generator makes
 		    /// a new random word and fill the buffer up.
 		    bool boolean() {
 		      return bool_producer.convert(core);
+		    }
 		    /// @}
-		    ///\name Non-uniform distributions
+		    ///\name Non-uniform Distributions
 		    ///
 		    ///@{
 		    /// \brief Returns a random bool with given probability of true result.
 		    ///
 		    /// It returns a random bool with given probability of true result.
 		    bool boolean(double p) {
 		      return operator()() < p;
+		    }
 		    /// Standard normal (Gauss) distribution
 		    /// Standard normal (Gauss) distribution.
 		    /// \note The Cartesian form of the Box-Muller
 		    /// transformation is used to generate a random normal distribution.
 		    double gauss()
+		    {
 		      double V1,V2,S;
 		      do {
 		        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;
+		    }
 		    /// Normal (Gauss) distribution with given mean and standard deviation
 		    /// Normal (Gauss) distribution with given mean and standard deviation.
 		    /// \sa gauss()
 		    double gauss(double mean,double std_dev)
+		    {
 		      return gauss()*std_dev+mean;
+		    }
 		    /// Lognormal distribution
 		    /// Lognormal distribution. The parameters are the mean and the standard
 		    /// deviation of <tt>exp(X)</tt>.
 		    ///
 		    double lognormal(double n_mean,double n_std_dev)
+		    {
 		      return std::exp(gauss(n_mean,n_std_dev));
+		    }
 		    /// Lognormal distribution
 		    /// Lognormal distribution. The parameter is an <tt>std::pair</tt> of
 		    /// the mean and the standard deviation of <tt>exp(X)</tt>.
 		    ///
 		    double lognormal(const std::pair<double,double> &params)
+		    {
 		      return std::exp(gauss(params.first,params.second));
+		    }
 		    /// Compute the lognormal parameters from mean and standard deviation
 		    /// This function computes the lognormal parameters from mean and
 		    /// standard deviation. The return value can direcly be passed to
 		    /// lognormal().
 		    std::pair<double,double> lognormalParamsFromMD(double mean,
 		                                                   double std_dev)
+		    {
 		      double fr=std_dev/mean;
 		      fr*=fr;
 		      double lg=std::log(1+fr);
 		      return std::pair<double,double>(std::log(mean)-lg/2.0,std::sqrt(lg));
+		    }
 		    /// Lognormal distribution with given mean and standard deviation
 		    /// Lognormal distribution with given mean and standard deviation.
 		    ///
 		    double lognormalMD(double mean,double std_dev)
+		    {
 		      return lognormal(lognormalParamsFromMD(mean,std_dev));
+		    }
 		    /// Exponential distribution with given mean
 		    /// This function generates an exponential distribution random number
 		    /// with mean <tt>1/lambda</tt>.
 		    ///
 		    double exponential(double lambda=1.0)
+		    {
 		      return -std::log(1.0-real<double>())/lambda;
+		    }
 		    /// Gamma distribution with given integer shape
 		    /// This function generates a gamma distribution random number.
 		    ///
 		    ///\param k shape parameter (<tt>k>0</tt> integer)
 		    double gamma(int k)
+		    {
 		      double s = 0;
 		      for(int i=0;i<k;i++) s-=std::log(1.0-real<double>());
 		      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
 		    ///
 		    double gamma(double k,double theta=1.0)
+		    {
 		      double xi,nu;
 		      const double delta = k-std::floor(k);
 		      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);
+		          }
 		      } 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>)
 		    ///
 		    double weibull(double k,double lambda)
+		    {
 		      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>)
 		    ///
 		    double pareto(double k,double x_min)
+		    {
 		      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]
 		    /// \note The algorithm is taken from the book of Donald E. Knuth titled
 		    /// ''Seminumerical Algorithms'' (1969). Its running time is linear in the
 		    /// return value.
 		    int poisson(double lambda)
+		    {
 		      const double l = std::exp(-lambda);
 		      int k=0;
 		      double p = 1.0;
 		      do {
 		        k++;
 		        p*=real<double>();
 		      } while (p>=l);
 		      return k-1;
+		    }
 		    ///@}
-		    ///\name Two dimensional distributions
+		    ///\name Two Dimensional Distributions
 		    ///
 		    ///@{
 		    /// Uniform distribution on the full unit circle
 		    /// Uniform distribution on the full unit circle.
 		    ///
 		    dim2::Point<double> disc()
+		    {
 		      double V1,V2;
 		      do {
 		        V1=2*real<double>()-1;
 		        V2=2*real<double>()-1;
 		      } while(V1*V1+V2*V2>=1);
 		      return dim2::Point<double>(V1,V2);
+		    }
 		    /// A kind of two dimensional normal (Gauss) distribution
 		    /// This function provides a turning symmetric two-dimensional distribution.
 		    /// Both coordinates are of standard normal distribution, but they are not
 		    /// independent.
 		    ///
 		    /// \note The coordinates are the two random variables provided by
 		    /// the Box-Muller method.
 		    dim2::Point<double> gauss2()
+		    {
 		      double V1,V2,S;
 		      do {
 		        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);
 		      return dim2::Point<double>(W*V1,W*V2);
+		    }
 		    /// A kind of two dimensional exponential distribution
 		    /// 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
 		    /// y=0 then, -x is of exponential distribution. The same is true for the
 		    /// y-coordinate.
 		    dim2::Point<double> exponential2()
+		    {
 		      double V1,V2,S;
 		      do {
 		        V1=2*real<double>()-1;
 		        V2=2*real<double>()-1;
 		        S=V1*V1+V2*V2;
 		      } while(S>=1);
 		      double W=-std::log(S)/S;
 		      return dim2::Point<double>(W*V1,W*V2);
+		    }
 		    ///@}
 		  };
 		  extern Random rnd;
+		}
 		#endif

lemon/suurballe.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_SUURBALLE_H
 		#define LEMON_SUURBALLE_H
 		///\ingroup shortest_path
 		///\file
 		///\brief An algorithm for finding arc-disjoint paths between two
 		/// nodes having minimum total length.
 		#include <vector>
 		#include <lemon/bin_heap.h>
 		#include <lemon/path.h>
 		#include <lemon/list_graph.h>
 		#include <lemon/maps.h>
 		namespace lemon {
 		  /// \addtogroup shortest_path
 		  /// @{
 		  /// \brief Algorithm for finding arc-disjoint paths between two nodes
 		  /// having minimum total length.
 		  ///
 		  /// \ref lemon::Suurballe "Suurballe" implements an algorithm for
 		  /// finding arc-disjoint paths having minimum total length (cost)
 		  /// from a given source node to a given target node in a digraph.
 		  ///
 		  /// In fact, this implementation is the specialization of the
 		  /// \ref CapacityScaling "successive shortest path" algorithm.
 		  ///
 		  /// \tparam GR The digraph type the algorithm runs on.
 		  /// The default value is \c ListDigraph.
 		  /// \tparam LEN The type of the length (cost) map.
 		  /// The default value is <tt>Digraph::ArcMap<int></tt>.
 		  ///
 		  /// \warning Length values should be \e non-negative \e integers.
 		  ///
 		  /// \note For finding node-disjoint paths this algorithm can be used
 		  /// with \ref SplitNodes.
 		#ifdef DOXYGEN
 		  template <typename GR, typename LEN>
 		#else
 		  template < typename GR = ListDigraph,
 		             typename LEN = typename GR::template ArcMap<int> >
 		#endif
 		  class Suurballe
+		  {
 		    TEMPLATE_DIGRAPH_TYPEDEFS(GR);
 		    typedef ConstMap<Arc, int> ConstArcMap;
 		    typedef typename GR::template NodeMap<Arc> PredMap;
 		  public:
 		    /// The type of the digraph the algorithm runs on.
 		    typedef GR Digraph;
 		    /// The type of the length map.
 		    typedef LEN LengthMap;
 		    /// The type of the lengths.
 		    typedef typename LengthMap::Value Length;
 		    /// The type of the flow map.
 		    typedef typename Digraph::template ArcMap<int> FlowMap;
 		    /// The type of the potential map.
 		    typedef typename Digraph::template NodeMap<Length> PotentialMap;
 		    /// The type of the path structures.
 		    typedef SimplePath<Digraph> Path;
 		  private:
 		    /// \brief Special implementation of the Dijkstra algorithm
 		    /// for finding shortest paths in the residual network.
 		    ///
 		    /// \ref ResidualDijkstra is a special implementation of the
 		    /// \ref Dijkstra algorithm for finding shortest paths in the
 		    /// residual network of the digraph with respect to the reduced arc
 		    /// lengths and modifying the node potentials according to the
 		    /// distance of the nodes.
 		    class ResidualDijkstra
+		    {
 		      typedef typename Digraph::template NodeMap<int> HeapCrossRef;
 		      typedef BinHeap<Length, HeapCrossRef> Heap;
 		    private:
 		      // The digraph the algorithm runs on
 		      const Digraph &_graph;
 		      // The main maps
 		      const FlowMap &_flow;
 		      const LengthMap &_length;
 		      PotentialMap &_potential;
 		      // The distance map
 		      PotentialMap _dist;
 		      // The pred arc map
 		      PredMap &_pred;
 		      // The processed (i.e. permanently labeled) nodes
 		      std::vector<Node> _proc_nodes;
 		      Node _s;
 		      Node _t;
 		    public:
 		      /// Constructor.
 		      ResidualDijkstra( const Digraph &digraph,
 		                        const FlowMap &flow,
 		                        const LengthMap &length,
 		                        PotentialMap &potential,
 		                        PredMap &pred,
 		                        Node s, Node t ) :
 		        _graph(digraph), _flow(flow), _length(length), _potential(potential),
 		        _dist(digraph), _pred(pred), _s(s), _t(t) {}
 		      /// \brief Run the algorithm. It returns \c true if a path is found
 		      /// from the source node to the target node.
 		      bool run() {
 		        HeapCrossRef heap_cross_ref(_graph, Heap::PRE_HEAP);
 		        Heap heap(heap_cross_ref);
 		        heap.push(_s, 0);
 		        _pred[_s] = INVALID;
 		        _proc_nodes.clear();
 		        // Process nodes
 		        while (!heap.empty() && heap.top() != _t) {
 		          Node u = heap.top(), v;
 		          Length d = heap.prio() + _potential[u], nd;
 		          _dist[u] = heap.prio();
 		          heap.pop();
 		          _proc_nodes.push_back(u);
 		          // Traverse outgoing arcs
 		          for (OutArcIt e(_graph, u); e != INVALID; ++e) {
 		            if (_flow[e] == 0) {
 		              v = _graph.target(e);
 		              switch(heap.state(v)) {
 		              case Heap::PRE_HEAP:
 		                heap.push(v, d + _length[e] - _potential[v]);
 		                _pred[v] = e;
 		                break;
 		              case Heap::IN_HEAP:
 		                nd = d + _length[e] - _potential[v];
 		                if (nd < heap[v]) {
 		                  heap.decrease(v, nd);
 		                  _pred[v] = e;
+		                }
 		                break;
 		              case Heap::POST_HEAP:
 		                break;
+		              }
+		            }
+		          }
 		          // Traverse incoming arcs
 		          for (InArcIt e(_graph, u); e != INVALID; ++e) {
 		            if (_flow[e] == 1) {
 		              v = _graph.source(e);
 		              switch(heap.state(v)) {
 		              case Heap::PRE_HEAP:
 		                heap.push(v, d - _length[e] - _potential[v]);
 		                _pred[v] = e;
 		                break;
 		              case Heap::IN_HEAP:
 		                nd = d - _length[e] - _potential[v];
 		                if (nd < heap[v]) {
 		                  heap.decrease(v, nd);
 		                  _pred[v] = e;
+		                }
 		                break;
 		              case Heap::POST_HEAP:
 		                break;
+		              }
+		            }
+		          }
+		        }
 		        if (heap.empty()) return false;
 		        // Update potentials of processed nodes
 		        Length t_dist = heap.prio();
 		        for (int i = 0; i < int(_proc_nodes.size()); ++i)
 		          _potential[_proc_nodes[i]] += _dist[_proc_nodes[i]] - t_dist;
 		        return true;
+		      }
 		    }; //class ResidualDijkstra
 		  private:
 		    // The digraph the algorithm runs on
 		    const Digraph &_graph;
 		    // The length map
 		    const LengthMap &_length;
 		    // Arc map of the current flow
 		    FlowMap *_flow;
 		    bool _local_flow;
 		    // Node map of the current potentials
 		    PotentialMap *_potential;
 		    bool _local_potential;
 		    // The source node
 		    Node _source;
 		    // The target node
 		    Node _target;
 		    // Container to store the found paths
 		    std::vector< SimplePath<Digraph> > paths;
 		    int _path_num;
 		    // The pred arc map
 		    PredMap _pred;
 		    // Implementation of the Dijkstra algorithm for finding augmenting
 		    // shortest paths in the residual network
 		    ResidualDijkstra *_dijkstra;
 		  public:
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor.
 		    ///
 		    /// \param digraph The digraph the algorithm runs on.
 		    /// \param length The length (cost) values of the arcs.
 		    /// \param s The source node.
 		    /// \param t The target node.
 		    Suurballe( const Digraph &digraph,
 		               const LengthMap &length,
 		               Node s, Node t ) :
 		      _graph(digraph), _length(length), _flow(0), _local_flow(false),
 		      _potential(0), _local_potential(false), _source(s), _target(t),
 		      _pred(digraph) {}
 		    /// Destructor.
 		    ~Suurballe() {
 		      if (_local_flow) delete _flow;
 		      if (_local_potential) delete _potential;
 		      delete _dijkstra;
+		    }
 		    /// \brief Set the flow map.
 		    ///
 		    /// This function sets the flow map.
 		    ///
 		    /// The found flow contains only 0 and 1 values. It is the union of
 		    /// the found arc-disjoint paths.
 		    ///
 		    /// \return <tt>(*this)</tt>
 		    Suurballe& flowMap(FlowMap &map) {
 		      if (_local_flow) {
 		        delete _flow;
 		        _local_flow = false;
+		      }
 		      _flow = &map;
 		      return *this;
+		    }
 		    /// \brief Set the potential map.
 		    ///
 		    /// This function sets the potential map.
 		    ///
 		    /// The potentials provide the dual solution of the underlying
 		    /// minimum cost flow problem.
 		    ///
 		    /// \return <tt>(*this)</tt>
 		    Suurballe& potentialMap(PotentialMap &map) {
 		      if (_local_potential) {
 		        delete _potential;
 		        _local_potential = false;
+		      }
 		      _potential = &map;
 		      return *this;
+		    }
-		    /// \name Execution control
+		    /// \name Execution Control
 		    /// The simplest way to execute the algorithm is to call the run()
 		    /// function.
 		    /// \n
 		    /// If you only need the flow that is the union of the found
 		    /// arc-disjoint paths, you may call init() and findFlow().
 		    /// @{
 		    /// \brief Run the algorithm.
 		    ///
 		    /// This function runs the algorithm.
 		    ///
 		    /// \param k The number of paths to be found.
 		    ///
 		    /// \return \c k if there are at least \c k arc-disjoint paths from
 		    /// \c s to \c t in the digraph. Otherwise it returns the number of
 		    /// arc-disjoint paths found.
 		    ///
 		    /// \note Apart from the return value, <tt>s.run(k)</tt> is just a
 		    /// shortcut of the following code.
 		    /// \code
 		    ///   s.init();
 		    ///   s.findFlow(k);
 		    ///   s.findPaths();
 		    /// \endcode
 		    int run(int k = 2) {
 		      init();
 		      findFlow(k);
 		      findPaths();
 		      return _path_num;
+		    }
 		    /// \brief Initialize the algorithm.
 		    ///
 		    /// This function initializes the algorithm.
 		    void init() {
 		      // Initialize maps
 		      if (!_flow) {
 		        _flow = new FlowMap(_graph);
 		        _local_flow = true;
+		      }
 		      if (!_potential) {
 		        _potential = new PotentialMap(_graph);
 		        _local_potential = true;
+		      }
 		      for (ArcIt e(_graph); e != INVALID; ++e) (*_flow)[e] = 0;
 		      for (NodeIt n(_graph); n != INVALID; ++n) (*_potential)[n] = 0;
 		      _dijkstra = new ResidualDijkstra( _graph, *_flow, _length,
 		                                        *_potential, _pred,
 		                                        _source, _target );
+		    }
 		    /// \brief Execute the successive shortest path algorithm to find
 		    /// an optimal flow.
 		    ///
 		    /// This function executes the successive shortest path algorithm to
 		    /// find a minimum cost flow, which is the union of \c k or less
 		    /// arc-disjoint paths.
 		    ///
 		    /// \return \c k if there are at least \c k arc-disjoint paths from
 		    /// \c s to \c t in the digraph. Otherwise it returns the number of
 		    /// arc-disjoint paths found.
 		    ///
 		    /// \pre \ref init() must be called before using this function.
 		    int findFlow(int k = 2) {
 		      // Find shortest paths
 		      _path_num = 0;
 		      while (_path_num < k) {
 		        // Run Dijkstra
 		        if (!_dijkstra->run()) break;
 		        ++_path_num;
 		        // Set the flow along the found shortest path
 		        Node u = _target;
 		        Arc e;
 		        while ((e = _pred[u]) != INVALID) {
 		          if (u == _graph.target(e)) {
 		            (*_flow)[e] = 1;
 		            u = _graph.source(e);
 		          } else {
 		            (*_flow)[e] = 0;
 		            u = _graph.target(e);
+		          }
+		        }
+		      }
 		      return _path_num;
+		    }
 		    /// \brief Compute the paths from the flow.
 		    ///
 		    /// This function computes the paths from the flow.
 		    ///
 		    /// \pre \ref init() and \ref findFlow() must be called before using
 		    /// this function.
 		    void findPaths() {
 		      // Create the residual flow map (the union of the paths not found
 		      // so far)
 		      FlowMap res_flow(_graph);
 		      for(ArcIt a(_graph); a != INVALID; ++a) res_flow[a] = (*_flow)[a];
 		      paths.clear();
 		      paths.resize(_path_num);
 		      for (int i = 0; i < _path_num; ++i) {
 		        Node n = _source;
 		        while (n != _target) {
 		          OutArcIt e(_graph, n);
 		          for ( ; res_flow[e] == 0; ++e) ;
 		          n = _graph.target(e);
 		          paths[i].addBack(e);
 		          res_flow[e] = 0;
+		        }
+		      }
+		    }
 		    /// @}
 		    /// \name Query Functions
 		    /// The results of the algorithm can be obtained using these
 		    /// functions.
 		    /// \n The algorithm should be executed before using them.
 		    /// @{
 		    /// \brief Return a const reference to the arc map storing the
 		    /// found flow.
 		    ///
 		    /// This function returns a const reference to the arc map storing
 		    /// the flow that is the union of the found arc-disjoint paths.
 		    ///
 		    /// \pre \ref run() or \ref findFlow() must be called before using
 		    /// this function.
 		    const FlowMap& flowMap() const {
 		      return *_flow;
+		    }
 		    /// \brief Return a const reference to the node map storing the
 		    /// found potentials (the dual solution).
 		    ///
 		    /// This function returns a const reference to the node map storing
 		    /// the found potentials that provide the dual solution of the
 		    /// underlying minimum cost flow problem.
 		    ///
 		    /// \pre \ref run() or \ref findFlow() must be called before using
 		    /// this function.
 		    const PotentialMap& potentialMap() const {
 		      return *_potential;
+		    }
 		    /// \brief Return the flow on the given arc.
 		    ///
 		    /// This function returns the flow on the given arc.
 		    /// It is \c 1 if the arc is involved in one of the found paths,
 		    /// otherwise it is \c 0.
 		    ///
 		    /// \pre \ref run() or \ref findFlow() must be called before using
 		    /// this function.
 		    int flow(const Arc& arc) const {
 		      return (*_flow)[arc];
+		    }
 		    /// \brief Return the potential of the given node.
 		    ///
 		    /// This function returns the potential of the given node.
 		    ///
 		    /// \pre \ref run() or \ref findFlow() must be called before using
 		    /// this function.
 		    Length potential(const Node& node) const {
 		      return (*_potential)[node];
+		    }
 		    /// \brief Return the total length (cost) of the found paths (flow).
 		    ///
 		    /// This function returns the total length (cost) of the found paths
 		    /// (flow). The complexity of the function is O(e).
 		    ///
 		    /// \pre \ref run() or \ref findFlow() must be called before using
 		    /// this function.
 		    Length totalLength() const {
 		      Length c = 0;
 		      for (ArcIt e(_graph); e != INVALID; ++e)
 		        c += (*_flow)[e] * _length[e];
 		      return c;
+		    }
 		    /// \brief Return the number of the found paths.
 		    ///
 		    /// This function returns the number of the found paths.
 		    ///
 		    /// \pre \ref run() or \ref findFlow() must be called before using
 		    /// this function.
 		    int pathNum() const {
 		      return _path_num;
+		    }
 		    /// \brief Return a const reference to the specified path.
 		    ///
 		    /// This function returns a const reference to the specified path.
 		    ///
 		    /// \param i The function returns the \c i-th path.
 		    /// \c i must be between \c 0 and <tt>%pathNum()-1</tt>.
 		    ///
 		    /// \pre \ref run() or \ref findPaths() must be called before using
 		    /// this function.
 		    Path path(int i) const {
 		      return paths[i];
+		    }
 		    /// @}
 		  }; //class Suurballe
 		  ///@}
 		} //namespace lemon
 		#endif //LEMON_SUURBALLE_H

lemon/time_measure.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_TIME_MEASURE_H
 		#define LEMON_TIME_MEASURE_H
 		///\ingroup timecount
 		///\file
 		///\brief Tools for measuring cpu usage
 		#ifdef WIN32
 		#include <lemon/bits/windows.h>
 		#else
 		#include <unistd.h>
 		#include <sys/times.h>
 		#include <sys/time.h>
 		#endif
 		#include <string>
 		#include <fstream>
 		#include <iostream>
 		namespace lemon {
 		  /// \addtogroup timecount
 		  /// @{
 		  /// A class to store (cpu)time instances.
 		  /// This class stores five time values.
 		  /// - a real time
 		  /// - a user cpu time
 		  /// - a system cpu time
 		  /// - a user cpu time of children
 		  /// - a system cpu time of children
 		  ///
 		  /// TimeStamp's can be added to or substracted from each other and
 		  /// they can be pushed to a stream.
 		  ///
 		  /// In most cases, perhaps the \ref Timer or the \ref TimeReport
 		  /// class is what you want to use instead.
 		  class TimeStamp
+		  {
 		    double utime;
 		    double stime;
 		    double cutime;
 		    double cstime;
 		    double rtime;
 		    void _reset() {
 		      utime = stime = cutime = cstime = rtime = 0;
+		    }
 		  public:
 		    ///Read the current time values of the process
 		    void stamp()
+		    {
 		#ifndef WIN32
 		      timeval tv;
 		      gettimeofday(&tv, 0);
 		      rtime=tv.tv_sec+double(tv.tv_usec)/1e6;
 		      tms ts;
 		      double tck=sysconf(_SC_CLK_TCK);
 		      times(&ts);
 		      utime=ts.tms_utime/tck;
 		      stime=ts.tms_stime/tck;
 		      cutime=ts.tms_cutime/tck;
 		      cstime=ts.tms_cstime/tck;
 		#else
 		      bits::getWinProcTimes(rtime, utime, stime, cutime, cstime);
 		#endif
+		    }
 		    /// Constructor initializing with zero
 		    TimeStamp()
 		    { _reset(); }
 		    ///Constructor initializing with the current time values of the process
 		    TimeStamp(void *) { stamp();}
 		    ///Set every time value to zero
 		    TimeStamp &reset() {_reset();return *this;}
 		    ///\e
 		    TimeStamp &operator+=(const TimeStamp &b)
+		    {
 		      utime+=b.utime;
 		      stime+=b.stime;
 		      cutime+=b.cutime;
 		      cstime+=b.cstime;
 		      rtime+=b.rtime;
 		      return *this;
+		    }
 		    ///\e
 		    TimeStamp operator+(const TimeStamp &b) const
+		    {
 		      TimeStamp t(*this);
 		      return t+=b;
+		    }
 		    ///\e
 		    TimeStamp &operator-=(const TimeStamp &b)
+		    {
 		      utime-=b.utime;
 		      stime-=b.stime;
 		      cutime-=b.cutime;
 		      cstime-=b.cstime;
 		      rtime-=b.rtime;
 		      return *this;
+		    }
 		    ///\e
 		    TimeStamp operator-(const TimeStamp &b) const
+		    {
 		      TimeStamp t(*this);
 		      return t-=b;
+		    }
 		    ///\e
 		    TimeStamp &operator*=(double b)
+		    {
 		      utime*=b;
 		      stime*=b;
 		      cutime*=b;
 		      cstime*=b;
 		      rtime*=b;
 		      return *this;
+		    }
 		    ///\e
 		    TimeStamp operator*(double b) const
+		    {
 		      TimeStamp t(*this);
 		      return t*=b;
+		    }
 		    friend TimeStamp operator*(double b,const TimeStamp &t);
 		    ///\e
 		    TimeStamp &operator/=(double b)
+		    {
 		      utime/=b;
 		      stime/=b;
 		      cutime/=b;
 		      cstime/=b;
 		      rtime/=b;
 		      return *this;
+		    }
 		    ///\e
 		    TimeStamp operator/(double b) const
+		    {
 		      TimeStamp t(*this);
 		      return t/=b;
+		    }
 		    ///The time ellapsed since the last call of stamp()
 		    TimeStamp ellapsed() const
+		    {
 		      TimeStamp t(NULL);
 		      return t-*this;
+		    }
 		    friend std::ostream& operator<<(std::ostream& os,const TimeStamp &t);
 		    ///Gives back the user time of the process
 		    double userTime() const
+		    {
 		      return utime;
+		    }
 		    ///Gives back the system time of the process
 		    double systemTime() const
+		    {
 		      return stime;
+		    }
 		    ///Gives back the user time of the process' children
 		    ///\note On <tt>WIN32</tt> platform this value is not calculated.
 		    ///
 		    double cUserTime() const
+		    {
 		      return cutime;
+		    }
 		    ///Gives back the user time of the process' children
 		    ///\note On <tt>WIN32</tt> platform this value is not calculated.
 		    ///
 		    double cSystemTime() const
+		    {
 		      return cstime;
+		    }
 		    ///Gives back the real time
 		    double realTime() const {return rtime;}
 		  };
 		  inline TimeStamp operator*(double b,const TimeStamp &t)
+		  {
 		    return t*b;
+		  }
 		  ///Prints the time counters
 		  ///Prints the time counters in the following form:
 		  ///
 		  /// <tt>u: XX.XXs s: XX.XXs cu: XX.XXs cs: XX.XXs real: XX.XXs</tt>
 		  ///
 		  /// where the values are the
 		  /// \li \c u: user cpu time,
 		  /// \li \c s: system cpu time,
 		  /// \li \c cu: user cpu time of children,
 		  /// \li \c cs: system cpu time of children,
 		  /// \li \c real: real time.
 		  /// \relates TimeStamp
 		  /// \note On <tt>WIN32</tt> platform the cummulative values are not
 		  /// calculated.
 		  inline std::ostream& operator<<(std::ostream& os,const TimeStamp &t)
+		  {
 		    os << "u: " << t.userTime() <<
 		      "s, s: " << t.systemTime() <<
 		      "s, cu: " << t.cUserTime() <<
 		      "s, cs: " << t.cSystemTime() <<
 		      "s, real: " << t.realTime() << "s";
 		    return os;
+		  }
 		  ///Class for measuring the cpu time and real time usage of the process
 		  ///Class for measuring the cpu time and real time usage of the process.
 		  ///It is quite easy-to-use, here is a short example.
 		  ///\code
 		  /// #include<lemon/time_measure.h>
 		  /// #include<iostream>
 		  ///
 		  /// int main()
 		  /// {
 		  ///
 		  ///   ...
 		  ///
 		  ///   Timer t;
 		  ///   doSomething();
 		  ///   std::cout << t << '\n';
 		  ///   t.restart();
 		  ///   doSomethingElse();
 		  ///   std::cout << t << '\n';
 		  ///
 		  ///   ...
 		  ///
 		  /// }
 		  ///\endcode
 		  ///
 		  ///The \ref Timer can also be \ref stop() "stopped" and
 		  ///\ref start() "started" again, so it is possible to compute collected
 		  ///running times.
 		  ///
 		  ///\warning Depending on the operation system and its actual configuration
 		  ///the time counters have a certain (10ms on a typical Linux system)
 		  ///granularity.
 		  ///Therefore this tool is not appropriate to measure very short times.
 		  ///Also, if you start and stop the timer very frequently, it could lead to
 		  ///distorted results.
 		  ///
 		  ///\note If you want to measure the running time of the execution of a certain
 		  ///function, consider the usage of \ref TimeReport instead.
 		  ///
 		  ///\sa TimeReport
 		  class Timer
+		  {
 		    int _running; //Timer is running iff _running>0; (_running>=0 always holds)
 		    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:
 		    ///Constructor.
 		    ///\param run indicates whether or not the timer starts immediately.
 		    ///
 		    Timer(bool run=true) :_running(run) {_reset();}
-		    ///\name Control the state of the timer
+		    ///\name Control the State of the Timer
 		    ///Basically a Timer can be either running or stopped,
 		    ///but it provides a bit finer control on the execution.
 		    ///The \ref lemon::Timer "Timer" also counts the number of
 		    ///\ref lemon::Timer::start() "start()" executions, and it stops
 		    ///only after the same amount (or more) \ref lemon::Timer::stop()
 		    ///"stop()"s. This can be useful e.g. to compute the running time
 		    ///of recursive functions.
 		    ///@{
 		    ///Reset and stop the time counters
 		    ///This function resets and stops the time counters
 		    ///\sa restart()
 		    void reset()
+		    {
 		      _running=0;
 		      _reset();
+		    }
 		    ///Start the time counters
 		    ///This function starts the time counters.
 		    ///
 		    ///If the timer is started more than ones, it will remain running
 		    ///until the same amount of \ref stop() is called.
 		    ///\sa stop()
 		    void start()
+		    {
 		      if(_running) _running++;
 		      else {
 		        _running=1;
 		        TimeStamp t;
 		        t.stamp();
 		        start_time=t-start_time;
+		      }
+		    }
 		    ///Stop the time counters
 		    ///This function stops the time counters. If start() was executed more than
 		    ///once, then the same number of stop() execution is necessary the really
 		    ///stop the timer.
 		    ///
 		    ///\sa halt()
 		    ///\sa start()
 		    ///\sa restart()
 		    ///\sa reset()
 		    void stop()
+		    {
 		      if(_running && !--_running) {
 		        TimeStamp t;
 		        t.stamp();
 		        start_time=t-start_time;
+		      }
+		    }
 		    ///Halt (i.e stop immediately) the time counters
 		    ///This function stops immediately the time counters, i.e. <tt>t.halt()</tt>
 		    ///is a faster
 		    ///equivalent of the following.
 		    ///\code
 		    ///  while(t.running()) t.stop()
 		    ///\endcode
 		    ///
 		    ///
 		    ///\sa stop()
 		    ///\sa restart()
 		    ///\sa reset()
 		    void halt()
+		    {
 		      if(_running) {
 		        _running=0;
 		        TimeStamp t;
 		        t.stamp();
 		        start_time=t-start_time;
+		      }
+		    }
 		    ///Returns the running state of the timer
 		    ///This function returns the number of stop() exections that is
 		    ///necessary to really stop the timer.
 		    ///For example the timer
 		    ///is running if and only if the return value is \c true
 		    ///(i.e. greater than
 		    ///zero).
 		    int running()  { return _running; }
 		    ///Restart the time counters
 		    ///This function is a shorthand for
 		    ///a reset() and a start() calls.
 		    ///
 		    void restart()
+		    {
 		      reset();
 		      start();
+		    }
 		    ///@}
-		    ///\name Query Functions for the ellapsed time
+		    ///\name Query Functions for the Ellapsed Time
 		    ///@{
 		    ///Gives back the ellapsed user time of the process
 		    double userTime() const
+		    {
 		      return operator TimeStamp().userTime();
+		    }
 		    ///Gives back the ellapsed system time of the process
 		    double systemTime() const
+		    {
 		      return operator TimeStamp().systemTime();
+		    }
 		    ///Gives back the ellapsed user time of the process' children
 		    ///\note On <tt>WIN32</tt> platform this value is not calculated.
 		    ///
 		    double cUserTime() const
+		    {
 		      return operator TimeStamp().cUserTime();
+		    }
 		    ///Gives back the ellapsed user time of the process' children
 		    ///\note On <tt>WIN32</tt> platform this value is not calculated.
 		    ///
 		    double cSystemTime() const
+		    {
 		      return operator TimeStamp().cSystemTime();
+		    }
 		    ///Gives back the ellapsed real time
 		    double realTime() const
+		    {
 		      return operator TimeStamp().realTime();
+		    }
 		    ///Computes the ellapsed time
 		    ///This conversion computes the ellapsed time, therefore you can print
 		    ///the ellapsed time like this.
 		    ///\code
 		    ///  Timer t;
 		    ///  doSomething();
 		    ///  std::cout << t << '\n';
 		    ///\endcode
 		    operator TimeStamp () const
+		    {
 		      TimeStamp t;
 		      t.stamp();
 		      return _running?t-start_time:start_time;
+		    }
 		    ///@}
 		  };
 		  ///Same as Timer but prints a report on destruction.
 		  ///Same as \ref Timer but prints a report on destruction.
 		  ///This example shows its usage.
 		  ///\code
 		  ///  void myAlg(ListGraph &g,int n)
 		  ///  {
 		  ///    TimeReport tr("Running time of myAlg: ");
 		  ///    ... //Here comes the algorithm
 		  ///  }
 		  ///\endcode
 		  ///
 		  ///\sa Timer
 		  ///\sa NoTimeReport
 		  class TimeReport : public Timer
+		  {
 		    std::string _title;
 		    std::ostream &_os;
 		  public:
 		    ///Constructor
 		    ///Constructor.
 		    ///\param title This text will be printed before the ellapsed time.
 		    ///\param os The stream to print the report to.
 		    ///\param run Sets whether the timer should start immediately.
 		    TimeReport(std::string title,std::ostream &os=std::cerr,bool run=true)
 		      : Timer(run), _title(title), _os(os){}
 		    ///Destructor that prints the ellapsed time
 		    ~TimeReport()
+		    {
 		      _os << _title << *this << std::endl;
+		    }
 		  };
 		  ///'Do nothing' version of TimeReport
 		  ///\sa TimeReport
 		  ///
 		  class NoTimeReport
+		  {
 		  public:
 		    ///\e
 		    NoTimeReport(std::string,std::ostream &,bool) {}
 		    ///\e
 		    NoTimeReport(std::string,std::ostream &) {}
 		    ///\e
 		    NoTimeReport(std::string) {}
 		    ///\e Do nothing.
 		    ~NoTimeReport() {}
 		    operator TimeStamp () const { return TimeStamp(); }
 		    void reset() {}
 		    void start() {}
 		    void stop() {}
 		    void halt() {}
 		    int running() { return 0; }
 		    void restart() {}
 		    double userTime() const { return 0; }
 		    double systemTime() const { return 0; }
 		    double cUserTime() const { return 0; }
 		    double cSystemTime() const { return 0; }
 		    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
 		  ///that the full real running time will be roughly between \c min_time
 		  ///and <tt>2*min_time</tt>.
 		  ///\param f the function object to be measured.
 		  ///\param min_time the minimum total running time.
 		  ///\retval num if it is not \c NULL, then the actual
 		  ///        number of execution of \c f will be written into <tt>*num</tt>.
 		  ///\retval full_time if it is not \c NULL, then the actual
 		  ///        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,
 		                            TimeStamp *full_time=NULL)
+		  {
 		    TimeStamp full;
 		    unsigned int total=0;
 		    Timer t;
 		    for(unsigned int tn=1;tn <= 1U<<31 && full.realTime()<=min_time; tn*=2) {
 		      for(;total<tn;total++) f();
 		      full=t;
+		    }
 		    if(num) *num=total;
 		    if(full_time) *full_time=full;
 		    return full/total;
+		  }
 		  /// @}
 		} //namespace lemon
 		#endif //LEMON_TIME_MEASURE_H

tools/dimacs-solver.cc

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		///\ingroup tools
 		///\file
 		///\brief DIMACS problem solver.
 		///
 		/// This program solves various problems given in DIMACS format.
 		///
 		/// See
 		/// \verbatim
 		///  dimacs-solver --help
-		/// \endverbatim
+		/// \code
 		///   dimacs-solver --help
 		/// \endcode
 		/// for more info on usage.
 		///
 		#include <iostream>
 		#include <fstream>
 		#include <cstring>
 		#include <lemon/smart_graph.h>
 		#include <lemon/dimacs.h>
 		#include <lemon/lgf_writer.h>
 		#include <lemon/time_measure.h>
 		#include <lemon/arg_parser.h>
 		#include <lemon/error.h>
 		#include <lemon/dijkstra.h>
 		#include <lemon/preflow.h>
 		#include <lemon/max_matching.h>
 		using namespace lemon;
 		typedef SmartDigraph Digraph;
 		DIGRAPH_TYPEDEFS(Digraph);
 		typedef SmartGraph Graph;
 		template<class Value>
 		void solve_sp(ArgParser &ap, std::istream &is, std::ostream &,
 		              DimacsDescriptor &desc)
+		{
 		  bool report = !ap.given("q");
 		  Digraph g;
 		  Node s;
 		  Digraph::ArcMap<Value> len(g);
 		  Timer t;
 		  t.restart();
 		  readDimacsSp(is, g, len, s, desc);
 		  if(report) std::cerr << "Read the file: " << t << '\n';
 		  t.restart();
 		  Dijkstra<Digraph, Digraph::ArcMap<Value> > dij(g,len);
 		  if(report) std::cerr << "Setup Dijkstra class: " << t << '\n';
 		  t.restart();
 		  dij.run(s);
 		  if(report) std::cerr << "Run Dijkstra: " << t << '\n';
+		}
 		template<class Value>
 		void solve_max(ArgParser &ap, std::istream &is, std::ostream &,
 		               Value infty, DimacsDescriptor &desc)
+		{
 		  bool report = !ap.given("q");
 		  Digraph g;
 		  Node s,t;
 		  Digraph::ArcMap<Value> cap(g);
 		  Timer ti;
 		  ti.restart();
 		  readDimacsMax(is, g, cap, s, t, infty, desc);
 		  if(report) std::cerr << "Read the file: " << ti << '\n';
 		  ti.restart();
 		  Preflow<Digraph, Digraph::ArcMap<Value> > pre(g,cap,s,t);
 		  if(report) std::cerr << "Setup Preflow class: " << ti << '\n';
 		  ti.restart();
 		  pre.run();
 		  if(report) std::cerr << "Run Preflow: " << ti << '\n';
 		  if(report) std::cerr << "\nMax flow value: " << pre.flowValue() << '\n';
+		}
 		void solve_mat(ArgParser &ap, std::istream &is, std::ostream &,
 		              DimacsDescriptor &desc)
+		{
 		  bool report = !ap.given("q");
 		  Graph g;
 		  Timer ti;
 		  ti.restart();
 		  readDimacsMat(is, g, desc);
 		  if(report) std::cerr << "Read the file: " << ti << '\n';
 		  ti.restart();
 		  MaxMatching<Graph> mat(g);
 		  if(report) std::cerr << "Setup MaxMatching class: " << ti << '\n';
 		  ti.restart();
 		  mat.run();
 		  if(report) std::cerr << "Run MaxMatching: " << ti << '\n';
 		  if(report) std::cerr << "\nCardinality of max matching: "
 		                       << mat.matchingSize() << '\n';
+		}
 		template<class Value>
 		void solve(ArgParser &ap, std::istream &is, std::ostream &os,
 		           DimacsDescriptor &desc)
+		{
 		  std::stringstream iss(static_cast<std::string>(ap["infcap"]));
 		  Value infty;
 		  iss >> infty;
 		  if(iss.fail())
+		    {
 		      std::cerr << "Cannot interpret '"
 		                << static_cast<std::string>(ap["infcap"]) << "' as infinite"
 		                << std::endl;
 		      exit(1);
+		    }
 		  switch(desc.type)
+		    {
 		    case DimacsDescriptor::MIN:
 		      std::cerr <<
 		        "\n\n Sorry, the min. cost flow solver is not yet available.\n";
 		      break;
 		    case DimacsDescriptor::MAX:
 		      solve_max<Value>(ap,is,os,infty,desc);
 		      break;
 		    case DimacsDescriptor::SP:
 		      solve_sp<Value>(ap,is,os,desc);
 		      break;
 		    case DimacsDescriptor::MAT:
 		      solve_mat(ap,is,os,desc);
 		      break;
 		    default:
 		      break;
+		    }
+		}
 		int main(int argc, const char *argv[]) {
 		  typedef SmartDigraph Digraph;
 		  typedef Digraph::Arc Arc;
 		  std::string inputName;
 		  std::string outputName;
 		  ArgParser ap(argc, argv);
 		  ap.other("[INFILE [OUTFILE]]",
 		           "If either the INFILE or OUTFILE file is missing the standard\n"
 		           "     input/output will be used instead.")
 		    .boolOption("q", "Do not print any report")
 		    .boolOption("int","Use 'int' for capacities, costs etc. (default)")
 		    .optionGroup("datatype","int")
 		#ifdef HAVE_LONG_LONG
 		    .boolOption("long","Use 'long long' for capacities, costs etc.")
 		    .optionGroup("datatype","long")
 		#endif
 		    .boolOption("double","Use 'double' for capacities, costs etc.")
 		    .optionGroup("datatype","double")
 		    .boolOption("ldouble","Use 'long double' for capacities, costs etc.")
 		    .optionGroup("datatype","ldouble")
 		    .onlyOneGroup("datatype")
 		    .stringOption("infcap","Value used for 'very high' capacities","0")
 		    .run();
 		  std::ifstream input;
 		  std::ofstream output;
 		  switch(ap.files().size())
+		    {
 		    case 2:
 		      output.open(ap.files()[1].c_str());
 		      if (!output) {
 		        throw IoError("Cannot open the file for writing", ap.files()[1]);
+		      }
 		    case 1:
 		      input.open(ap.files()[0].c_str());
 		      if (!input) {
 		        throw IoError("File cannot be found", ap.files()[0]);
+		      }
 		    case 0:
 		      break;
 		    default:
 		      std::cerr << ap.commandName() << ": too many arguments\n";
 		      return 1;
+		    }
 		  std::istream& is = (ap.files().size()<1 ? std::cin : input);
 		  std::ostream& os = (ap.files().size()<2 ? std::cout : output);
 		  DimacsDescriptor desc = dimacsType(is);
 		  if(!ap.given("q"))
+		    {
 		      std::cout << "Problem type: ";
 		      switch(desc.type)
+		        {
 		        case DimacsDescriptor::MIN:
 		          std::cout << "min";
 		          break;
 		        case DimacsDescriptor::MAX:
 		          std::cout << "max";
 		          break;
 		        case DimacsDescriptor::SP:
 		          std::cout << "sp";
 		        case DimacsDescriptor::MAT:
 		          std::cout << "mat";
 		          break;
 		        default:
 		          exit(1);
 		          break;
+		        }
 		      std::cout << "\nNum of nodes: " << desc.nodeNum;
 		      std::cout << "\nNum of arcs:  " << desc.edgeNum;
 		      std::cout << "\n\n";
+		    }
 		  if(ap.given("double"))
 		    solve<double>(ap,is,os,desc);
 		  else if(ap.given("ldouble"))
 		    solve<long double>(ap,is,os,desc);
 		#ifdef HAVE_LONG_LONG
 		  else if(ap.given("long"))
 		    solve<long long>(ap,is,os,desc);
 		#endif
 		  else solve<int>(ap,is,os,desc);
 		  return 0;
+		}

tools/dimacs-to-lgf.cc

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		///\ingroup tools
 		///\file
 		///\brief DIMACS to LGF converter.
 		///
 		/// This program converts various DIMACS formats to the LEMON Digraph Format
 		/// (LGF).
 		///
 		/// See
 		/// \verbatim
 		///  dimacs-to-lgf --help
 		/// \endverbatim
 		/// for more info on usage.
 		///
+		/// \code
 		///   dimacs-to-lgf --help
 		/// \endcode
 		/// for more info on the usage.
 		#include <iostream>
 		#include <fstream>
 		#include <cstring>
 		#include <lemon/smart_graph.h>
 		#include <lemon/dimacs.h>
 		#include <lemon/lgf_writer.h>
 		#include <lemon/arg_parser.h>
 		#include <lemon/error.h>
 		using namespace std;
 		using namespace lemon;
 		int main(int argc, const char *argv[]) {
 		  typedef SmartDigraph Digraph;
 		  typedef Digraph::Arc Arc;
 		  typedef Digraph::Node Node;
 		  typedef Digraph::ArcIt ArcIt;
 		  typedef Digraph::NodeIt NodeIt;
 		  typedef Digraph::ArcMap<double> DoubleArcMap;
 		  typedef Digraph::NodeMap<double> DoubleNodeMap;
 		  std::string inputName;
 		  std::string outputName;
 		  ArgParser ap(argc, argv);
 		  ap.other("[INFILE [OUTFILE]]",
 		           "If either the INFILE or OUTFILE file is missing the standard\n"
 		           "     input/output will be used instead.")
 		    .run();
 		  ifstream input;
 		  ofstream output;
 		  switch(ap.files().size())
+		    {
 		    case 2:
 		      output.open(ap.files()[1].c_str());
 		      if (!output) {
 		        throw IoError("Cannot open the file for writing", ap.files()[1]);
+		      }
 		    case 1:
 		      input.open(ap.files()[0].c_str());
 		      if (!input) {
 		        throw IoError("File cannot be found", ap.files()[0]);
+		      }
 		    case 0:
 		      break;
 		    default:
 		      cerr << ap.commandName() << ": too many arguments\n";
 		      return 1;
+		  }
 		  istream& is = (ap.files().size()<1 ? cin : input);
 		  ostream& os = (ap.files().size()<2 ? cout : output);
 		  DimacsDescriptor desc = dimacsType(is);
 		  switch(desc.type)
+		    {
 		    case DimacsDescriptor::MIN:
+		      {
 		        Digraph digraph;
 		        DoubleArcMap lower(digraph), capacity(digraph), cost(digraph);
 		        DoubleNodeMap supply(digraph);
 		        readDimacsMin(is, digraph, lower, capacity, cost, supply, 0, desc);
 		        DigraphWriter<Digraph>(digraph, os).
 		          nodeMap("supply", supply).
 		          arcMap("lower", lower).
 		          arcMap("capacity", capacity).
 		          arcMap("cost", cost).
 		          attribute("problem","min").
 		          run();
+		      }
 		      break;
 		    case DimacsDescriptor::MAX:
+		      {
 		        Digraph digraph;
 		        Node s, t;
 		        DoubleArcMap capacity(digraph);
 		        readDimacsMax(is, digraph, capacity, s, t, 0, desc);
 		        DigraphWriter<Digraph>(digraph, os).
 		          arcMap("capacity", capacity).
 		          node("source", s).
 		          node("target", t).
 		          attribute("problem","max").
 		          run();
+		      }
 		      break;
 		    case DimacsDescriptor::SP:
+		      {
 		        Digraph digraph;
 		        Node s;
 		        DoubleArcMap capacity(digraph);
 		        readDimacsSp(is, digraph, capacity, s, desc);
 		        DigraphWriter<Digraph>(digraph, os).
 		          arcMap("capacity", capacity).
 		          node("source", s).
 		          attribute("problem","sp").
 		          run();
+		      }
 		      break;
 		    case DimacsDescriptor::MAT:
+		      {
 		        Digraph digraph;
 		        readDimacsMat(is, digraph,desc);
 		        DigraphWriter<Digraph>(digraph, os).
 		          attribute("problem","mat").
 		          run();
+		      }
 		      break;
 		    default:
 		      break;
+		    }
 		  return 0;
+		}

tools/lgf-gen.cc

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		/// \ingroup tools
 		/// \file
 		/// \brief Special plane digraph generator.
 		///
 		/// Graph generator application for various types of plane graphs.
 		///
 		/// See
 		/// \verbatim
 		///  lgf-gen --help
-		/// \endverbatim
+		/// \code
 		///   lgf-gen --help
 		/// \endcode
 		/// for more info on the usage.
 		///
 		#include <algorithm>
 		#include <set>
 		#include <ctime>
 		#include <lemon/list_graph.h>
 		#include <lemon/random.h>
 		#include <lemon/dim2.h>
 		#include <lemon/bfs.h>
 		#include <lemon/counter.h>
 		#include <lemon/suurballe.h>
 		#include <lemon/graph_to_eps.h>
 		#include <lemon/lgf_writer.h>
 		#include <lemon/arg_parser.h>
 		#include <lemon/euler.h>
 		#include <lemon/math.h>
 		#include <lemon/kruskal.h>
 		#include <lemon/time_measure.h>
 		using namespace lemon;
 		typedef dim2::Point<double> Point;
 		GRAPH_TYPEDEFS(ListGraph);
 		bool progress=true;
 		int N;
 		// int girth;
 		ListGraph g;
 		std::vector<Node> nodes;
 		ListGraph::NodeMap<Point> coords(g);
 		double totalLen(){
 		  double tlen=0;
 		  for(EdgeIt e(g);e!=INVALID;++e)
 		    tlen+=sqrt((coords[g.v(e)]-coords[g.u(e)]).normSquare());
 		  return tlen;
+		}
 		int tsp_impr_num=0;
 		const double EPSILON=1e-8;
 		bool tsp_improve(Node u, Node v)
+		{
 		  double luv=std::sqrt((coords[v]-coords[u]).normSquare());
 		  Node u2=u;
 		  Node v2=v;
 		  do {
 		    Node n;
 		    for(IncEdgeIt e(g,v2);(n=g.runningNode(e))==u2;++e) { }
 		    u2=v2;
 		    v2=n;
 		    if(luv+std::sqrt((coords[v2]-coords[u2]).normSquare())-EPSILON>
 		       std::sqrt((coords[u]-coords[u2]).normSquare())+
 		       std::sqrt((coords[v]-coords[v2]).normSquare()))
+		      {
 		         g.erase(findEdge(g,u,v));
 		         g.erase(findEdge(g,u2,v2));
 		        g.addEdge(u2,u);
 		        g.addEdge(v,v2);
 		        tsp_impr_num++;
 		        return true;
+		      }
 		  } while(v2!=u);
 		  return false;
+		}
 		bool tsp_improve(Node u)
+		{
 		  for(IncEdgeIt e(g,u);e!=INVALID;++e)
 		    if(tsp_improve(u,g.runningNode(e))) return true;
 		  return false;
+		}
 		void tsp_improve()
+		{
 		  bool b;
 		  do {
 		    b=false;
 		    for(NodeIt n(g);n!=INVALID;++n)
 		      if(tsp_improve(n)) b=true;
 		  } while(b);
+		}
 		void tsp()
+		{
 		  for(int i=0;i<N;i++) g.addEdge(nodes[i],nodes[(i+1)%N]);
 		  tsp_improve();
+		}
 		class Line
+		{
 		public:
 		  Point a;
 		  Point b;
 		  Line(Point _a,Point _b) :a(_a),b(_b) {}
 		  Line(Node _a,Node _b) : a(coords[_a]),b(coords[_b]) {}
 		  Line(const Arc &e) : a(coords[g.source(e)]),b(coords[g.target(e)]) {}
 		  Line(const Edge &e) : a(coords[g.u(e)]),b(coords[g.v(e)]) {}
 		};
 		inline std::ostream& operator<<(std::ostream &os, const Line &l)
+		{
 		  os << l.a << "->" << l.b;
 		  return os;
+		}
 		bool cross(Line a, Line b)
+		{
 		  Point ao=rot90(a.b-a.a);
 		  Point bo=rot90(b.b-b.a);
 		  return (ao*(b.a-a.a))*(ao*(b.b-a.a))<0 &&
 		    (bo*(a.a-b.a))*(bo*(a.b-b.a))<0;
+		}
 		struct Parc
+		{
 		  Node a;
 		  Node b;
 		  double len;
 		};
 		bool pedgeLess(Parc a,Parc b)
+		{
 		  return a.len<b.len;
+		}
 		std::vector<Edge> arcs;
 		namespace _delaunay_bits {
 		  struct Part {
 		    int prev, curr, next;
 		    Part(int p, int c, int n) : prev(p), curr(c), next(n) {}
 		  };
 		  inline std::ostream& operator<<(std::ostream& os, const Part& part) {
 		    os << '(' << part.prev << ',' << part.curr << ',' << part.next << ')';
 		    return os;
+		  }
 		  inline double circle_point(const Point& p, const Point& q, const Point& r) {
 		    double a = p.x * (q.y - r.y) + q.x * (r.y - p.y) + r.x * (p.y - q.y);
 		    if (a == 0) return std::numeric_limits<double>::quiet_NaN();
 		    double d = (p.x * p.x + p.y * p.y) * (q.y - r.y) +
 		      (q.x * q.x + q.y * q.y) * (r.y - p.y) +
 		      (r.x * r.x + r.y * r.y) * (p.y - q.y);
 		    double e = (p.x * p.x + p.y * p.y) * (q.x - r.x) +
 		      (q.x * q.x + q.y * q.y) * (r.x - p.x) +
 		      (r.x * r.x + r.y * r.y) * (p.x - q.x);
 		    double f = (p.x * p.x + p.y * p.y) * (q.x * r.y - r.x * q.y) +
 		      (q.x * q.x + q.y * q.y) * (r.x * p.y - p.x * r.y) +
 		      (r.x * r.x + r.y * r.y) * (p.x * q.y - q.x * p.y);
 		    return d / (2 * a) + sqrt((d * d + e * e) / (4 * a * a) + f / a);
+		  }
 		  inline bool circle_form(const Point& p, const Point& q, const Point& r) {
 		    return rot90(q - p) * (r - q) < 0.0;
+		  }
 		  inline double intersection(const Point& p, const Point& q, double sx) {
 		    const double epsilon = 1e-8;
 		    if (p.x == q.x) return (p.y + q.y) / 2.0;
 		    if (sx < p.x + epsilon) return p.y;
 		    if (sx < q.x + epsilon) return q.y;
 		    double a = q.x - p.x;
 		    double b = (q.x - sx) * p.y - (p.x - sx) * q.y;
 		    double d = (q.x - sx) * (p.x - sx) * (p - q).normSquare();
 		    return (b - sqrt(d)) / a;
+		  }
 		  struct YLess {
 		    YLess(const std::vector<Point>& points, double& sweep)
 		      : _points(points), _sweep(sweep) {}
 		    bool operator()(const Part& l, const Part& r) const {
 		      const double epsilon = 1e-8;
 		      //      std::cerr << l << " vs " << r << std::endl;
 		      double lbx = l.prev != -1 ?
 		        intersection(_points[l.prev], _points[l.curr], _sweep) :
 		        - std::numeric_limits<double>::infinity();
 		      double rbx = r.prev != -1 ?
 		        intersection(_points[r.prev], _points[r.curr], _sweep) :
 		        - std::numeric_limits<double>::infinity();
 		      double lex = l.next != -1 ?
 		        intersection(_points[l.curr], _points[l.next], _sweep) :
 		        std::numeric_limits<double>::infinity();
 		      double rex = r.next != -1 ?
 		        intersection(_points[r.curr], _points[r.next], _sweep) :
 		        std::numeric_limits<double>::infinity();
 		      if (lbx > lex) std::swap(lbx, lex);
 		      if (rbx > rex) std::swap(rbx, rex);
 		      if (lex < epsilon + rex && lbx + epsilon < rex) return true;
 		      if (rex < epsilon + lex && rbx + epsilon < lex) return false;
 		      return lex < rex;
+		    }
 		    const std::vector<Point>& _points;
 		    double& _sweep;
 		  };
 		  struct BeachIt;
 		  typedef std::multimap<double, BeachIt> SpikeHeap;
 		  typedef std::multimap<Part, SpikeHeap::iterator, YLess> Beach;
 		  struct BeachIt {
 		    Beach::iterator it;
 		    BeachIt(Beach::iterator iter) : it(iter) {}
 		  };
+		}
 		inline void delaunay() {
 		  Counter cnt("Number of arcs added: ");
 		  using namespace _delaunay_bits;
 		  typedef _delaunay_bits::Part Part;
 		  typedef std::vector<std::pair<double, int> > SiteHeap;
 		  std::vector<Point> points;
 		  std::vector<Node> nodes;
 		  for (NodeIt it(g); it != INVALID; ++it) {
 		    nodes.push_back(it);
 		    points.push_back(coords[it]);
+		  }
 		  SiteHeap siteheap(points.size());
 		  double sweep;
 		  for (int i = 0; i < int(siteheap.size()); ++i) {
 		    siteheap[i] = std::make_pair(points[i].x, i);
+		  }
 		  std::sort(siteheap.begin(), siteheap.end());
 		  sweep = siteheap.front().first;
 		  YLess yless(points, sweep);
 		  Beach beach(yless);
 		  SpikeHeap spikeheap;
 		  std::set<std::pair<int, int> > arcs;
 		  int siteindex = 0;
+		  {
 		    SiteHeap front;
 		    while (siteindex < int(siteheap.size()) &&
 		           siteheap[0].first == siteheap[siteindex].first) {
 		      front.push_back(std::make_pair(points[siteheap[siteindex].second].y,
 		                                     siteheap[siteindex].second));
 		      ++siteindex;
+		    }
 		    std::sort(front.begin(), front.end());
 		    for (int i = 0; i < int(front.size()); ++i) {
 		      int prev = (i == 0 ? -1 : front[i - 1].second);
 		      int curr = front[i].second;
 		      int next = (i + 1 == int(front.size()) ? -1 : front[i + 1].second);
 		      beach.insert(std::make_pair(Part(prev, curr, next),
 		                                  spikeheap.end()));
+		    }
+		  }
 		  while (siteindex < int(points.size()) || !spikeheap.empty()) {
 		    SpikeHeap::iterator spit = spikeheap.begin();
 		    if (siteindex < int(points.size()) &&
 		        (spit == spikeheap.end() || siteheap[siteindex].first < spit->first)) {
 		      int site = siteheap[siteindex].second;
 		      sweep = siteheap[siteindex].first;
 		      Beach::iterator bit = beach.upper_bound(Part(site, site, site));
 		      if (bit->second != spikeheap.end()) {
 		        spikeheap.erase(bit->second);
+		      }
 		      int prev = bit->first.prev;
 		      int curr = bit->first.curr;
 		      int next = bit->first.next;
 		      beach.erase(bit);
 		      SpikeHeap::iterator pit = spikeheap.end();
 		      if (prev != -1 &&
 		          circle_form(points[prev], points[curr], points[site])) {
 		        double x = circle_point(points[prev], points[curr], points[site]);
 		        pit = spikeheap.insert(std::make_pair(x, BeachIt(beach.end())));
 		        pit->second.it =
 		          beach.insert(std::make_pair(Part(prev, curr, site), pit));
 		      } else {
 		        beach.insert(std::make_pair(Part(prev, curr, site), pit));
+		      }
 		      beach.insert(std::make_pair(Part(curr, site, curr), spikeheap.end()));
 		      SpikeHeap::iterator nit = spikeheap.end();
 		      if (next != -1 &&
 		          circle_form(points[site], points[curr],points[next])) {
 		        double x = circle_point(points[site], points[curr], points[next]);
 		        nit = spikeheap.insert(std::make_pair(x, BeachIt(beach.end())));
 		        nit->second.it =
 		          beach.insert(std::make_pair(Part(site, curr, next), nit));
 		      } else {
 		        beach.insert(std::make_pair(Part(site, curr, next), nit));
+		      }
 		      ++siteindex;
 		    } else {
 		      sweep = spit->first;
 		      Beach::iterator bit = spit->second.it;
 		      int prev = bit->first.prev;
 		      int curr = bit->first.curr;
 		      int next = bit->first.next;
+		      {
 		        std::pair<int, int> arc;
 		        arc = prev < curr ?
 		          std::make_pair(prev, curr) : std::make_pair(curr, prev);
 		        if (arcs.find(arc) == arcs.end()) {
 		          arcs.insert(arc);
 		          g.addEdge(nodes[prev], nodes[curr]);
 		          ++cnt;
+		        }
 		        arc = curr < next ?
 		          std::make_pair(curr, next) : std::make_pair(next, curr);
 		        if (arcs.find(arc) == arcs.end()) {
 		          arcs.insert(arc);
 		          g.addEdge(nodes[curr], nodes[next]);
 		          ++cnt;
+		        }
+		      }
 		      Beach::iterator pbit = bit; --pbit;
 		      int ppv = pbit->first.prev;
 		      Beach::iterator nbit = bit; ++nbit;
 		      int nnt = nbit->first.next;
 		      if (bit->second != spikeheap.end()) spikeheap.erase(bit->second);
 		      if (pbit->second != spikeheap.end()) spikeheap.erase(pbit->second);
 		      if (nbit->second != spikeheap.end()) spikeheap.erase(nbit->second);
 		      beach.erase(nbit);
 		      beach.erase(bit);
 		      beach.erase(pbit);
 		      SpikeHeap::iterator pit = spikeheap.end();
 		      if (ppv != -1 && ppv != next &&
 		          circle_form(points[ppv], points[prev], points[next])) {
 		        double x = circle_point(points[ppv], points[prev], points[next]);
 		        if (x < sweep) x = sweep;
 		        pit = spikeheap.insert(std::make_pair(x, BeachIt(beach.end())));
 		        pit->second.it =
 		          beach.insert(std::make_pair(Part(ppv, prev, next), pit));
 		      } else {
 		        beach.insert(std::make_pair(Part(ppv, prev, next), pit));
+		      }
 		      SpikeHeap::iterator nit = spikeheap.end();
 		      if (nnt != -1 && prev != nnt &&
 		          circle_form(points[prev], points[next], points[nnt])) {
 		        double x = circle_point(points[prev], points[next], points[nnt]);
 		        if (x < sweep) x = sweep;
 		        nit = spikeheap.insert(std::make_pair(x, BeachIt(beach.end())));
 		        nit->second.it =
 		          beach.insert(std::make_pair(Part(prev, next, nnt), nit));
 		      } else {
 		        beach.insert(std::make_pair(Part(prev, next, nnt), nit));
+		      }
+		    }
+		  }
 		  for (Beach::iterator it = beach.begin(); it != beach.end(); ++it) {
 		    int curr = it->first.curr;
 		    int next = it->first.next;
 		    if (next == -1) continue;
 		    std::pair<int, int> arc;
 		    arc = curr < next ?
 		      std::make_pair(curr, next) : std::make_pair(next, curr);
 		    if (arcs.find(arc) == arcs.end()) {
 		      arcs.insert(arc);
 		      g.addEdge(nodes[curr], nodes[next]);
 		      ++cnt;
+		    }
+		  }
+		}
 		void sparse(int d)
+		{
 		  Counter cnt("Number of arcs removed: ");
 		  Bfs<ListGraph> bfs(g);
 		  for(std::vector<Edge>::reverse_iterator ei=arcs.rbegin();
 		      ei!=arcs.rend();++ei)
+		    {
 		      Node a=g.u(*ei);
 		      Node b=g.v(*ei);
 		      g.erase(*ei);
 		      bfs.run(a,b);
 		      if(bfs.predArc(b)==INVALID || bfs.dist(b)>d)
 		        g.addEdge(a,b);
 		      else cnt++;
+		    }
+		}
 		void sparse2(int d)
+		{
 		  Counter cnt("Number of arcs removed: ");
 		  for(std::vector<Edge>::reverse_iterator ei=arcs.rbegin();
 		      ei!=arcs.rend();++ei)
+		    {
 		      Node a=g.u(*ei);
 		      Node b=g.v(*ei);
 		      g.erase(*ei);
 		      ConstMap<Arc,int> cegy(1);
 		      Suurballe<ListGraph,ConstMap<Arc,int> > sur(g,cegy,a,b);
 		      int k=sur.run(2);
 		      if(k<2 || sur.totalLength()>d)
 		        g.addEdge(a,b);
 		      else cnt++;
 		//       else std::cout << "Remove arc " << g.id(a) << "-" << g.id(b) << '\n';
+		    }
+		}
 		void sparseTriangle(int d)
+		{
 		  Counter cnt("Number of arcs added: ");
 		  std::vector<Parc> pedges;
 		  for(NodeIt n(g);n!=INVALID;++n)
 		    for(NodeIt m=++(NodeIt(n));m!=INVALID;++m)
+		      {
 		        Parc p;
 		        p.a=n;
 		        p.b=m;
 		        p.len=(coords[m]-coords[n]).normSquare();
 		        pedges.push_back(p);
+		      }
 		  std::sort(pedges.begin(),pedges.end(),pedgeLess);
 		  for(std::vector<Parc>::iterator pi=pedges.begin();pi!=pedges.end();++pi)
+		    {
 		      Line li(pi->a,pi->b);
 		      EdgeIt e(g);
 		      for(;e!=INVALID && !cross(e,li);++e) ;
 		      Edge ne;
 		      if(e==INVALID) {
 		        ConstMap<Arc,int> cegy(1);
 		        Suurballe<ListGraph,ConstMap<Arc,int> >
 		          sur(g,cegy,pi->a,pi->b);
 		        int k=sur.run(2);
 		        if(k<2 || sur.totalLength()>d)
+		          {
 		            ne=g.addEdge(pi->a,pi->b);
 		            arcs.push_back(ne);
 		            cnt++;
+		          }
+		      }
+		    }
+		}
 		template <typename Graph, typename CoordMap>
 		class LengthSquareMap {
 		public:
 		  typedef typename Graph::Edge Key;
 		  typedef typename CoordMap::Value::Value Value;
 		  LengthSquareMap(const Graph& graph, const CoordMap& coords)
 		    : _graph(graph), _coords(coords) {}
 		  Value operator[](const Key& key) const {
 		    return (_coords[_graph.v(key)] -
 		            _coords[_graph.u(key)]).normSquare();
+		  }
 		private:

0 comments (0 inline)

RhodeCode

Login to your account