LEMON/LEMON-main Changeset - r157:2ccc1afc2c52

Repositories » LEMON » LEMON-main

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

Changeset - r157:2ccc1afc2c52

« 156:e561aa

158:500f3c »

r157:2ccc1afc2c52

Sat, 24 May 2008 23:20:49

[Not Reviewed]

0 comments (0 inline)

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

Using \tparam commands + removing \author commands (ticket #29, #39)

0 14 0

default

14 files changed:

lemon/bfs.h

lemon/bin_heap.h

lemon/bits/alteration_notifier.h

lemon/bits/bezier.h

lemon/bits/vector_map.h

lemon/color.h

lemon/concepts/path.h

lemon/dfs.h

lemon/dijkstra.h

lemon/graph_to_eps.h

Changeset was too big and was cut off... Show full diff

↑ Collapse diff ↑

lemon/bfs.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * 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_BFS_H
 		#define LEMON_BFS_H
 		///\ingroup search
 		///\file
 		///\brief Bfs algorithm.
 		#include <lemon/list_graph.h>
 		#include <lemon/graph_utils.h>
 		#include <lemon/bits/path_dump.h>
 		#include <lemon/bits/invalid.h>
 		#include <lemon/error.h>
 		#include <lemon/maps.h>
 		namespace lemon {
 		  ///Default traits class of Bfs class.
 		  ///Default traits class of Bfs class.
-		  ///\param GR Digraph type.
+		  ///\tparam GR Digraph type.
 		  template<class GR>
 		  struct BfsDefaultTraits
+		  {
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    ///
 		    ///The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef typename Digraph::template NodeMap<typename GR::Arc> PredMap;
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param G is the digraph, to which we would like to define the PredMap.
 		    ///\todo The digraph alone may be insufficient to initialize
 		    static PredMap *createPredMap(const GR &G)
+		    {
 		      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.
 		    ///\todo named parameter to set this type, function to read and write.
 		    typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
 		    ///Instantiates a 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 GR &g)
 		#else
 		    static ProcessedMap *createProcessedMap(const GR &)
 		#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::WriteMap "WriteMap" concept.
 		    ///\todo named parameter to set this type, function to read and write.
 		    typedef typename Digraph::template NodeMap<bool> ReachedMap;
 		    ///Instantiates a 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 GR &G)
+		    {
 		      return new ReachedMap(G);
+		    }
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef typename Digraph::template NodeMap<int> DistMap;
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param G is the digraph, to which we would like to define the \ref DistMap
 		    static DistMap *createDistMap(const GR &G)
+		    {
 		      return new DistMap(G);
+		    }
 		  };
 		  ///%BFS algorithm class.
 		  ///\ingroup search
 		  ///This class provides an efficient implementation of the %BFS algorithm.
 		  ///
-		  ///\param GR The digraph type the algorithm runs on. The default value is
+		  ///\tparam GR The digraph type the algorithm runs on. The default value is
 		  ///\ref ListDigraph. The value of GR is not used directly by Bfs, it
 		  ///is only passed to \ref BfsDefaultTraits.
-		  ///\param TR Traits class to set various data types used by the algorithm.
+		  ///\tparam TR Traits class to set various data types used by the algorithm.
 		  ///The default traits class is
 		  ///\ref BfsDefaultTraits "BfsDefaultTraits<GR>".
 		  ///See \ref BfsDefaultTraits for the documentation of
 		  ///a Bfs traits class.
 		  ///
 		  ///\author Alpar Juttner
 		#ifdef DOXYGEN
 		  template <typename GR,
 			    typename TR>
 		#else
 		  template <typename GR=ListDigraph,
 			    typename TR=BfsDefaultTraits<GR> >
 		#endif
 		  class Bfs {
 		  public:
 		    /**
 		     * \brief \ref Exception for uninitialized parameters.
+		     *
 		     * This error represents problems in the initialization
 		     * of the parameters of the algorithms.
 		     */
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
 		      virtual const char* what() const throw() {
 			return "lemon::Bfs::UninitializedParameter";
+		      }
 		    };
 		    typedef TR Traits;
 		    ///The type of the underlying digraph.
 		    typedef typename TR::Digraph Digraph;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    typedef typename TR::PredMap PredMap;
 		    ///The type of the map indicating which nodes are reached.
 		    typedef typename TR::ReachedMap ReachedMap;
 		    ///The type of the map indicating which nodes are processed.
 		    typedef typename TR::ProcessedMap ProcessedMap;
 		    ///The type of the map that stores the dists of the nodes.
 		    typedef typename TR::DistMap DistMap;
 		  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 predecessors arcs.
 		    PredMap *_pred;
 		    ///Indicates if \ref _pred is locally allocated (\c true) or not.
 		    bool local_pred;
 		    ///Pointer to the map of distances.
 		    DistMap *_dist;
 		    ///Indicates if \ref _dist is locally allocated (\c true) or not.
 		    bool local_dist;
 		    ///Pointer to the map of reached status of the nodes.
 		    ReachedMap *_reached;
 		    ///Indicates if \ref _reached is locally allocated (\c true) or not.
 		    bool local_reached;
 		    ///Pointer to the map of processed status of the nodes.
 		    ProcessedMap *_processed;
 		    ///Indicates if \ref _processed is locally allocated (\c true) or not.
 		    bool local_processed;
 		    std::vector<typename Digraph::Node> _queue;
 		    int _queue_head,_queue_tail,_queue_next_dist;
 		    int _curr_dist;
 		    ///Creates the maps if necessary.
 		    ///\todo Better memory allocation (instead of new).
 		    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:
 		    Bfs() {}
 		  public:
 		    typedef Bfs Create;
 		    ///\name Named template parameters
 		    ///@{
 		    template <class T>
 		    struct DefPredMapTraits : public Traits {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\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 Bfs< Digraph, DefPredMapTraits<T> > {
 		      typedef Bfs< Digraph, DefPredMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct DefDistMapTraits : public Traits {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///DistMap type
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting DistMap type
 		    ///
 		    template <class T>
 		    struct DefDistMap : public Bfs< Digraph, DefDistMapTraits<T> > {
 		      typedef Bfs< Digraph, DefDistMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct DefReachedMapTraits : public Traits {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///ReachedMap type
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting ReachedMap type
 		    ///
 		    template <class T>
 		    struct DefReachedMap : public Bfs< Digraph, DefReachedMapTraits<T> > {
 		      typedef Bfs< Digraph, DefReachedMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct DefProcessedMapTraits : public Traits {
 		      typedef T ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///ProcessedMap type
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting ProcessedMap type
 		    ///
 		    template <class T>
 		    struct DefProcessedMap : public Bfs< Digraph, DefProcessedMapTraits<T> > {
 		      typedef Bfs< Digraph, DefProcessedMapTraits<T> > Create;
 		    };
 		    struct DefDigraphProcessedMapTraits : 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 the ProcessedMap type to be Digraph::NodeMap<bool>.
 		    ///
 		    ///\ref named-templ-param "Named parameter"
 		    ///for setting the ProcessedMap type to be Digraph::NodeMap<bool>.
 		    ///If you don't set it explicitly, it will be automatically allocated.
 		    template <class T>
 		    struct DefProcessedMapToBeDefaultMap :
 		      public Bfs< Digraph, DefDigraphProcessedMapTraits> {
 		      typedef Bfs< Digraph, DefDigraphProcessedMapTraits> Create;
 		    };
 		    ///@}
 		  public:
 		    ///Constructor.
 		    ///\param _G the digraph the algorithm will run on.
 		    ///
 		    Bfs(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.
 		    ~Bfs()
+		    {
 		      if(local_pred) delete _pred;
 		      if(local_dist) delete _dist;
 		      if(local_reached) delete _reached;
 		      if(local_processed) delete _processed;
+		    }
 		    ///Sets the map storing the predecessor arcs.
 		    ///Sets the map storing the predecessor arcs.
 		    ///If you don't use this function before calling \ref run(),
 		    ///it will allocate one. The destructor deallocates this
 		    ///automatically allocated map, of course.
 		    ///\return <tt> (*this) </tt>
 		    Bfs &predMap(PredMap &m)
+		    {
 		      if(local_pred) {
 			delete _pred;
 			local_pred=false;
+		      }
 		      _pred = &m;
 		      return *this;
+		    }
 		    ///Sets the map indicating the reached nodes.
 		    ///Sets the map indicating the reached nodes.
 		    ///If you don't use this function before calling \ref run(),
 		    ///it will allocate one. The destructor deallocates this
 		    ///automatically allocated map, of course.
 		    ///\return <tt> (*this) </tt>
 		    Bfs &reachedMap(ReachedMap &m)
+		    {
 		      if(local_reached) {
 			delete _reached;
 			local_reached=false;
+		      }
 		      _reached = &m;
 		      return *this;
+		    }
 		    ///Sets the map indicating the processed nodes.
 		    ///Sets the map indicating the processed nodes.
 		    ///If you don't use this function before calling \ref run(),
 		    ///it will allocate one. The destructor deallocates this
 		    ///automatically allocated map, of course.
 		    ///\return <tt> (*this) </tt>
 		    Bfs &processedMap(ProcessedMap &m)
+		    {
 		      if(local_processed) {
 			delete _processed;
 			local_processed=false;
+		      }
 		      _processed = &m;
 		      return *this;
+		    }
 		    ///Sets the map storing the distances calculated by the algorithm.
 		    ///Sets the map storing the distances calculated by the algorithm.
 		    ///If you don't use this function before calling \ref run(),
 		    ///it will allocate one. The destructor deallocates this
 		    ///automatically allocated map, of course.
 		    ///\return <tt> (*this) </tt>
 		    Bfs &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 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 actual path
 		    ///computation.
 		    ///@{
 		    ///\brief Initializes the internal data structures.
 		    ///
 		    ///Initializes the internal data structures.
 		    ///
 		    void init()
+		    {
 		      create_maps();
 		      _queue.resize(countNodes(*G));
 		      _queue_head=_queue_tail=0;
 		      _curr_dist=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.
 		    ///
 		    void addSource(Node s)
+		    {
 		      if(!(*_reached)[s])
+			{
 			  _reached->set(s,true);
 			  _pred->set(s,INVALID);
 			  _dist->set(s,0);
 			  _queue[_queue_head++]=s;
 			  _queue_next_dist=_queue_head;
+			}
+		    }
 		    ///Processes the next node.
 		    ///Processes the next node.
 		    ///
 		    ///\return The processed node.
 		    ///
 		    ///\warning The queue must not be empty!
 		    Node processNextNode()
+		    {
 		      if(_queue_tail==_queue_next_dist) {
 			_curr_dist++;
 			_queue_next_dist=_queue_head;
+		      }
 		      Node n=_queue[_queue_tail++];
 		      _processed->set(n,true);
 		      Node m;
 		      for(OutArcIt e(*G,n);e!=INVALID;++e)
 			if(!(*_reached)[m=G->target(e)]) {
 			  _queue[_queue_head++]=m;
 			  _reached->set(m,true);
 			  _pred->set(m,e);
 			  _dist->set(m,_curr_dist);
+			}
 		      return n;
+		    }
 		    ///Processes the next node.
 		    ///Processes the next node. And checks that the given target node
 		    ///is reached. If the target node is reachable from the processed
 		    ///node then the reached parameter will be set true. The reached
 		    ///parameter should be initially false.
 		    ///
 		    ///\param target The target node.
 		    ///\retval reach Indicates that the target node is reached.
 		    ///\return The processed node.
 		    ///
 		    ///\warning The queue must not be empty!
 		    Node processNextNode(Node target, bool& reach)
+		    {
 		      if(_queue_tail==_queue_next_dist) {
 			_curr_dist++;
 			_queue_next_dist=_queue_head;
+		      }
 		      Node n=_queue[_queue_tail++];
 		      _processed->set(n,true);
 		      Node m;
 		      for(OutArcIt e(*G,n);e!=INVALID;++e)
 			if(!(*_reached)[m=G->target(e)]) {
 			  _queue[_queue_head++]=m;
 			  _reached->set(m,true);
 			  _pred->set(m,e);
 			  _dist->set(m,_curr_dist);
 		          reach = reach || (target == m);
+			}
 		      return n;
+		    }
 		    ///Processes the next node.
 		    ///Processes the next node. And checks that at least one of
 		    ///reached node has true value in the \c nm node map. If one node
 		    ///with true value is reachable from the processed node then the
 		    ///rnode parameter will be set to the first of such nodes.
 		    ///
 		    ///\param nm The node map of possible targets.
 		    ///\retval rnode The reached target node.
 		    ///\return The processed node.
 		    ///
 		    ///\warning The queue must not be empty!
 		    template<class NM>
 		    Node processNextNode(const NM& nm, Node& rnode)
+		    {
 		      if(_queue_tail==_queue_next_dist) {
 			_curr_dist++;
 			_queue_next_dist=_queue_head;
+		      }
 		      Node n=_queue[_queue_tail++];
 		      _processed->set(n,true);
 		      Node m;
 		      for(OutArcIt e(*G,n);e!=INVALID;++e)
 			if(!(*_reached)[m=G->target(e)]) {
 			  _queue[_queue_head++]=m;
 			  _reached->set(m,true);
 			  _pred->set(m,e);
 			  _dist->set(m,_curr_dist);
 			  if (nm[m] && rnode == INVALID) rnode = m;
+			}
 		      return n;
+		    }
 		    ///Next node to be processed.
 		    ///Next node to be processed.
 		    ///
 		    ///\return The next node to be processed or INVALID if the queue is
 		    /// empty.
 		    Node nextNode()
+		    {
 		      return _queue_tail<_queue_head?_queue[_queue_tail]:INVALID;
+		    }
 		    ///\brief Returns \c false if there are nodes
 		    ///to be processed in the queue
 		    ///
 		    ///Returns \c false if there are nodes
 		    ///to be processed in the queue
 		    bool emptyQueue() { return _queue_tail==_queue_head; }
 		    ///Returns the number of the nodes to be processed.
 		    ///Returns the number of the nodes to be processed in the queue.
 		    int queueSize() { return _queue_head-_queue_tail; }
 		    ///Executes the algorithm.
 		    ///Executes the algorithm.
 		    ///
 		    ///\pre init() must be called and at least one node should be added
 		    ///with addSource() before using this function.
 		    ///
 		    ///This method runs the %BFS algorithm from the root node(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(s).
 		    void start()
+		    {
 		      while ( !emptyQueue() ) processNextNode();
+		    }
 		    ///Executes the algorithm until \c dest is reached.
 		    ///Executes the algorithm until \c dest is reached.
 		    ///
 		    ///\pre init() must be called and at least one node should be added
 		    ///with addSource() before using this function.
 		    ///
 		    ///This method runs the %BFS algorithm from the root node(s)
 		    ///in order to compute the shortest path to \c dest.
 		    ///The algorithm computes
 		    ///- The shortest path to \c  dest.
 		    ///- The distance of \c dest from the root(s).
 		    void start(Node dest)
+		    {
 		      bool reach = false;
 		      while ( !emptyQueue() && !reach ) processNextNode(dest, reach);
+		    }
 		    ///Executes the algorithm until a condition is met.
 		    ///Executes the algorithm until a condition is met.
 		    ///
 		    ///\pre init() must be called and at least one node should be added
 		    ///with addSource() before using this function.
 		    ///
 		    ///\param nm must be a 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.
 		    template<class NM>
 		    Node start(const NM &nm)
+		    {
 		      Node rnode = INVALID;
 		      while ( !emptyQueue() && rnode == INVALID ) {
 			processNextNode(nm, rnode);
+		      }
 		      return rnode;
+		    }
 		    ///Runs %BFS algorithm from node \c s.
 		    ///This method runs the %BFS algorithm from a root node \c s
 		    ///in order to
 		    ///compute the
 		    ///shortest path to each node. The algorithm computes
 		    ///- The shortest path tree.
 		    ///- The distance of each node from the root.
 		    ///
 		    ///\note b.run(s) is just a shortcut of the following code.
 		    ///\code
 		    ///  b.init();
 		    ///  b.addSource(s);
 		    ///  b.start();
 		    ///\endcode
 		    void run(Node s) {
 		      init();
 		      addSource(s);
 		      start();
+		    }
 		    ///Finds the shortest path between \c s and \c t.
 		    ///Finds the shortest path between \c s and \c t.
 		    ///
 		    ///\return The length of the shortest s---t path if there exists one,
 		    ///0 otherwise.
 		    ///\note Apart from the return value, b.run(s) is
 		    ///just a shortcut of the following code.
 		    ///\code
 		    ///  b.init();
 		    ///  b.addSource(s);
 		    ///  b.start(t);
 		    ///\endcode
 		    int run(Node s,Node t) {
 		      init();
 		      addSource(s);
 		      start(t);
 		      return reached(t) ? _curr_dist : 0;
+		    }
 		    ///@}
 		    ///\name Query Functions
 		    ///The result of the %BFS algorithm can be obtained using these
 		    ///functions.\n
 		    ///Before the use of these functions,
 		    ///either run() or start() must be calleb.
 		    ///@{
 		    typedef PredMapPath<Digraph, PredMap> Path;
 		    ///Gives back the shortest path.
 		    ///Gives back the shortest path.
 		    ///\pre The \c t should be reachable from the source.
 		    Path path(Node t)
+		    {
 		      return Path(*G, *_pred, t);
+		    }
 		    ///The distance of a node from the root(s).
 		    ///Returns the distance of a node from the root(s).
 		    ///\pre \ref run() must be called before using this function.
 		    ///\warning If node \c v in unreachable from the root(s) the return value
 		    ///of this function is undefined.
 		    int dist(Node v) const { return (*_dist)[v]; }
 		    ///Returns the 'previous arc' of the shortest path tree.
 		    ///For a node \c v it returns the 'previous arc'
 		    ///of the shortest path tree,
 		    ///i.e. it returns the last arc of a shortest path from the root(s) to \c
 		    ///v. It is \ref INVALID
 		    ///if \c v is unreachable from the root(s) or \c v is a root. The
 		    ///shortest path tree used here is equal to the shortest path tree used in
 		    ///\ref predNode().
 		    ///\pre Either \ref run() or \ref start() must be called before using
 		    ///this function.
 		    Arc predArc(Node v) const { return (*_pred)[v];}
 		    ///Returns the 'previous node' of the shortest path tree.
 		    ///For a node \c v it returns the 'previous node'
 		    ///of the shortest path tree,
 		    ///i.e. it returns the last but one node from a shortest path from the
 		    ///root(a) to \c /v.
 		    ///It is INVALID if \c v is unreachable from the root(s) or
 		    ///if \c v itself a root.
 		    ///The shortest path tree used here is equal to the shortest path
 		    ///tree used in \ref predArc().
 		    ///\pre Either \ref run() or \ref start() must be called before
 		    ///using this function.
 		    Node predNode(Node v) const { return (*_pred)[v]==INVALID ? INVALID:
 						  G->source((*_pred)[v]); }
 		    ///Returns a reference to the NodeMap of distances.
 		    ///Returns a reference to the NodeMap of distances.
 		    ///\pre Either \ref run() or \ref init() must
 		    ///be called before using this function.
 		    const DistMap &distMap() const { return *_dist;}
 		    ///Returns a reference to the shortest path tree map.
 		    ///Returns a reference to the NodeMap of the arcs of the
 		    ///shortest path tree.
 		    ///\pre Either \ref run() or \ref init()
 		    ///must be called before using this function.
 		    const PredMap &predMap() const { return *_pred;}
 		    ///Checks if a node is reachable from the root.
 		    ///Returns \c true if \c v is reachable from the root.
 		    ///\warning The source nodes are indicated as unreached.
 		    ///\pre Either \ref run() or \ref start()
 		    ///must be called before using this function.
 		    ///
 		    bool reached(Node v) { return (*_reached)[v]; }
 		    ///@}
 		  };
 		  ///Default traits class of Bfs function.
 		  ///Default traits class of Bfs function.
-		  ///\param GR Digraph type.
+		  ///\tparam GR Digraph type.
 		  template<class GR>
 		  struct BfsWizardDefaultTraits
+		  {
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    ///
 		    ///The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef NullMap<typename Digraph::Node,typename GR::Arc> PredMap;
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param g is the digraph, to which we would like to define the PredMap.
 		    ///\todo The digraph alone may be insufficient to initialize
 		#ifdef DOXYGEN
 		    static PredMap *createPredMap(const GR &g)
 		#else
 		    static PredMap *createPredMap(const GR &)
 		#endif
+		    {
 		      return new PredMap();
+		    }
 		    ///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.
 		    ///\todo named parameter to set this type, function to read and write.
 		    typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
 		    ///Instantiates a 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 GR &g)
 		#else
 		    static ProcessedMap *createProcessedMap(const GR &)
 		#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::WriteMap "WriteMap" concept.
 		    ///\todo named parameter to set this type, function to read and write.
 		    typedef typename Digraph::template NodeMap<bool> ReachedMap;
 		    ///Instantiates a 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 GR &G)
+		    {
 		      return new ReachedMap(G);
+		    }
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef NullMap<typename Digraph::Node,int> DistMap;
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param g is the digraph, to which we would like to define the \ref DistMap
 		#ifdef DOXYGEN
 		    static DistMap *createDistMap(const GR &g)
 		#else
 		    static DistMap *createDistMap(const GR &)
 		#endif
+		    {
 		      return new DistMap();
+		    }
 		  };
 		  /// Default traits used by \ref BfsWizard
 		  /// To make it easier to use Bfs algorithm
 		  ///we have created a wizard class.
 		  /// This \ref BfsWizard class needs default traits,
 		  ///as well as the \ref Bfs class.
 		  /// The \ref BfsWizardBase is a class to be the default traits of the
 		  /// \ref BfsWizard class.
 		  template<class GR>
 		  class BfsWizardBase : public BfsWizardDefaultTraits<GR>
+		  {
 		    typedef BfsWizardDefaultTraits<GR> Base;
 		  protected:
 		    /// Type of the nodes in the digraph.
 		    typedef typename Base::Digraph::Node Node;
 		    /// Pointer to the underlying digraph.
 		    void *_g;
 		    ///Pointer to the map of reached nodes.
 		    void *_reached;
 		    ///Pointer to the map of processed nodes.
 		    void *_processed;
 		    ///Pointer to the map of predecessors arcs.
 		    void *_pred;
 		    ///Pointer to the map of distances.
 		    void *_dist;
 		    ///Pointer to the source node.
 		    Node _source;
 		    public:
 		    /// Constructor.
 		    /// This constructor does not require parameters, therefore it initiates
 		    /// all of the attributes to default values (0, INVALID).
 		    BfsWizardBase() : _g(0), _reached(0), _processed(0), _pred(0),
 					   _dist(0), _source(INVALID) {}
 		    /// Constructor.
 		    /// This constructor requires some parameters,
 		    /// listed in the parameters list.
 		    /// Others are initiated to 0.
 		    /// \param g is the initial value of  \ref _g
 		    /// \param s is the initial value of  \ref _source
 		    BfsWizardBase(const GR &g, Node s=INVALID) :
 		      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
 		      _reached(0), _processed(0), _pred(0), _dist(0), _source(s) {}
 		  };
 		  /// A class to make the usage of Bfs algorithm easier
 		  /// This class is created to make it easier to use Bfs algorithm.
 		  /// It uses the functions and features of the plain \ref Bfs,
 		  /// but it is much simpler to use it.
 		  ///
 		  /// Simplicity means that the way to change the types defined
 		  /// in the traits class is based on functions that returns the new class
 		  /// and not on templatable built-in classes.
 		  /// When using the plain \ref Bfs
 		  /// the new class with the modified type comes from
 		  /// the original class by using the ::
 		  /// operator. In the case of \ref BfsWizard only
 		  /// a function have to be called and it will
 		  /// return the needed class.
 		  ///
 		  /// It does not have own \ref run method. When its \ref run method is called
 		  /// it initiates a plain \ref Bfs class, and calls the \ref Bfs::run
 		  /// method of it.
 		  template<class TR>
 		  class BfsWizard : public TR
+		  {
 		    typedef TR Base;
 		    ///The type of the underlying digraph.
 		    typedef typename TR::Digraph Digraph;
 		    //\e
 		    typedef typename Digraph::Node Node;
 		    //\e
 		    typedef typename Digraph::NodeIt NodeIt;
 		    //\e
 		    typedef typename Digraph::Arc Arc;
 		    //\e
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///\brief The type of the map that stores
 		    ///the reached nodes
 		    typedef typename TR::ReachedMap ReachedMap;
 		    ///\brief The type of the map that stores
 		    ///the processed nodes
 		    typedef typename TR::ProcessedMap ProcessedMap;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    typedef typename TR::PredMap PredMap;
 		    ///The type of the map that stores the dists of the nodes.
 		    typedef typename TR::DistMap DistMap;
 		  public:
 		    /// Constructor.
 		    BfsWizard() : TR() {}
 		    /// Constructor that requires parameters.
 		    /// Constructor that requires parameters.
 		    /// These parameters will be the default values for the traits class.
 		    BfsWizard(const Digraph &g, Node s=INVALID) :
 		      TR(g,s) {}
 		    ///Copy constructor
 		    BfsWizard(const TR &b) : TR(b) {}
 		    ~BfsWizard() {}
 		    ///Runs Bfs algorithm from a given node.
 		    ///Runs Bfs algorithm from a given node.
 		    ///The node can be given by the \ref source function.
 		    void run()
+		    {
 		      if(Base::_source==INVALID) throw UninitializedParameter();
 		      Bfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g));
 		      if(Base::_reached)
 			alg.reachedMap(*reinterpret_cast<ReachedMap*>(Base::_reached));
 		      if(Base::_processed)
 		        alg.processedMap(*reinterpret_cast<ProcessedMap*>(Base::_processed));
 		      if(Base::_pred)
 		        alg.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
 		      if(Base::_dist)
 		        alg.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
 		      alg.run(Base::_source);
+		    }
 		    ///Runs Bfs algorithm from the given node.
 		    ///Runs Bfs algorithm from the given node.
 		    ///\param s is the given source.
 		    void run(Node s)
+		    {
 		      Base::_source=s;
 		      run();
+		    }
 		    template<class T>
 		    struct DefPredMapBase : public Base {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &) { return 0; };
 		      DefPredMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting PredMap
 		    ///
 		    /// \ref named-templ-param "Named parameter"
 		    ///function for setting PredMap
 		    ///
 		    template<class T>
 		    BfsWizard<DefPredMapBase<T> > predMap(const T &t)
+		    {
 		      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BfsWizard<DefPredMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct DefReachedMapBase : public Base {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &) { return 0; };
 		      DefReachedMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting ReachedMap
 		    ///
 		    /// \ref named-templ-param "Named parameter"
 		    ///function for setting ReachedMap
 		    ///
 		    template<class T>
 		    BfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
+		    {
 		      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BfsWizard<DefReachedMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct DefProcessedMapBase : public Base {
 		      typedef T ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &) { return 0; };
 		      DefProcessedMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting ProcessedMap
 		    ///
 		    /// \ref named-templ-param "Named parameter"
 		    ///function for setting ProcessedMap
 		    ///
 		    template<class T>
 		    BfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
+		    {
 		      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BfsWizard<DefProcessedMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct DefDistMapBase : public Base {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &) { return 0; };
 		      DefDistMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting DistMap type
 		    ///
 		    /// \ref named-templ-param "Named parameter"
 		    ///function for setting DistMap type
 		    ///
 		    template<class T>
 		    BfsWizard<DefDistMapBase<T> > distMap(const T &t)
+		    {
 		      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BfsWizard<DefDistMapBase<T> >(*this);
+		    }
 		    /// Sets the source node, from which the Bfs algorithm runs.
 		    /// Sets the source node, from which the Bfs algorithm runs.
 		    /// \param s is the source node.
 		    BfsWizard<TR> &source(Node s)
+		    {
 		      Base::_source=s;
 		      return *this;
+		    }
 		  };
 		  ///Function type interface for Bfs algorithm.
 		  /// \ingroup search
 		  ///Function type interface for Bfs algorithm.
 		  ///
 		  ///This function also has several
 		  ///\ref named-templ-func-param "named parameters",
 		  ///they are declared as the members of class \ref BfsWizard.
 		  ///The following
 		  ///example shows how to use these parameters.
 		  ///\code
 		  ///  bfs(g,source).predMap(preds).run();
 		  ///\endcode
 		  ///\warning Don't forget to put the \ref BfsWizard::run() "run()"
 		  ///to the end of the parameter list.
 		  ///\sa BfsWizard
 		  ///\sa Bfs
 		  template<class GR>
 		  BfsWizard<BfsWizardBase<GR> >
 		  bfs(const GR &g,typename GR::Node s=INVALID)
+		  {
 		    return BfsWizard<BfsWizardBase<GR> >(g,s);
+		  }
 		#ifdef DOXYGEN
 		  /// \brief Visitor class for bfs.
 		  ///
 		  /// This class defines the interface of the BfsVisit events, and
 		  /// it could be the base of a real Visitor class.
 		  template <typename _Digraph>
 		  struct BfsVisitor {
 		    typedef _Digraph Digraph;
 		    typedef typename Digraph::Arc Arc;
 		    typedef typename Digraph::Node Node;
 		    /// \brief Called when the arc reach a node.
 		    ///
 		    /// It is called when the bfs find an arc which target is not
 		    /// reached yet.
 		    void discover(const Arc& arc) {}
 		    /// \brief Called when the node reached first time.
 		    ///
 		    /// It is Called when the node reached first time.
 		    void reach(const Node& node) {}
 		    /// \brief Called when the arc examined but target of the arc
 		    /// already discovered.
 		    ///
 		    /// It called when the arc examined but the target of the arc
 		    /// already discovered.
 		    void examine(const Arc& arc) {}
 		    /// \brief Called for the source node of the bfs.
 		    ///
 		    /// It is called for the source node of the bfs.
 		    void start(const Node& node) {}
 		    /// \brief Called when the node processed.
 		    ///
 		    /// It is Called when the node processed.
 		    void process(const Node& node) {}
 		  };
 		#else
 		  template <typename _Digraph>
 		  struct BfsVisitor {
 		    typedef _Digraph Digraph;
 		    typedef typename Digraph::Arc Arc;
 		    typedef typename Digraph::Node Node;
 		    void discover(const Arc&) {}
 		    void reach(const Node&) {}
 		    void examine(const Arc&) {}
 		    void start(const Node&) {}
 		    void process(const Node&) {}
 		    template <typename _Visitor>
 		    struct Constraints {
 		      void constraints() {
 			Arc arc;
 			Node node;
 			visitor.discover(arc);
 			visitor.reach(node);
 			visitor.examine(arc);
 			visitor.start(node);
 		        visitor.process(node);
+		      }
 		      _Visitor& visitor;
 		    };
 		  };
 		#endif
 		  /// \brief Default traits class of BfsVisit class.
 		  ///
 		  /// Default traits class of BfsVisit class.
-		  /// \param _Digraph Digraph type.
+		  /// \tparam _Digraph Digraph type.
 		  template<class _Digraph>
 		  struct BfsVisitDefaultTraits {
 		    /// \brief The digraph type the algorithm runs on.
 		    typedef _Digraph Digraph;
 		    /// \brief The type of the map that indicates which nodes are reached.
 		    ///
 		    /// The type of the map that indicates which nodes are reached.
 		    /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    /// \todo named parameter to set this type, function to read and write.
 		    typedef typename Digraph::template NodeMap<bool> ReachedMap;
 		    /// \brief Instantiates a ReachedMap.
 		    ///
 		    /// This function instantiates a \ref ReachedMap.
 		    /// \param digraph is the digraph, to which
 		    /// we would like to define the \ref ReachedMap.
 		    static ReachedMap *createReachedMap(const Digraph &digraph) {
 		      return new ReachedMap(digraph);
+		    }
 		  };
 		  /// \ingroup search
 		  ///
 		  /// \brief %BFS Visit algorithm class.
 		  ///
 		  /// This class provides an efficient implementation of the %BFS algorithm
 		  /// with visitor interface.
 		  ///
 		  /// The %BfsVisit class provides an alternative interface to the Bfs
 		  /// class. It works with callback mechanism, the BfsVisit object calls
 		  /// on every bfs event the \c Visitor class member functions.
 		  ///
-		  /// \param _Digraph The digraph type the algorithm runs on. The default value is
+		  /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
 		  /// \ref ListDigraph. The value of _Digraph is not used directly by Bfs, it
 		  /// is only passed to \ref BfsDefaultTraits.
-		  /// \param _Visitor The Visitor object for the algorithm. The
+		  /// \tparam _Visitor The Visitor object for the algorithm. The
 		  /// \ref BfsVisitor "BfsVisitor<_Digraph>" is an empty Visitor which
 		  /// does not observe the Bfs events. If you want to observe the bfs
 		  /// events you should implement your own Visitor class.
-		  /// \param _Traits Traits class to set various data types used by the
+		  /// \tparam _Traits Traits class to set various data types used by the
 		  /// algorithm. The default traits class is
 		  /// \ref BfsVisitDefaultTraits "BfsVisitDefaultTraits<_Digraph>".
 		  /// See \ref BfsVisitDefaultTraits for the documentation of
 		  /// a Bfs visit traits class.
 		  ///
 		  /// \author Jacint Szabo, Alpar Juttner and Balazs Dezso
 		#ifdef DOXYGEN
 		  template <typename _Digraph, typename _Visitor, typename _Traits>
 		#else
 		  template <typename _Digraph = ListDigraph,
 			    typename _Visitor = BfsVisitor<_Digraph>,
 			    typename _Traits = BfsDefaultTraits<_Digraph> >
 		#endif
 		  class BfsVisit {
 		  public:
 		    /// \brief \ref Exception for uninitialized parameters.
 		    ///
 		    /// This error represents problems in the initialization
 		    /// of the parameters of the algorithms.
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
 		      virtual const char* what() const throw()
+		      {
 			return "lemon::BfsVisit::UninitializedParameter";
+		      }
 		    };
 		    typedef _Traits Traits;
 		    typedef typename Traits::Digraph Digraph;
 		    typedef _Visitor Visitor;
 		    ///The type of the map indicating which nodes are reached.
 		    typedef typename Traits::ReachedMap ReachedMap;
 		  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 *_digraph;
 		    /// Pointer to the visitor object.
 		    Visitor *_visitor;
 		    ///Pointer to the map of reached status of the nodes.
 		    ReachedMap *_reached;
 		    ///Indicates if \ref _reached is locally allocated (\c true) or not.
 		    bool local_reached;
 		    std::vector<typename Digraph::Node> _list;
 		    int _list_front, _list_back;
 		    /// \brief Creates the maps if necessary.
 		    ///
 		    /// Creates the maps if necessary.
 		    void create_maps() {
 		      if(!_reached) {
 			local_reached = true;
 			_reached = Traits::createReachedMap(*_digraph);
+		      }
+		    }
 		  protected:
 		    BfsVisit() {}
 		  public:
 		    typedef BfsVisit Create;
 		    /// \name Named template parameters
 		    ///@{
 		    template <class T>
 		    struct DefReachedMapTraits : public Traits {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &digraph) {
 			throw UninitializedParameter();
+		      }
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// ReachedMap type
 		    ///
 		    /// \ref named-templ-param "Named parameter" for setting ReachedMap type
 		    template <class T>
 		    struct DefReachedMap : public BfsVisit< Digraph, Visitor,
 							    DefReachedMapTraits<T> > {
 		      typedef BfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
 		    };
 		    ///@}
 		  public:
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor.
 		    ///
 		    /// \param digraph the digraph the algorithm will run on.
 		    /// \param visitor The visitor of the algorithm.
 		    ///
 		    BfsVisit(const Digraph& digraph, Visitor& visitor)
 		      : _digraph(&digraph), _visitor(&visitor),
 			_reached(0), local_reached(false) {}
 		    /// \brief Destructor.
 		    ///
 		    /// Destructor.
 		    ~BfsVisit() {
 		      if(local_reached) delete _reached;
+		    }
 		    /// \brief Sets the map indicating if a node is reached.
 		    ///
 		    /// Sets the map indicating if a node is reached.
 		    /// If you don't use this function before calling \ref run(),
 		    /// it will allocate one. The destuctor deallocates this
 		    /// automatically allocated map, of course.
 		    /// \return <tt> (*this) </tt>
 		    BfsVisit &reachedMap(ReachedMap &m) {
 		      if(local_reached) {
 			delete _reached;
 			local_reached = false;
+		      }
 		      _reached = &m;
 		      return *this;
+		    }
 		  public:
 		    /// \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 adda source node
 		    /// with \ref addSource().
 		    /// Finally \ref start() will perform the actual path
 		    /// computation.
 		    /// @{
 		    /// \brief Initializes the internal data structures.
 		    ///
 		    /// Initializes the internal data structures.
 		    ///
 		    void init() {
 		      create_maps();
 		      _list.resize(countNodes(*_digraph));
 		      _list_front = _list_back = -1;
 		      for (NodeIt u(*_digraph) ; u != INVALID ; ++u) {
 			_reached->set(u, false);
+		      }
+		    }
 		    /// \brief Adds a new source node.
 		    ///
 		    /// Adds a new source node to the set of nodes to be processed.
 		    void addSource(Node s) {
 		      if(!(*_reached)[s]) {
 			  _reached->set(s,true);
 			  _visitor->start(s);
 			  _visitor->reach(s);
 		          _list[++_list_back] = s;
+			}
+		    }
 		    /// \brief Processes the next node.
 		    ///
 		    /// Processes the next node.
 		    ///
 		    /// \return The processed node.
 		    ///
 		    /// \pre The queue must not be empty!
 		    Node processNextNode() {
 		      Node n = _list[++_list_front];
 		      _visitor->process(n);
 		      Arc e;
 		      for (_digraph->firstOut(e, n); e != INVALID; _digraph->nextOut(e)) {
 		        Node m = _digraph->target(e);
 		        if (!(*_reached)[m]) {
 		          _visitor->discover(e);
 		          _visitor->reach(m);
 		          _reached->set(m, true);
 		          _list[++_list_back] = m;
 		        } else {
 		          _visitor->examine(e);
+		        }
+		      }
 		      return n;
+		    }
 		    /// \brief Processes the next node.
 		    ///
 		    /// Processes the next node. And checks that the given target node
 		    /// is reached. If the target node is reachable from the processed
 		    /// node then the reached parameter will be set true. The reached
 		    /// parameter should be initially false.
 		    ///
 		    /// \param target The target node.
 		    /// \retval reach Indicates that the target node is reached.
 		    /// \return The processed node.
 		    ///
 		    /// \warning The queue must not be empty!
 		    Node processNextNode(Node target, bool& reach) {
 		      Node n = _list[++_list_front];
 		      _visitor->process(n);
 		      Arc e;
 		      for (_digraph->firstOut(e, n); e != INVALID; _digraph->nextOut(e)) {
 		        Node m = _digraph->target(e);
 		        if (!(*_reached)[m]) {
 		          _visitor->discover(e);
 		          _visitor->reach(m);
 		          _reached->set(m, true);
 		          _list[++_list_back] = m;
 		          reach = reach || (target == m);
 		        } else {
 		          _visitor->examine(e);
+		        }
+		      }
 		      return n;
+		    }
 		    /// \brief Processes the next node.
 		    ///
 		    /// Processes the next node. And checks that at least one of
 		    /// reached node has true value in the \c nm node map. If one node
 		    /// with true value is reachable from the processed node then the
 		    /// rnode parameter will be set to the first of such nodes.
 		    ///
 		    /// \param nm The node map of possible targets.
 		    /// \retval rnode The reached target node.
 		    /// \return The processed node.
 		    ///
 		    /// \warning The queue must not be empty!
 		    template <typename NM>
 		    Node processNextNode(const NM& nm, Node& rnode) {
 		      Node n = _list[++_list_front];
 		      _visitor->process(n);
 		      Arc e;
 		      for (_digraph->firstOut(e, n); e != INVALID; _digraph->nextOut(e)) {
 		        Node m = _digraph->target(e);
 		        if (!(*_reached)[m]) {
 		          _visitor->discover(e);
 		          _visitor->reach(m);
 		          _reached->set(m, true);
 		          _list[++_list_back] = m;
 		          if (nm[m] && rnode == INVALID) rnode = m;
 		        } else {
 		          _visitor->examine(e);
+		        }
+		      }
 		      return n;
+		    }
 		    /// \brief Next node to be processed.
 		    ///
 		    /// Next node to be processed.
 		    ///
 		    /// \return The next node to be processed or INVALID if the stack is
 		    /// empty.
 		    Node nextNode() {
 		      return _list_front != _list_back ? _list[_list_front + 1] : INVALID;
+		    }
 		    /// \brief Returns \c false if there are nodes
 		    /// to be processed in the queue
 		    ///
 		    /// Returns \c false if there are nodes
 		    /// to be processed in the queue
 		    bool emptyQueue() { return _list_front == _list_back; }
 		    /// \brief Returns the number of the nodes to be processed.
 		    ///
 		    /// Returns the number of the nodes to be processed in the queue.
 		    int queueSize() { return _list_back - _list_front; }
 		    /// \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.
 		    void start() {
 		      while ( !emptyQueue() ) processNextNode();
+		    }
 		    /// \brief Executes the algorithm until \c dest is reached.
 		    ///
 		    /// Executes the algorithm until \c dest is reached.
 		    ///
 		    /// \pre init() must be called and at least one node should be added
 		    /// with addSource() before using this function.
 		    void start(Node dest) {
 		      bool reach = false;
 		      while ( !emptyQueue() && !reach ) processNextNode(dest, reach);
+		    }
 		    /// \brief Executes the algorithm until a condition is met.
 		    ///
 		    /// Executes the algorithm until a condition is met.
 		    ///
 		    /// \pre init() must be called and at least one node should be added
 		    /// with addSource() before using this function.
 		    ///
 		    ///\param nm must be a 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.
 		    template <typename NM>
 		    Node start(const NM &nm) {
 		      Node rnode = INVALID;
 		      while ( !emptyQueue() && rnode == INVALID ) {
 			processNextNode(nm, rnode);
+		      }
 		      return rnode;
+		    }
 		    /// \brief Runs %BFSVisit algorithm from node \c s.
 		    ///
 		    /// This method runs the %BFS algorithm from a root node \c s.
 		    /// \note b.run(s) is just a shortcut of the following code.
 		    ///\code
 		    ///   b.init();
 		    ///   b.addSource(s);
 		    ///   b.start();
 		    ///\endcode
 		    void run(Node s) {
 		      init();
 		      addSource(s);
 		      start();
+		    }
 		    /// \brief Runs %BFSVisit algorithm to visit all nodes in the digraph.
 		    ///
 		    /// This method runs the %BFS algorithm in order to
 		    /// compute the %BFS path to each node. The algorithm computes
 		    /// - The %BFS tree.
 		    /// - The distance of each node from the root in the %BFS tree.
 		    ///
 		    ///\note b.run() is just a shortcut of the following code.
 		    ///\code
 		    ///  b.init();
 		    ///  for (NodeIt it(digraph); it != INVALID; ++it) {
 		    ///    if (!b.reached(it)) {
 		    ///      b.addSource(it);
 		    ///      b.start();
 		    ///    }
 		    ///  }
 		    ///\endcode
 		    void run() {
 		      init();
 		      for (NodeIt it(*_digraph); it != INVALID; ++it) {
 		        if (!reached(it)) {
 		          addSource(it);
 		          start();
+		        }
+		      }
+		    }
 		    ///@}
 		    /// \name Query Functions
 		    /// The result of the %BFS algorithm can be obtained using these
 		    /// functions.\n
 		    /// Before the use of these functions,
 		    /// either run() or start() must be called.
 		    ///@{
 		    /// \brief Checks if a node is reachable from the root.
 		    ///
 		    /// Returns \c true if \c v is reachable from the root(s).
 		    /// \warning The source nodes are inditated as unreachable.
 		    /// \pre Either \ref run() or \ref start()
 		    /// must be called before using this function.
 		    ///
 		    bool reached(Node v) { return (*_reached)[v]; }
 		    ///@}
 		  };
 		} //END OF NAMESPACE LEMON
 		#endif

lemon/bin_heap.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * 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_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 Compare specifies the ordering of the priorities. In a heap
 		  ///one can change the priority of an item, add or erase an item, etc.
 		  ///
 		  ///\param _Prio Type of the priority of the items.
 		  ///\param _ItemIntMap A read and writable Item int map, used internally
 		  ///\tparam _Prio Type of the priority of the items.
 		  ///\tparam _ItemIntMap A read and writable Item int map, used internally
 		  ///to handle the cross references.
-		  ///\param _Compare A class for the ordering of the priorities. The
+		  ///\tparam _Compare A class for the ordering of the priorities. The
 		  ///default is \c std::less<_Prio>.
 		  ///
 		  ///\sa FibHeap
 		  ///\sa Dijkstra
 		  template <typename _Prio, typename _ItemIntMap,
 			    typename _Compare = std::less<_Prio> >
 		  class BinHeap {
 		  public:
 		    ///\e
 		    typedef _ItemIntMap ItemIntMap;
 		    ///\e
 		    typedef _Prio Prio;
 		    ///\e
 		    typedef typename ItemIntMap::Key Item;
 		    ///\e
 		    typedef std::pair<Item,Prio> Pair;
 		    ///\e
 		    typedef _Compare 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 ItemIntMap \e should be initialized in such way that it maps
 		    /// PRE_HEAP (-1) to any element to be put in the heap...
 		    enum State {
 		      IN_HEAP = 0,
 		      PRE_HEAP = -1,
 		      POST_HEAP = -2
 		    };
 		  private:
 		    std::vector<Pair> data;
 		    Compare comp;
 		    ItemIntMap &iim;
 		  public:
 		    /// \brief The constructor.
 		    ///
 		    /// The constructor.
 		    /// \param _iim 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.
 		    explicit BinHeap(ItemIntMap &_iim) : iim(_iim) {}
 		    /// \brief The constructor.
 		    ///
 		    /// The constructor.
 		    /// \param _iim 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 &_iim, const Compare &_comp)
 		      : iim(_iim), 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.
 		    /// \pre \c i must be in the heap.
 		    /// \param i The item.
 		    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.
 		    /// \pre \c i must be stored in the heap with priority at least \c
 		    /// p relative to \c Compare.
 		    /// \param i The item.
 		    /// \param p The priority.
 		    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.
 		    /// \pre \c i must be stored in the heap with priority at most \c
 		    /// p relative to \c Compare.
 		    /// \param i The item.
 		    /// \param p The priority.
 		    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/bits/alteration_notifier.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * 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_BITS_ALTERATION_NOTIFIER_H
 		#define LEMON_BITS_ALTERATION_NOTIFIER_H
 		#include <vector>
 		#include <list>
 		#include <lemon/bits/utility.h>
 		///\ingroup graphbits
 		///\file
 		///\brief Observer notifier for graph alteration observers.
 		namespace lemon {
 		  /// \ingroup graphbits
 		  ///
 		  /// \brief Notifier class to notify observes about alterations in
 		  /// a container.
 		  ///
 		  /// The simple graph's can be refered as two containers, one node container
 		  /// and one edge container. But they are not standard containers they
 		  /// does not store values directly they are just key continars for more
 		  /// value containers which are the node and edge maps.
 		  ///
 		  /// The graph's node and edge sets can be changed as we add or erase
 		  /// nodes and edges in the graph. Lemon would like to handle easily
 		  /// that the node and edge maps should contain values for all nodes or
 		  /// edges. If we want to check on every indicing if the map contains
 		  /// the current indicing key that cause a drawback in the performance
 		  /// in the library. We use another solution we notify all maps about
 		  /// an alteration in the graph, which cause only drawback on the
 		  /// alteration of the graph.
 		  ///
 		  /// This class provides an interface to the container. The \e first() and \e
 		  /// next() member functions make possible to iterate on the keys of the
 		  /// container. The \e id() function returns an integer id for each key.
 		  /// The \e maxId() function gives back an upper bound of the ids.
 		  ///
 		  /// For the proper functonality of this class, we should notify it
 		  /// about each alteration in the container. The alterations have four type
 		  /// as \e add(), \e erase(), \e build() and \e clear(). The \e add() and
 		  /// \e erase() signals that only one or few items added or erased to or
 		  /// from the graph. If all items are erased from the graph or from an empty
 		  /// graph a new graph is builded then it can be signaled with the
 		  /// clear() and build() members. Important rule that if we erase items
 		  /// from graph we should first signal the alteration and after that erase
 		  /// them from the container, on the other way on item addition we should
 		  /// first extend the container and just after that signal the alteration.
 		  ///
 		  /// The alteration can be observed with a class inherited from the
 		  /// \e ObserverBase nested class. The signals can be handled with
 		  /// overriding the virtual functions defined in the base class.  The
 		  /// observer base can be attached to the notifier with the
 		  /// \e attach() member and can be detached with detach() function. The
 		  /// alteration handlers should not call any function which signals
 		  /// an other alteration in the same notifier and should not
 		  /// detach any observer from the notifier.
 		  ///
 		  /// Alteration observers try to be exception safe. If an \e add() or
 		  /// a \e clear() function throws an exception then the remaining
 		  /// observeres will not be notified and the fulfilled additions will
 		  /// be rolled back by calling the \e erase() or \e clear()
 		  /// functions. Thence the \e erase() and \e clear() should not throw
 		  /// exception. Actullay, it can be throw only
 		  /// \ref AlterationObserver::ImmediateDetach ImmediateDetach
 		  /// exception which detach the observer from the notifier.
 		  ///
 		  /// There are some place when the alteration observing is not completly
 		  /// reliable. If we want to carry out the node degree in the graph
 		  /// as in the \ref InDegMap and we use the reverseEdge that cause
 		  /// unreliable functionality. Because the alteration observing signals
 		  /// only erasing and adding but not the reversing it will stores bad
 		  /// degrees. The sub graph adaptors cannot signal the alterations because
 		  /// just a setting in the filter map can modify the graph and this cannot
 		  /// be watched in any way.
 		  ///
 		  /// \param _Container The container which is observed.
 		  /// \param _Item The item type which is obserbved.
 		  ///
 		  /// \author Balazs Dezso
 		  template <typename _Container, typename _Item>
 		  class AlterationNotifier {
 		  public:
 		    typedef True Notifier;
 		    typedef _Container Container;
 		    typedef _Item Item;
 		    /// \brief Exception which can be called from \e clear() and
 		    /// \e erase().
 		    ///
 		    /// From the \e clear() and \e erase() function only this
 		    /// exception is allowed to throw. The exception immediatly
 		    /// detaches the current observer from the notifier. Because the
 		    /// \e clear() and \e erase() should not throw other exceptions
 		    /// it can be used to invalidate the observer.
 		    struct ImmediateDetach {};
 		    /// \brief ObserverBase is the base class for the observers.
 		    ///
 		    /// ObserverBase is the abstract base class for the observers.
 		    /// It will be notified about an item was inserted into or
 		    /// erased from the graph.
 		    ///
 		    /// The observer interface contains some pure virtual functions
 		    /// to override. The add() and erase() functions are
 		    /// to notify the oberver when one item is added or
 		    /// erased.
 		    ///
 		    /// The build() and clear() members are to notify the observer
 		    /// about the container is built from an empty container or
 		    /// is cleared to an empty container.
 		    ///
 		    /// \author Balazs Dezso
 		    class ObserverBase {
 		    protected:
 		      typedef AlterationNotifier Notifier;
 		      friend class AlterationNotifier;
 		      /// \brief Default constructor.
 		      ///
 		      /// Default constructor for ObserverBase.
 		      ///
 		      ObserverBase() : _notifier(0) {}
 		      /// \brief Constructor which attach the observer into notifier.
 		      ///
 		      /// Constructor which attach the observer into notifier.
 		      ObserverBase(AlterationNotifier& nf) {
 		        attach(nf);
+		      }
 		      /// \brief Constructor which attach the obserever to the same notifier.
 		      ///
 		      /// Constructor which attach the obserever to the same notifier as
 		      /// the other observer is attached to.
 		      ObserverBase(const ObserverBase& copy) {
 			if (copy.attached()) {
 		          attach(*copy.notifier());
+			}
+		      }
 		      /// \brief Destructor
 		      virtual ~ObserverBase() {
 		        if (attached()) {
 		          detach();
+		        }
+		      }
 		      /// \brief Attaches the observer into an AlterationNotifier.
 		      ///
 		      /// This member attaches the observer into an AlterationNotifier.
 		      ///
 		      void attach(AlterationNotifier& nf) {
 			nf.attach(*this);
+		      }
 		      /// \brief Detaches the observer into an AlterationNotifier.
 		      ///
 		      /// This member detaches the observer from an AlterationNotifier.
 		      ///
 		      void detach() {
 		        _notifier->detach(*this);
+		      }
 		      /// \brief Gives back a pointer to the notifier which the map
 		      /// attached into.
 		      ///
 		      /// This function gives back a pointer to the notifier which the map
 		      /// attached into.
 		      ///
 		      Notifier* notifier() const { return const_cast<Notifier*>(_notifier); }
 		      /// Gives back true when the observer is attached into a notifier.
 		      bool attached() const { return _notifier != 0; }
 		    private:
 		      ObserverBase& operator=(const ObserverBase& copy);
 		    protected:
 		      Notifier* _notifier;
 		      typename std::list<ObserverBase*>::iterator _index;
 		      /// \brief The member function to notificate the observer about an
 		      /// item is added to the container.
 		      ///
 		      /// The add() member function notificates the observer about an item
 		      /// is added to the container. It have to be overrided in the
 		      /// subclasses.
 		      virtual void add(const Item&) = 0;
 		      /// \brief The member function to notificate the observer about
 		      /// more item is added to the container.
 		      ///
 		      /// The add() member function notificates the observer about more item
 		      /// is added to the container. It have to be overrided in the
 		      /// subclasses.
 		      virtual void add(const std::vector<Item>& items) = 0;
 		      /// \brief The member function to notificate the observer about an
 		      /// item is erased from the container.
 		      ///
 		      /// The erase() member function notificates the observer about an
 		      /// item is erased from the container. It have to be overrided in
 		      /// the subclasses.
 		      virtual void erase(const Item&) = 0;
 		      /// \brief The member function to notificate the observer about
 		      /// more item is erased from the container.
 		      ///
 		      /// The erase() member function notificates the observer about more item
 		      /// is erased from the container. It have to be overrided in the
 		      /// subclasses.
 		      virtual void erase(const std::vector<Item>& items) = 0;
 		      /// \brief The member function to notificate the observer about the
 		      /// container is built.
 		      ///
 		      /// The build() member function notificates the observer about the
 		      /// container is built from an empty container. It have to be
 		      /// overrided in the subclasses.
 		      virtual void build() = 0;
 		      /// \brief The member function to notificate the observer about all
 		      /// items are erased from the container.
 		      ///
 		      /// The clear() member function notificates the observer about all
 		      /// items are erased from the container. It have to be overrided in
 		      /// the subclasses.
 		      virtual void clear() = 0;
 		    };
 		  protected:
 		    const Container* container;
 		    typedef std::list<ObserverBase*> Observers;
 		    Observers _observers;
 		  public:
 		    /// \brief Default constructor.
 		    ///
 		    /// The default constructor of the AlterationNotifier.
 		    /// It creates an empty notifier.
 		    AlterationNotifier()
 		      : container(0) {}
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor with the observed container parameter.
 		    AlterationNotifier(const Container& _container)
 		      : container(&_container) {}
 		    /// \brief Copy Constructor of the AlterationNotifier.
 		    ///
 		    /// Copy constructor of the AlterationNotifier.
 		    /// It creates only an empty notifier because the copiable
 		    /// notifier's observers have to be registered still into that notifier.
 		    AlterationNotifier(const AlterationNotifier& _notifier)
 		      : container(_notifier.container) {}
 		    /// \brief Destructor.
 		    ///
 		    /// Destructor of the AlterationNotifier.
 		    ///
 		    ~AlterationNotifier() {
 		      typename Observers::iterator it;
 		      for (it = _observers.begin(); it != _observers.end(); ++it) {
 			(*it)->_notifier = 0;
+		      }
+		    }
 		    /// \brief Sets the container.
 		    ///
 		    /// Sets the container.
 		    void setContainer(const Container& _container) {
 		      container = &_container;
+		    }
 		  protected:
 		    AlterationNotifier& operator=(const AlterationNotifier&);
 		  public:
 		    /// \brief First item in the container.
 		    ///
 		    /// Returns the first item in the container. It is
 		    /// for start the iteration on the container.
 		    void first(Item& item) const {
 		      container->first(item);
+		    }
 		    /// \brief Next item in the container.
 		    ///
 		    /// Returns the next item in the container. It is
 		    /// for iterate on the container.
 		    void next(Item& item) const {
 		      container->next(item);
+		    }
 		    /// \brief Returns the id of the item.
 		    ///
 		    /// Returns the id of the item provided by the container.
 		    int id(const Item& item) const {
 		      return container->id(item);
+		    }
 		    /// \brief Returns the maximum id of the container.
 		    ///
 		    /// Returns the maximum id of the container.
 		    int maxId() const {
 		      return container->maxId(Item());
+		    }
 		  protected:
 		    void attach(ObserverBase& observer) {
 		      observer._index = _observers.insert(_observers.begin(), &observer);
 		      observer._notifier = this;
+		    }
 		    void detach(ObserverBase& observer) {
 		      _observers.erase(observer._index);
 		      observer._index = _observers.end();
 		      observer._notifier = 0;
+		    }
 		  public:
 		    /// \brief Notifies all the registed observers about an item added to
 		    /// the container.
 		    ///
 		    /// It notifies all the registed observers about an item added to
 		    /// the container.
 		    ///
 		    void add(const Item& item) {
 		      typename Observers::reverse_iterator it;
 		      try {
 		        for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
 		          (*it)->add(item);
+		        }
 		      } catch (...) {
 		        typename Observers::iterator jt;
 		        for (jt = it.base(); jt != _observers.end(); ++jt) {
 		          (*jt)->erase(item);
+		        }
 		        throw;
+		      }
+		    }
 		    /// \brief Notifies all the registed observers about more item added to
 		    /// the container.
 		    ///
 		    /// It notifies all the registed observers about more item added to
 		    /// the container.
 		    ///
 		    void add(const std::vector<Item>& items) {
 		      typename Observers::reverse_iterator it;
 		      try {
 		        for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
 		          (*it)->add(items);
+		        }
 		      } catch (...) {
 		        typename Observers::iterator jt;
 		        for (jt = it.base(); jt != _observers.end(); ++jt) {
 		          (*jt)->erase(items);
+		        }
 		        throw;
+		      }
+		    }
 		    /// \brief Notifies all the registed observers about an item erased from
 		    /// the container.
 		    ///
 		    /// It notifies all the registed observers about an item erased from
 		    /// the container.
 		    ///
 		    void erase(const Item& item) throw() {
 		      typename Observers::iterator it = _observers.begin();
 		      while (it != _observers.end()) {
 		        try {
 		          (*it)->erase(item);
 		          ++it;
 		        } catch (const ImmediateDetach&) {
 		          it = _observers.erase(it);
 		          (*it)->_index = _observers.end();
 		          (*it)->_notifier = 0;
+		        }
+		      }
+		    }
 		    /// \brief Notifies all the registed observers about more item erased
 		    /// from the container.
 		    ///
 		    /// It notifies all the registed observers about more item erased from
 		    /// the container.
 		    ///
 		    void erase(const std::vector<Item>& items) {
 		      typename Observers::iterator it = _observers.begin();
 		      while (it != _observers.end()) {
 		        try {
 		          (*it)->erase(items);
 		          ++it;
 		        } catch (const ImmediateDetach&) {
 		          it = _observers.erase(it);
 		          (*it)->_index = _observers.end();
 		          (*it)->_notifier = 0;
+		        }
+		      }
+		    }
 		    /// \brief Notifies all the registed observers about the container is
 		    /// built.
 		    ///
 		    /// Notifies all the registed observers about the container is built
 		    /// from an empty container.
 		    void build() {
 		      typename Observers::reverse_iterator it;
 		      try {
 		        for (it = _observers.rbegin(); it != _observers.rend(); ++it) {
 		          (*it)->build();
+		        }
 		      } catch (...) {
 		        typename Observers::iterator jt;
 		        for (jt = it.base(); jt != _observers.end(); ++jt) {
 		          (*jt)->clear();
+		        }
 		        throw;
+		      }
+		    }
 		    /// \brief Notifies all the registed observers about all items are
 		    /// erased.
 		    ///
 		    /// Notifies all the registed observers about all items are erased
 		    /// from the container.
 		    void clear() {
 		      typename Observers::iterator it = _observers.begin();
 		      while (it != _observers.end()) {
 		        try {
 		          (*it)->clear();
 		          ++it;
 		        } catch (const ImmediateDetach&) {
 		          it = _observers.erase(it);
 		          (*it)->_index = _observers.end();
 		          (*it)->_notifier = 0;
+		        }
+		      }
+		    }
 		  };
+		}
 		#endif

lemon/bits/bezier.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * 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_BEZIER_H
 		#define LEMON_BEZIER_H
 		///\ingroup misc
 		///\file
 		///\brief Classes to compute with Bezier curves.
 		///
 		///Up to now this file is used internally by \ref graph_to_eps.h
 		///
 		///\author Alpar Juttner
 		#include<lemon/dim2.h>
 		namespace lemon {
 		  namespace dim2 {
 		class BezierBase {
 		public:
 		  typedef Point<double> Point;
 		protected:
 		  static Point conv(Point x,Point y,double t) {return (1-t)*x+t*y;}
 		};
 		class Bezier1 : public BezierBase
+		{
 		public:
 		  Point p1,p2;
 		  Bezier1() {}
 		  Bezier1(Point _p1, Point _p2) :p1(_p1), p2(_p2) {}
 		  Point operator()(double t) const
+		  {
 		    //    return conv(conv(p1,p2,t),conv(p2,p3,t),t);
 		    return conv(p1,p2,t);
+		  }
 		  Bezier1 before(double t) const
+		  {
 		    return Bezier1(p1,conv(p1,p2,t));
+		  }
 		  Bezier1 after(double t) const
+		  {
 		    return Bezier1(conv(p1,p2,t),p2);
+		  }
 		  Bezier1 revert() const { return Bezier1(p2,p1);}
 		  Bezier1 operator()(double a,double b) const { return before(b).after(a/b); }
 		  Point grad() const { return p2-p1; }
 		  Point norm() const { return rot90(p2-p1); }
 		  Point grad(double) const { return grad(); }
 		  Point norm(double t) const { return rot90(grad(t)); }
 		};
 		class Bezier2 : public BezierBase
+		{
 		public:
 		  Point p1,p2,p3;
 		  Bezier2() {}
 		  Bezier2(Point _p1, Point _p2, Point _p3) :p1(_p1), p2(_p2), p3(_p3) {}
 		  Bezier2(const Bezier1 &b) : p1(b.p1), p2(conv(b.p1,b.p2,.5)), p3(b.p2) {}
 		  Point operator()(double t) const
+		  {
 		    //    return conv(conv(p1,p2,t),conv(p2,p3,t),t);
 		    return ((1-t)*(1-t))*p1+(2*(1-t)*t)*p2+(t*t)*p3;
+		  }
 		  Bezier2 before(double t) const
+		  {
 		    Point q(conv(p1,p2,t));
 		    Point r(conv(p2,p3,t));
 		    return Bezier2(p1,q,conv(q,r,t));
+		  }
 		  Bezier2 after(double t) const
+		  {
 		    Point q(conv(p1,p2,t));
 		    Point r(conv(p2,p3,t));
 		    return Bezier2(conv(q,r,t),r,p3);
+		  }
 		  Bezier2 revert() const { return Bezier2(p3,p2,p1);}
 		  Bezier2 operator()(double a,double b) const { return before(b).after(a/b); }
 		  Bezier1 grad() const { return Bezier1(2.0*(p2-p1),2.0*(p3-p2)); }
 		  Bezier1 norm() const { return Bezier1(2.0*rot90(p2-p1),2.0*rot90(p3-p2)); }
 		  Point grad(double t) const { return grad()(t); }
 		  Point norm(double t) const { return rot90(grad(t)); }
 		};
 		class Bezier3 : public BezierBase
+		{
 		public:
 		  Point p1,p2,p3,p4;
 		  Bezier3() {}
 		  Bezier3(Point _p1, Point _p2, Point _p3, Point _p4)
 		    : p1(_p1), p2(_p2), p3(_p3), p4(_p4) {}
 		  Bezier3(const Bezier1 &b) : p1(b.p1), p2(conv(b.p1,b.p2,1.0/3.0)),
 					      p3(conv(b.p1,b.p2,2.0/3.0)), p4(b.p2) {}
 		  Bezier3(const Bezier2 &b) : p1(b.p1), p2(conv(b.p1,b.p2,2.0/3.0)),
 					      p3(conv(b.p2,b.p3,1.0/3.0)), p4(b.p3) {}
 		  Point operator()(double t) const
+		    {
 		      //    return Bezier2(conv(p1,p2,t),conv(p2,p3,t),conv(p3,p4,t))(t);
 		      return ((1-t)*(1-t)*(1-t))*p1+(3*t*(1-t)*(1-t))*p2+
 			(3*t*t*(1-t))*p3+(t*t*t)*p4;
+		    }
 		  Bezier3 before(double t) const
+		    {
 		      Point p(conv(p1,p2,t));
 		      Point q(conv(p2,p3,t));
 		      Point r(conv(p3,p4,t));
 		      Point a(conv(p,q,t));
 		      Point b(conv(q,r,t));
 		      Point c(conv(a,b,t));
 		      return Bezier3(p1,p,a,c);
+		    }
 		  Bezier3 after(double t) const
+		    {
 		      Point p(conv(p1,p2,t));
 		      Point q(conv(p2,p3,t));
 		      Point r(conv(p3,p4,t));
 		      Point a(conv(p,q,t));
 		      Point b(conv(q,r,t));
 		      Point c(conv(a,b,t));
 		      return Bezier3(c,b,r,p4);
+		    }
 		  Bezier3 revert() const { return Bezier3(p4,p3,p2,p1);}
 		  Bezier3 operator()(double a,double b) const { return before(b).after(a/b); }
 		  Bezier2 grad() const { return Bezier2(3.0*(p2-p1),3.0*(p3-p2),3.0*(p4-p3)); }
 		  Bezier2 norm() const { return Bezier2(3.0*rot90(p2-p1),
 .0*rot90(p3-p2),
 .0*rot90(p4-p3)); }
 		  Point grad(double t) const { return grad()(t); }
 		  Point norm(double t) const { return rot90(grad(t)); }
 		  template<class R,class F,class S,class D>
 		  R recSplit(F &_f,const S &_s,D _d) const
+		  {
 		    const Point a=(p1+p2)/2;
 		    const Point b=(p2+p3)/2;
 		    const Point c=(p3+p4)/2;
 		    const Point d=(a+b)/2;
 		    const Point e=(b+c)/2;
 		    const Point f=(d+e)/2;
 		    R f1=_f(Bezier3(p1,a,d,e),_d);
 		    R f2=_f(Bezier3(e,d,c,p4),_d);
 		    return _s(f1,f2);
+		  }
 		};
 		} //END OF NAMESPACE dim2
 		} //END OF NAMESPACE lemon
 		#endif // LEMON_BEZIER_H

lemon/bits/vector_map.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * 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_BITS_VECTOR_MAP_H
 		#define LEMON_BITS_VECTOR_MAP_H
 		#include <vector>
 		#include <algorithm>
 		#include <lemon/bits/traits.h>
 		#include <lemon/bits/utility.h>
 		#include <lemon/bits/alteration_notifier.h>
 		#include <lemon/concept_check.h>
 		#include <lemon/concepts/maps.h>
 		///\ingroup graphbits
 		///
 		///\file
 		///\brief Vector based graph maps.
 		namespace lemon {
 		  /// \ingroup graphbits
 		  ///
 		  /// \brief Graph map based on the std::vector storage.
 		  ///
 		  /// The VectorMap template class is graph map structure what
 		  /// automatically updates the map when a key is added to or erased from
 		  /// the map. This map type uses the std::vector to store the values.
 		  ///
 		  /// \param Notifier The AlterationNotifier that will notify this map.
 		  /// \param Item The item type of the graph items.
 		  /// \param Value The value type of the map.
 		  ///
-		  /// \author Balazs Dezso
+		  /// \tparam _Notifier The AlterationNotifier that will notify this map.
 		  /// \tparam _Item The item type of the graph items.
 		  /// \tparam _Value The value type of the map.
 		  /// \todo Fix the doc: there is _Graph parameter instead of _Notifier.
 		  template <typename _Graph, typename _Item, typename _Value>
 		  class VectorMap
 		    : public ItemSetTraits<_Graph, _Item>::ItemNotifier::ObserverBase {
 		  private:
 		    /// The container type of the map.
 		    typedef std::vector<_Value> Container;
 		  public:
 		    /// The graph type of the map.
 		    typedef _Graph Graph;
 		    /// The item type of the map.
 		    typedef _Item Item;
 		    /// The reference map tag.
 		    typedef True ReferenceMapTag;
 		    /// The key type of the map.
 		    typedef _Item Key;
 		    /// The value type of the map.
 		    typedef _Value Value;
 		    /// The notifier type.
 		    typedef typename ItemSetTraits<_Graph, _Item>::ItemNotifier Notifier;
 		    /// The map type.
 		    typedef VectorMap Map;
 		    /// The base class of the map.
 		    typedef typename Notifier::ObserverBase Parent;
 		    /// The reference type of the map;
 		    typedef typename Container::reference Reference;
 		    /// The const reference type of the map;
 		    typedef typename Container::const_reference ConstReference;
 		    /// \brief Constructor to attach the new map into the notifier.
 		    ///
 		    /// It constructs a map and attachs it into the notifier.
 		    /// It adds all the items of the graph to the map.
 		    VectorMap(const Graph& graph) {
 		      Parent::attach(graph.notifier(Item()));
 		      container.resize(Parent::notifier()->maxId() + 1);
+		    }
 		    /// \brief Constructor uses given value to initialize the map.
 		    ///
 		    /// It constructs a map uses a given value to initialize the map.
 		    /// It adds all the items of the graph to the map.
 		    VectorMap(const Graph& graph, const Value& value) {
 		      Parent::attach(graph.notifier(Item()));
 		      container.resize(Parent::notifier()->maxId() + 1, value);
+		    }
 		    /// \brief Copy constructor
 		    ///
 		    /// Copy constructor.
 		    VectorMap(const VectorMap& _copy) : Parent() {
 		      if (_copy.attached()) {
 			Parent::attach(*_copy.notifier());
 			container = _copy.container;
+		      }
+		    }
 		    /// \brief Assign operator.
 		    ///
 		    /// This operator assigns for each item in the map the
 		    /// value mapped to the same item in the copied map.
 		    /// The parameter map should be indiced with the same
 		    /// itemset because this assign operator does not change
 		    /// the container of the map.
 		    VectorMap& operator=(const VectorMap& cmap) {
 		      return operator=<VectorMap>(cmap);
+		    }
 		    /// \brief Template assign operator.
 		    ///
 		    /// The given parameter should be conform to the ReadMap
 		    /// concecpt and could be indiced by the current item set of
 		    /// the NodeMap. In this case the value for each item
 		    /// is assigned by the value of the given ReadMap.
 		    template <typename CMap>
 		    VectorMap& operator=(const CMap& cmap) {
 		      checkConcept<concepts::ReadMap<Key, _Value>, CMap>();
 		      const typename Parent::Notifier* nf = Parent::notifier();
 		      Item it;
 		      for (nf->first(it); it != INVALID; nf->next(it)) {
 		        set(it, cmap[it]);
+		      }
 		      return *this;
+		    }
 		  public:
 		    /// \brief The subcript operator.
 		    ///
 		    /// The subscript operator. The map can be subscripted by the
 		    /// actual items of the graph.
 		    Reference operator[](const Key& key) {
 		      return container[Parent::notifier()->id(key)];
+		    }
 		    /// \brief The const subcript operator.
 		    ///
 		    /// The const subscript operator. The map can be subscripted by the
 		    /// actual items of the graph.
 		    ConstReference operator[](const Key& key) const {
 		      return container[Parent::notifier()->id(key)];
+		    }
 		    /// \brief The setter function of the map.
 		    ///
 		    /// It the same as operator[](key) = value expression.
 		    void set(const Key& key, const Value& value) {
 		      (*this)[key] = value;
+		    }
 		  protected:
 		    /// \brief Adds a new key to the map.
 		    ///
 		    /// It adds a new key to the map. It called by the observer notifier
 		    /// and it overrides the add() member function of the observer base.
 		    virtual void add(const Key& key) {
 		      int id = Parent::notifier()->id(key);
 		      if (id >= int(container.size())) {
 			container.resize(id + 1);
+		      }
+		    }
 		    /// \brief Adds more new keys to the map.
 		    ///
 		    /// It adds more new keys to the map. It called by the observer notifier
 		    /// and it overrides the add() member function of the observer base.
 		    virtual void add(const std::vector<Key>& keys) {
 		      int max = container.size() - 1;
 		      for (int i = 0; i < int(keys.size()); ++i) {
 		        int id = Parent::notifier()->id(keys[i]);
 		        if (id >= max) {
 		          max = id;
+		        }
+		      }
 		      container.resize(max + 1);
+		    }
 		    /// \brief Erase a key from the map.
 		    ///
 		    /// Erase a key from the map. It called by the observer notifier
 		    /// and it overrides the erase() member function of the observer base.
 		    virtual void erase(const Key& key) {
 		      container[Parent::notifier()->id(key)] = Value();
+		    }
 		    /// \brief Erase more keys from the map.
 		    ///
 		    /// Erase more keys from the map. It called by the observer notifier
 		    /// and it overrides the erase() member function of the observer base.
 		    virtual void erase(const std::vector<Key>& keys) {
 		      for (int i = 0; i < int(keys.size()); ++i) {
 			container[Parent::notifier()->id(keys[i])] = Value();
+		      }
+		    }
 		    /// \brief Buildes the map.
 		    ///
 		    /// It buildes the map. It called by the observer notifier
 		    /// and it overrides the build() member function of the observer base.
 		    virtual void build() {
 		      int size = Parent::notifier()->maxId() + 1;
 		      container.reserve(size);
 		      container.resize(size);
+		    }
 		    /// \brief Clear the map.
 		    ///
 		    /// It erase all items from the map. It called by the observer notifier
 		    /// and it overrides the clear() member function of the observer base.
 		    virtual void clear() {
 		      container.clear();
+		    }
 		  private:
 		    Container container;
 		  };
+		}
 		#endif

lemon/color.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * 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_COLOR_H
 		#define LEMON_COLOR_H
 		#include<vector>
 		#include<lemon/math.h>
 		#include<lemon/maps.h>
 		///\ingroup misc
 		///\file
 		///\brief Tools to manage RGB colors.
 		///
 		///\author Alpar Juttner
 		namespace lemon {
 		  /// \addtogroup misc
 		  /// @{
 		  ///Data structure representing RGB colors.
 		  ///Data structure representing RGB colors.
 		  class Color
+		  {
 		    double _r,_g,_b;
 		  public:
 		    ///Default constructor
 		    Color() {}
 		    ///Constructor
 		    Color(double r,double g,double b) :_r(r),_g(g),_b(b) {};
 		    ///Set the red component
 		    double & red() {return _r;}
 		    ///Return the red component
 		    const double & red() const {return _r;}
 		    ///Set the green component
 		    double & green() {return _g;}
 		    ///Return the green component
 		    const double & green() const {return _g;}
 		    ///Set the blue component
 		    double & blue() {return _b;}
 		    ///Return the blue component
 		    const double & blue() const {return _b;}
 		    ///Set the color components
 		    void set(double r,double g,double b) { _r=r;_g=g;_b=b; };
 		  };
 		  /// White color constant
 		  extern const Color WHITE;
 		  /// Black color constant
 		  extern const Color BLACK;
 		  /// Red color constant
 		  extern const Color RED;
 		  /// Green color constant
 		  extern const Color GREEN;
 		  /// Blue color constant
 		  extern const Color BLUE;
 		  /// Yellow color constant
 		  extern const Color YELLOW;
 		  /// Magenta color constant
 		  extern const Color MAGENTA;
 		  /// Cyan color constant
 		  extern const Color CYAN;
 		  /// Grey color constant
 		  extern const Color GREY;
 		  /// Dark red color constant
 		  extern const Color DARK_RED;
 		  /// Dark green color constant
 		  extern const Color DARK_GREEN;
 		  /// Drak blue color constant
 		  extern const Color DARK_BLUE;
 		  /// Dark yellow color constant
 		  extern const Color DARK_YELLOW;
 		  /// Dark magenta color constant
 		  extern const Color DARK_MAGENTA;
 		  /// Dark cyan color constant
 		  extern const Color DARK_CYAN;
 		  ///Map <tt>int</tt>s to different \ref Color "Color"s
 		  ///This map assigns one of the predefined \ref Color "Color"s to
 		  ///each <tt>int</tt>. It is possible to change the colors as well as
 		  ///their number. The integer range is cyclically mapped to the
 		  ///provided set of colors.
 		  ///
 		  ///This is a true \ref concepts::ReferenceMap "reference map", so
 		  ///you can also change the actual colors.
 		  class Palette : public MapBase<int,Color>
+		  {
 		    std::vector<Color> colors;
 		  public:
 		    ///Constructor
 		    ///Constructor
 		    ///\param have_white indicates whether white is amongst the
 		    ///provided initial colors (\c true) or not (\c false). If it is true,
 		    ///white will be assigned to \c 0.
 		    ///\param num the number of the allocated colors. If it is \c -1,
 		    ///the default color configuration is set up (26 color plus optionaly the
 		    ///white).  If \c num is less then 26/27 then the default color
 		    ///list is cut. Otherwise the color list is filled repeatedly with
 		    ///the default color list.  (The colors can be changed later on.)
 		    Palette(bool have_white=false,int num=-1)
+		    {
 		      if (num==0) return;
 		      do {
 		        if(have_white) colors.push_back(Color(1,1,1));
 		        colors.push_back(Color(0,0,0));
 		        colors.push_back(Color(1,0,0));
 		        colors.push_back(Color(0,1,0));
 		        colors.push_back(Color(0,0,1));
 		        colors.push_back(Color(1,1,0));
 		        colors.push_back(Color(1,0,1));
 		        colors.push_back(Color(0,1,1));
 		        colors.push_back(Color(.5,0,0));
 		        colors.push_back(Color(0,.5,0));
 		        colors.push_back(Color(0,0,.5));
 		        colors.push_back(Color(.5,.5,0));
 		        colors.push_back(Color(.5,0,.5));
 		        colors.push_back(Color(0,.5,.5));
 		        colors.push_back(Color(.5,.5,.5));
 		        colors.push_back(Color(1,.5,.5));
 		        colors.push_back(Color(.5,1,.5));
 		        colors.push_back(Color(.5,.5,1));
 		        colors.push_back(Color(1,1,.5));
 		        colors.push_back(Color(1,.5,1));
 		        colors.push_back(Color(.5,1,1));
 		        colors.push_back(Color(1,.5,0));
 		        colors.push_back(Color(.5,1,0));
 		        colors.push_back(Color(1,0,.5));
 		        colors.push_back(Color(0,1,.5));
 		        colors.push_back(Color(0,.5,1));
 		        colors.push_back(Color(.5,0,1));
 		      } while(int(colors.size())<num);
 		      //    colors.push_back(Color(1,1,1));
 		      if(num>=0) colors.resize(num);
+		    }
 		    ///\e
 		    Color &operator[](int i)
+		    {
 		      return colors[i%colors.size()];
+		    }
 		    ///\e
 		    const Color &operator[](int i) const
+		    {
 		      return colors[i%colors.size()];
+		    }
 		    ///\e
 		    void set(int i,const Color &c)
+		    {
 		      colors[i%colors.size()]=c;
+		    }
 		    ///Add a new color to the end of the color list.
 		    void add(const Color &c)
+		    {
 		      colors.push_back(c);
+		    }
 		    ///Sets the number of the exiting colors.
 		    void resize(int s) { colors.resize(s);}
 		    ///Returns the number of the existing colors.
 		    int size() const { return int(colors.size());}
 		  };
 		  ///Returns a visibly distinct \ref Color
 		  ///Returns a \ref Color which is as different from the given parameter
 		  ///as it is possible.
 		  inline Color distantColor(const Color &c)
+		  {
 		    return Color(c.red()<.5?1:0,c.green()<.5?1:0,c.blue()<.5?1:0);
+		  }
 		  ///Returns black for light colors and white for the dark ones.
 		  ///Returns black for light colors and white for the dark ones.
 		  inline Color distantBW(const Color &c){
 		    return (.2125*c.red()+.7154*c.green()+.0721*c.blue())<.5 ? WHITE : BLACK;
+		  }
 		  /// @}
 		} //END OF NAMESPACE LEMON
 		#endif // LEMON_COLOR_H

lemon/concepts/path.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * 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.
+		 *
 		 */
 		///\ingroup concept
 		///\file
 		///\brief Classes for representing paths in digraphs.
 		///
 		///\todo Iterators have obsolete style
 		#ifndef LEMON_CONCEPT_PATH_H
 		#define LEMON_CONCEPT_PATH_H
 		#include <lemon/bits/invalid.h>
 		#include <lemon/bits/utility.h>
 		#include <lemon/concept_check.h>
 		namespace lemon {
 		  namespace concepts {
 		    /// \addtogroup concept
 		    /// @{
 		    /// \brief A skeleton structure for representing directed paths in
 		    /// a digraph.
 		    ///
 		    /// A skeleton structure for representing directed paths in a
 		    /// digraph.
-		    /// \param _Digraph The digraph type in which the path is.
+		    /// \tparam _Digraph The digraph type in which the path is.
 		    ///
 		    /// In a sense, the path can be treated as a list of arcs. The
 		    /// lemon path type stores just this list. As a consequence it
 		    /// cannot enumerate the nodes in the path and the zero length
 		    /// paths cannot store the source.
 		    ///
 		    template <typename _Digraph>
 		    class Path {
 		    public:
 		      /// Type of the underlying digraph.
 		      typedef _Digraph Digraph;
 		      /// Arc type of the underlying digraph.
 		      typedef typename Digraph::Arc Arc;
 		      class ArcIt;
 		      /// \brief Default constructor
 		      Path() {}
 		      /// \brief Template constructor
 		      template <typename CPath>
 		      Path(const CPath& cpath) {}
 		      /// \brief Template assigment
 		      template <typename CPath>
 		      Path& operator=(const CPath& cpath) {}
 		      /// Length of the path ie. the number of arcs in the path.
 		      int length() const { return 0;}
 		      /// Returns whether the path is empty.
 		      bool empty() const { return true;}
 		      /// Resets the path to an empty path.
 		      void clear() {}
 		      /// \brief Lemon style iterator for path arcs
 		      ///
 		      /// This class is used to iterate on the arcs of the paths.
 		      class ArcIt {
 		      public:
 			/// Default constructor
 			ArcIt() {}
 			/// Invalid constructor
 			ArcIt(Invalid) {}
 			/// Constructor for first arc
 			ArcIt(const Path &) {}
 		        /// Conversion to Arc
 			operator Arc() const { return INVALID; }
 			/// Next arc
 			ArcIt& operator++() {return *this;}
 			/// Comparison operator
 			bool operator==(const ArcIt&) const {return true;}
 			/// Comparison operator
 			bool operator!=(const ArcIt&) const {return true;}
 		 	/// Comparison operator
 		 	bool operator<(const ArcIt&) const {return false;}
 		      };
 		      template <typename _Path>
 		      struct Constraints {
 		        void constraints() {
 		          Path<Digraph> pc;
 		          _Path p, pp(pc);
 		          int l = p.length();
 		          int e = p.empty();
 		          p.clear();
 		          p = pc;
 		          typename _Path::ArcIt id, ii(INVALID), i(p);
 		          ++i;
 		          typename Digraph::Arc ed = i;
 		          e = (i == ii);
 		          e = (i != ii);
 		          e = (i < ii);
 		          ignore_unused_variable_warning(l);
 		          ignore_unused_variable_warning(pp);
 		          ignore_unused_variable_warning(e);
 		          ignore_unused_variable_warning(id);
 		          ignore_unused_variable_warning(ii);
 		          ignore_unused_variable_warning(ed);
+		        }
 		      };
 		    };
 		    namespace _path_bits {
 		      template <typename _Digraph, typename _Path, typename RevPathTag = void>
 		      struct PathDumperConstraints {
 		        void constraints() {
 		          int l = p.length();
 		          int e = p.empty();
 		          typename _Path::ArcIt id, i(p);
 		          ++i;
 		          typename _Digraph::Arc ed = i;
 		          e = (i == INVALID);
 		          e = (i != INVALID);
 		          ignore_unused_variable_warning(l);
 		          ignore_unused_variable_warning(e);
 		          ignore_unused_variable_warning(id);
 		          ignore_unused_variable_warning(ed);
+		        }
 		        _Path& p;
 		      };
 		      template <typename _Digraph, typename _Path>
 		      struct PathDumperConstraints<
 		        _Digraph, _Path,
 		        typename enable_if<typename _Path::RevPathTag, void>::type
 		      > {
 		        void constraints() {
 		          int l = p.length();
 		          int e = p.empty();
 		          typename _Path::RevArcIt id, i(p);
 		          ++i;
 		          typename _Digraph::Arc ed = i;
 		          e = (i == INVALID);
 		          e = (i != INVALID);
 		          ignore_unused_variable_warning(l);
 		          ignore_unused_variable_warning(e);
 		          ignore_unused_variable_warning(id);
 		          ignore_unused_variable_warning(ed);
+		        }
 		        _Path& p;
 		      };
+		    }
 		    /// \brief A skeleton structure for path dumpers.
 		    ///
 		    /// A skeleton structure for path dumpers. The path dumpers are
 		    /// the generalization of the paths. The path dumpers can
 		    /// enumerate the arcs of the path wheter in forward or in
 		    /// backward order.  In most time these classes are not used
 		    /// directly rather it used to assign a dumped class to a real
 		    /// path type.
 		    ///
 		    /// The main purpose of this concept is that the shortest path
 		    /// algorithms can enumerate easily the arcs in reverse order.
 		    /// If we would like to give back a real path from these
 		    /// algorithms then we should create a temporarly path object. In
 		    /// Lemon such algorithms gives back a path dumper what can
 		    /// assigned to a real path and the dumpers can be implemented as
 		    /// an adaptor class to the predecessor map.
-		    /// \param _Digraph  The digraph type in which the path is.
+		    /// \tparam _Digraph  The digraph type in which the path is.
 		    ///
 		    /// The paths can be constructed from any path type by a
 		    /// template constructor or a template assignment operator.
 		    ///
 		    template <typename _Digraph>
 		    class PathDumper {
 		    public:
 		      /// Type of the underlying digraph.
 		      typedef _Digraph Digraph;
 		      /// Arc type of the underlying digraph.
 		      typedef typename Digraph::Arc Arc;
 		      /// Length of the path ie. the number of arcs in the path.
 		      int length() const { return 0;}
 		      /// Returns whether the path is empty.
 		      bool empty() const { return true;}
 		      /// \brief Forward or reverse dumping
 		      ///
 		      /// If the RevPathTag is defined and true then reverse dumping
 		      /// is provided in the path dumper. In this case instead of the
 		      /// ArcIt the RevArcIt iterator should be implemented in the
 		      /// dumper.
 		      typedef False RevPathTag;
 		      /// \brief Lemon style iterator for path arcs
 		      ///
 		      /// This class is used to iterate on the arcs of the paths.
 		      class ArcIt {
 		      public:
 			/// Default constructor
 			ArcIt() {}
 			/// Invalid constructor
 			ArcIt(Invalid) {}
 			/// Constructor for first arc
 			ArcIt(const PathDumper&) {}
 		        /// Conversion to Arc
 			operator Arc() const { return INVALID; }
 			/// Next arc
 			ArcIt& operator++() {return *this;}
 			/// Comparison operator
 			bool operator==(const ArcIt&) const {return true;}
 			/// Comparison operator
 			bool operator!=(const ArcIt&) const {return true;}
 		 	/// Comparison operator
 		 	bool operator<(const ArcIt&) const {return false;}
 		      };
 		      /// \brief Lemon style iterator for path arcs
 		      ///
 		      /// This class is used to iterate on the arcs of the paths in
 		      /// reverse direction.
 		      class RevArcIt {
 		      public:
 			/// Default constructor
 			RevArcIt() {}
 			/// Invalid constructor
 			RevArcIt(Invalid) {}
 			/// Constructor for first arc
 			RevArcIt(const PathDumper &) {}
 		        /// Conversion to Arc
 			operator Arc() const { return INVALID; }
 			/// Next arc
 			RevArcIt& operator++() {return *this;}
 			/// Comparison operator
 			bool operator==(const RevArcIt&) const {return true;}
 			/// Comparison operator
 			bool operator!=(const RevArcIt&) const {return true;}
 		 	/// Comparison operator
 		 	bool operator<(const RevArcIt&) const {return false;}
 		      };
 		      template <typename _Path>
 		      struct Constraints {
 		        void constraints() {
 		          function_requires<_path_bits::
 		            PathDumperConstraints<Digraph, _Path> >();
+		        }
 		      };
 		    };
 		    ///@}
+		  }
 		} // namespace lemon
 		#endif // LEMON_CONCEPT_PATH_H

lemon/dfs.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * 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_DFS_H
 		#define LEMON_DFS_H
 		///\ingroup search
 		///\file
 		///\brief Dfs algorithm.
 		#include <lemon/list_graph.h>
 		#include <lemon/graph_utils.h>
 		#include <lemon/bits/path_dump.h>
 		#include <lemon/bits/invalid.h>
 		#include <lemon/error.h>
 		#include <lemon/maps.h>
 		#include <lemon/concept_check.h>
 		namespace lemon {
 		  ///Default traits class of Dfs class.
 		  ///Default traits class of Dfs class.
-		  ///\param GR Digraph type.
+		  ///\tparam GR Digraph type.
 		  template<class GR>
 		  struct DfsDefaultTraits
+		  {
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the %DFS paths.
 		    ///
 		    ///The type of the map that stores the last
 		    ///arcs of the %DFS paths.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef typename Digraph::template NodeMap<typename GR::Arc> PredMap;
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param G is the digraph, to which we would like to define the PredMap.
 		    ///\todo The digraph alone may be insufficient to initialize
 		    static PredMap *createPredMap(const GR &G)
+		    {
 		      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.
 		    ///\todo named parameter to set this type, function to read and write.
 		    typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
 		    ///Instantiates a 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 GR &g)
 		#else
 		    static ProcessedMap *createProcessedMap(const GR &)
 		#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::WriteMap "WriteMap" concept.
 		    ///\todo named parameter to set this type, function to read and write.
 		    typedef typename Digraph::template NodeMap<bool> ReachedMap;
 		    ///Instantiates a 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 GR &G)
+		    {
 		      return new ReachedMap(G);
+		    }
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef typename Digraph::template NodeMap<int> DistMap;
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param G is the digraph, to which we would like to define the \ref DistMap
 		    static DistMap *createDistMap(const GR &G)
+		    {
 		      return new DistMap(G);
+		    }
 		  };
 		  ///%DFS algorithm class.
 		  ///\ingroup search
 		  ///This class provides an efficient implementation of the %DFS algorithm.
 		  ///
-		  ///\param GR The digraph type the algorithm runs on. The default value is
+		  ///\tparam GR The digraph type the algorithm runs on. The default value is
 		  ///\ref ListDigraph. The value of GR is not used directly by Dfs, it
 		  ///is only passed to \ref DfsDefaultTraits.
-		  ///\param TR Traits class to set various data types used by the algorithm.
+		  ///\tparam TR Traits class to set various data types used by the algorithm.
 		  ///The default traits class is
 		  ///\ref DfsDefaultTraits "DfsDefaultTraits<GR>".
 		  ///See \ref DfsDefaultTraits for the documentation of
 		  ///a Dfs traits class.
 		  ///
 		  ///\author Jacint Szabo and Alpar Juttner
 		#ifdef DOXYGEN
 		  template <typename GR,
 			    typename TR>
 		#else
 		  template <typename GR=ListDigraph,
 			    typename TR=DfsDefaultTraits<GR> >
 		#endif
 		  class Dfs {
 		  public:
 		    /**
 		     * \brief \ref Exception for uninitialized parameters.
+		     *
 		     * This error represents problems in the initialization
 		     * of the parameters of the algorithms.
 		     */
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
 		      virtual const char* what() const throw() {
 			return "lemon::Dfs::UninitializedParameter";
+		      }
 		    };
 		    typedef TR Traits;
 		    ///The type of the underlying digraph.
 		    typedef typename TR::Digraph Digraph;
 		    ///\e
 		    typedef typename Digraph::Node Node;
 		    ///\e
 		    typedef typename Digraph::NodeIt NodeIt;
 		    ///\e
 		    typedef typename Digraph::Arc Arc;
 		    ///\e
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the %DFS paths.
 		    typedef typename TR::PredMap PredMap;
 		    ///The type of the map indicating which nodes are reached.
 		    typedef typename TR::ReachedMap ReachedMap;
 		    ///The type of the map indicating which nodes are processed.
 		    typedef typename TR::ProcessedMap ProcessedMap;
 		    ///The type of the map that stores the dists of the nodes.
 		    typedef typename TR::DistMap DistMap;
 		  private:
 		    /// Pointer to the underlying digraph.
 		    const Digraph *G;
 		    ///Pointer to the map of predecessors arcs.
 		    PredMap *_pred;
 		    ///Indicates if \ref _pred is locally allocated (\c true) or not.
 		    bool local_pred;
 		    ///Pointer to the map of distances.
 		    DistMap *_dist;
 		    ///Indicates if \ref _dist is locally allocated (\c true) or not.
 		    bool local_dist;
 		    ///Pointer to the map of reached status of the nodes.
 		    ReachedMap *_reached;
 		    ///Indicates if \ref _reached is locally allocated (\c true) or not.
 		    bool local_reached;
 		    ///Pointer to the map of processed status of the nodes.
 		    ProcessedMap *_processed;
 		    ///Indicates if \ref _processed is locally allocated (\c true) or not.
 		    bool local_processed;
 		    std::vector<typename Digraph::OutArcIt> _stack;
 		    int _stack_head;
 		    ///Creates the maps if necessary.
 		    ///\todo Better memory allocation (instead of new).
 		    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
 		    ///@{
 		    template <class T>
 		    struct DefPredMapTraits : public Traits {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &G)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\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 Dfs<Digraph, DefPredMapTraits<T> > {
 		      typedef Dfs<Digraph, DefPredMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct DefDistMapTraits : public Traits {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///DistMap type
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting DistMap
 		    ///type
 		    template <class T>
 		    struct DefDistMap {
 		      typedef Dfs<Digraph, DefDistMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct DefReachedMapTraits : public Traits {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///ReachedMap type
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting ReachedMap type
 		    ///
 		    template <class T>
 		    struct DefReachedMap : public Dfs< Digraph, DefReachedMapTraits<T> > {
 		      typedef Dfs< Digraph, DefReachedMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct DefProcessedMapTraits : public Traits {
 		      typedef T ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///ProcessedMap type
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting ProcessedMap type
 		    ///
 		    template <class T>
 		    struct DefProcessedMap : public Dfs< Digraph, DefProcessedMapTraits<T> > {
 		      typedef Dfs< Digraph, DefProcessedMapTraits<T> > Create;
 		    };
 		    struct DefDigraphProcessedMapTraits : public Traits {
 		      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &G)
+		      {
 			return new ProcessedMap(G);
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///for setting the ProcessedMap type to be Digraph::NodeMap<bool>.
 		    ///
 		    ///\ref named-templ-param "Named parameter"
 		    ///for setting the ProcessedMap type to be Digraph::NodeMap<bool>.
 		    ///If you don't set it explicitely, it will be automatically allocated.
 		    template <class T>
 		    class DefProcessedMapToBeDefaultMap :
 		      public Dfs< Digraph, DefDigraphProcessedMapTraits> {
 		      typedef Dfs< Digraph, DefDigraphProcessedMapTraits> Create;
 		    };
 		    ///@}
 		  public:
 		    ///Constructor.
 		    ///\param _G the digraph the algorithm will run 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 storing the predecessor arcs.
 		    ///Sets the map storing the predecessor arcs.
 		    ///If you don't use this function before calling \ref run(),
 		    ///it will allocate one. The destuctor 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 storing the distances calculated by the algorithm.
 		    ///Sets the map storing the distances calculated by the algorithm.
 		    ///If you don't use this function before calling \ref run(),
 		    ///it will allocate one. The destuctor 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;
+		    }
 		    ///Sets the map indicating if a node is reached.
 		    ///Sets the map indicating if a node is reached.
 		    ///If you don't use this function before calling \ref run(),
 		    ///it will allocate one. The destuctor 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 indicating if a node is processed.
 		    ///Sets the map indicating if a node is processed.
 		    ///If you don't use this function before calling \ref run(),
 		    ///it will allocate one. The destuctor 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;
+		    }
 		  public:
 		    ///\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 a source node
 		    ///with \ref addSource().
 		    ///Finally \ref start() will perform the actual path
 		    ///computation.
 		    ///@{
 		    ///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);
 			// _predNode->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.
 		    ///
 		    ///\warning dists are wrong (or at least strange)
 		    ///in case of multiple sources.
 		    void addSource(Node s)
+		    {
 		      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 INVALID if the stack is
 		    /// empty.
 		    OutArcIt nextArc()
+		    {
 		      return _stack_head>=0?_stack[_stack_head]:INVALID;
+		    }
 		    ///\brief Returns \c false if there are nodes
 		    ///to be processed in the queue
 		    ///
 		    ///Returns \c false if there are nodes
 		    ///to be processed in the queue
 		    bool emptyQueue() { return _stack_head<0; }
 		    ///Returns the number of the nodes to be processed.
 		    ///Returns the number of the nodes to be processed in the queue.
 		    int queueSize() { return _stack_head+1; }
 		    ///Executes the algorithm.
 		    ///Executes the algorithm.
 		    ///
 		    ///\pre init() must be called and at least one node should be added
 		    ///with addSource() before using this function.
 		    ///
 		    ///This method runs the %DFS algorithm from the root node(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(s) in the %DFS tree.
 		    ///
 		    void start()
+		    {
 		      while ( !emptyQueue() ) processNextArc();
+		    }
 		    ///Executes the algorithm until \c dest is reached.
 		    ///Executes the algorithm until \c dest is reached.
 		    ///
 		    ///\pre init() must be called and at least one node should be added
 		    ///with addSource() before using this function.
 		    ///
 		    ///This method runs the %DFS algorithm from the root node(s)
 		    ///in order to
 		    ///compute the
 		    ///%DFS path to \c dest. The algorithm computes
 		    ///- The %DFS path to \c  dest.
 		    ///- The distance of \c dest from the root(s) in the %DFS tree.
 		    ///
 		    void start(Node dest)
+		    {
 		      while ( !emptyQueue() && G->target(_stack[_stack_head])!=dest )
 			processNextArc();
+		    }
 		    ///Executes the algorithm until a condition is met.
 		    ///Executes the algorithm until a condition is met.
 		    ///
 		    ///\pre init() must be called and at least one node should be added
 		    ///with addSource() before using this function.
 		    ///
 		    ///\param em must be a bool (or convertible) arc map. The algorithm
 		    ///will stop when it reaches an arc \c e with <tt>em[e]</tt> true.
 		    ///
 		    ///\return The reached arc \c e with <tt>em[e]</tt> true or
 		    ///\c INVALID if no such arc was found.
 		    ///
 		    ///\warning Contrary to \ref Bfs and \ref Dijkstra, \c em is an arc map,
 		    ///not a node map.
 		    template<class EM>
 		    Arc start(const EM &em)
+		    {
 		      while ( !emptyQueue() && !em[_stack[_stack_head]] )
 		        processNextArc();
 		      return emptyQueue() ? INVALID : _stack[_stack_head];
+		    }
 		    ///Runs %DFS 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.
 		    ///- The distance of each node from the root in the %DFS tree.
 		    ///
 		    ///\note d.run() is just a shortcut of the following code.
 		    ///\code
 		    ///  d.init();
 		    ///  for (NodeIt it(digraph); it != INVALID; ++it) {
 		    ///    if (!d.reached(it)) {
 		    ///      d.addSource(it);
 		    ///      d.start();
 		    ///    }
 		    ///  }
 		    ///\endcode
 		    void run() {
 		      init();
 		      for (NodeIt it(*G); it != INVALID; ++it) {
 		        if (!reached(it)) {
 		          addSource(it);
 		          start();
+		        }
+		      }
+		    }
 		    ///Runs %DFS algorithm from node \c s.
 		    ///This method runs the %DFS algorithm from a root 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 d.run(s) 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.
 		    ///Finds the %DFS path between \c s and \c t.
 		    ///
 		    ///\return The length of the %DFS s---t path if there exists one,
 		    ///0 otherwise.
 		    ///\note Apart from the return value, d.run(s,t) is
 		    ///just a shortcut of the following code.
 		    ///\code
 		    ///  d.init();
 		    ///  d.addSource(s);
 		    ///  d.start(t);
 		    ///\endcode
 		    int run(Node s,Node t) {
 		      init();
 		      addSource(s);
 		      start(t);
 		      return reached(t)?_stack_head+1:0;
+		    }
 		    ///@}
 		    ///\name Query Functions
 		    ///The result of the %DFS algorithm can be obtained using these
 		    ///functions.\n
 		    ///Before the use of these functions,
 		    ///either run() or start() must be called.
 		    ///@{
 		    typedef PredMapPath<Digraph, PredMap> Path;
 		    ///Gives back the shortest path.
 		    ///Gives back the shortest path.
 		    ///\pre The \c t should be reachable from the source.
 		    Path path(Node t)
+		    {
 		      return Path(*G, *_pred, t);
+		    }
 		    ///The distance of a node from the root(s).
 		    ///Returns the distance of a node from the root(s).
 		    ///\pre \ref run() must be called before using this function.
 		    ///\warning If node \c v is unreachable from the root(s) then the return
 		    ///value of this funcion is undefined.
 		    int dist(Node v) const { return (*_dist)[v]; }
 		    ///Returns the 'previous arc' of the %DFS tree.
 		    ///For a node \c v it returns the 'previous arc'
 		    ///of the %DFS path,
 		    ///i.e. it returns the last arc of a %DFS path from the root(s) to \c
 		    ///v. It is \ref INVALID
 		    ///if \c v is unreachable from the root(s) or \c v is a root. The
 		    ///%DFS tree used here is equal to the %DFS tree used in
 		    ///\ref predNode().
 		    ///\pre Either \ref run() or \ref start() must be called before using
 		    ///this function.
 		    Arc predArc(Node v) const { return (*_pred)[v];}
 		    ///Returns the 'previous node' of the %DFS tree.
 		    ///For a node \c v it returns the 'previous node'
 		    ///of the %DFS tree,
 		    ///i.e. it returns the last but one node from a %DFS path from the
 		    ///root(s) to \c v.
 		    ///It is INVALID if \c v is unreachable from the root(s) or
 		    ///if \c v itself a root.
 		    ///The %DFS tree used here is equal to the %DFS
 		    ///tree used in \ref predArc().
 		    ///\pre Either \ref run() or \ref start() must be called before
 		    ///using this function.
 		    Node predNode(Node v) const { return (*_pred)[v]==INVALID ? INVALID:
 						  G->source((*_pred)[v]); }
 		    ///Returns a reference to the NodeMap of distances.
 		    ///Returns a reference to the NodeMap of distances.
 		    ///\pre Either \ref run() or \ref init() must
 		    ///be called before using this function.
 		    const DistMap &distMap() const { return *_dist;}
 		    ///Returns a reference to the %DFS arc-tree map.
 		    ///Returns a reference to the NodeMap of the arcs of the
 		    ///%DFS tree.
 		    ///\pre Either \ref run() or \ref init()
 		    ///must be called before using this function.
 		    const PredMap &predMap() const { return *_pred;}
 		    ///Checks if a node is reachable from the root.
 		    ///Returns \c true if \c v is reachable from the root(s).
 		    ///\warning The source nodes are inditated as unreachable.
 		    ///\pre Either \ref run() or \ref start()
 		    ///must be called before using this function.
 		    ///
 		    bool reached(Node v) { return (*_reached)[v]; }
 		    ///@}
 		  };
 		  ///Default traits class of Dfs function.
 		  ///Default traits class of Dfs function.
-		  ///\param GR Digraph type.
+		  ///\tparam GR Digraph type.
 		  template<class GR>
 		  struct DfsWizardDefaultTraits
+		  {
 		    ///The digraph type the algorithm runs on.
 		    typedef GR Digraph;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the %DFS paths.
 		    ///
 		    ///The type of the map that stores the last
 		    ///arcs of the %DFS paths.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef NullMap<typename Digraph::Node,typename GR::Arc> PredMap;
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param g is the digraph, to which we would like to define the PredMap.
 		    ///\todo The digraph alone may be insufficient to initialize
 		#ifdef DOXYGEN
 		    static PredMap *createPredMap(const GR &g)
 		#else
 		    static PredMap *createPredMap(const GR &)
 		#endif
+		    {
 		      return new PredMap();
+		    }
 		    ///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.
 		    ///\todo named parameter to set this type, function to read and write.
 		    typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
 		    ///Instantiates a 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 GR &g)
 		#else
 		    static ProcessedMap *createProcessedMap(const GR &)
 		#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::WriteMap "WriteMap" concept.
 		    ///\todo named parameter to set this type, function to read and write.
 		    typedef typename Digraph::template NodeMap<bool> ReachedMap;
 		    ///Instantiates a 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 GR &G)
+		    {
 		      return new ReachedMap(G);
+		    }
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef NullMap<typename Digraph::Node,int> DistMap;
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param g is the digraph, to which we would like to define the \ref DistMap
 		#ifdef DOXYGEN
 		    static DistMap *createDistMap(const GR &g)
 		#else
 		    static DistMap *createDistMap(const GR &)
 		#endif
+		    {
 		      return new DistMap();
+		    }
 		  };
 		  /// Default traits used by \ref DfsWizard
 		  /// To make it easier to use Dfs algorithm
 		  ///we have created a wizard class.
 		  /// This \ref DfsWizard class needs default traits,
 		  ///as well as the \ref Dfs class.
 		  /// The \ref DfsWizardBase is a class to be the default traits of the
 		  /// \ref DfsWizard class.
 		  template<class GR>
 		  class DfsWizardBase : public DfsWizardDefaultTraits<GR>
+		  {
 		    typedef DfsWizardDefaultTraits<GR> Base;
 		  protected:
 		    /// Type of the nodes in the digraph.
 		    typedef typename Base::Digraph::Node Node;
 		    /// Pointer to the underlying digraph.
 		    void *_g;
 		    ///Pointer to the map of reached nodes.
 		    void *_reached;
 		    ///Pointer to the map of processed nodes.
 		    void *_processed;
 		    ///Pointer to the map of predecessors arcs.
 		    void *_pred;
 		    ///Pointer to the map of distances.
 		    void *_dist;
 		    ///Pointer to the source node.
 		    Node _source;
 		    public:
 		    /// Constructor.
 		    /// This constructor does not require parameters, therefore it initiates
 		    /// all of the attributes to default values (0, INVALID).
 		    DfsWizardBase() : _g(0), _reached(0), _processed(0), _pred(0),
 					   _dist(0), _source(INVALID) {}
 		    /// Constructor.
 		    /// This constructor requires some parameters,
 		    /// listed in the parameters list.
 		    /// Others are initiated to 0.
 		    /// \param g is the initial value of  \ref _g
 		    /// \param s is the initial value of  \ref _source
 		    DfsWizardBase(const GR &g, Node s=INVALID) :
 		      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
 		      _reached(0), _processed(0), _pred(0), _dist(0), _source(s) {}
 		  };
 		  /// A class to make the usage of the Dfs algorithm easier
 		  /// This class is created to make it easier to use the Dfs algorithm.
 		  /// It uses the functions and features of the plain \ref Dfs,
 		  /// but it is much simpler to use it.
 		  ///
 		  /// Simplicity means that the way to change the types defined
 		  /// in the traits class is based on functions that returns the new class
 		  /// and not on templatable built-in classes.
 		  /// When using the plain \ref Dfs
 		  /// the new class with the modified type comes from
 		  /// the original class by using the ::
 		  /// operator. In the case of \ref DfsWizard only
 		  /// a function have to be called and it will
 		  /// return the needed class.
 		  ///
 		  /// It does not have own \ref run method. When its \ref run method is called
 		  /// it initiates a plain \ref Dfs object, and calls the \ref Dfs::run
 		  /// method of it.
 		  template<class TR>
 		  class DfsWizard : public TR
+		  {
 		    typedef TR Base;
 		    ///The type of the underlying digraph.
 		    typedef typename TR::Digraph Digraph;
 		    //\e
 		    typedef typename Digraph::Node Node;
 		    //\e
 		    typedef typename Digraph::NodeIt NodeIt;
 		    //\e
 		    typedef typename Digraph::Arc Arc;
 		    //\e
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///\brief The type of the map that stores
 		    ///the reached nodes
 		    typedef typename TR::ReachedMap ReachedMap;
 		    ///\brief The type of the map that stores
 		    ///the processed nodes
 		    typedef typename TR::ProcessedMap ProcessedMap;
 		    ///\brief The type of the map that stores the last
 		    ///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;
 		  public:
 		    /// Constructor.
 		    DfsWizard() : TR() {}
 		    /// Constructor that requires parameters.
 		    /// Constructor that requires parameters.
 		    /// These parameters will be the default values for the traits class.
 		    DfsWizard(const Digraph &g, Node s=INVALID) :
 		      TR(g,s) {}
 		    ///Copy constructor
 		    DfsWizard(const TR &b) : TR(b) {}
 		    ~DfsWizard() {}
 		    ///Runs Dfs algorithm from a given node.
 		    ///Runs Dfs algorithm from a given node.
 		    ///The node can be given by the \ref source function.
 		    void run()
+		    {
 		      if(Base::_source==INVALID) throw UninitializedParameter();
 		      Dfs<Digraph,TR> alg(*reinterpret_cast<const Digraph*>(Base::_g));
 		      if(Base::_reached)
 		        alg.reachedMap(*reinterpret_cast<ReachedMap*>(Base::_reached));
 		      if(Base::_processed)
 		        alg.processedMap(*reinterpret_cast<ProcessedMap*>(Base::_processed));
 		      if(Base::_pred)
 		        alg.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
 		      if(Base::_dist)
 		        alg.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
 		      alg.run(Base::_source);
+		    }
 		    ///Runs Dfs algorithm from the given node.
 		    ///Runs Dfs algorithm from the given node.
 		    ///\param s is the given source.
 		    void run(Node s)
+		    {
 		      Base::_source=s;
 		      run();
+		    }
 		    template<class T>
 		    struct DefPredMapBase : public Base {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &) { return 0; };
 		      DefPredMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting PredMap type
 		    ///
 		    /// \ref named-templ-param "Named parameter"
 		    ///function for setting PredMap type
 		    ///
 		    template<class T>
 		    DfsWizard<DefPredMapBase<T> > predMap(const T &t)
+		    {
 		      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return DfsWizard<DefPredMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct DefReachedMapBase : public Base {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &) { return 0; };
 		      DefReachedMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting ReachedMap
 		    ///
 		    /// \ref named-templ-param "Named parameter"
 		    ///function for setting ReachedMap
 		    ///
 		    template<class T>
 		    DfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
+		    {
 		      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return DfsWizard<DefReachedMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct DefProcessedMapBase : public Base {
 		      typedef T ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &) { return 0; };
 		      DefProcessedMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting ProcessedMap
 		    ///
 		    /// \ref named-templ-param "Named parameter"
 		    ///function for setting ProcessedMap
 		    ///
 		    template<class T>
 		    DfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
+		    {
 		      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return DfsWizard<DefProcessedMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct DefDistMapBase : public Base {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &) { return 0; };
 		      DefDistMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting DistMap type
 		    ///
 		    /// \ref named-templ-param "Named parameter"
 		    ///function for setting DistMap type
 		    ///
 		    template<class T>
 		    DfsWizard<DefDistMapBase<T> > distMap(const T &t)
+		    {
 		      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return DfsWizard<DefDistMapBase<T> >(*this);
+		    }
 		    /// Sets the source node, from which the Dfs algorithm runs.
 		    /// Sets the source node, from which the Dfs algorithm runs.
 		    /// \param s is the source node.
 		    DfsWizard<TR> &source(Node s)
+		    {
 		      Base::_source=s;
 		      return *this;
+		    }
 		  };
 		  ///Function type interface for Dfs algorithm.
 		  ///\ingroup search
 		  ///Function type interface for Dfs algorithm.
 		  ///
 		  ///This function also has several
 		  ///\ref named-templ-func-param "named parameters",
 		  ///they are declared as the members of class \ref DfsWizard.
 		  ///The following
 		  ///example shows how to use these parameters.
 		  ///\code
 		  ///  dfs(g,source).predMap(preds).run();
 		  ///\endcode
 		  ///\warning Don't forget to put the \ref DfsWizard::run() "run()"
 		  ///to the end of the parameter list.
 		  ///\sa DfsWizard
 		  ///\sa Dfs
 		  template<class GR>
 		  DfsWizard<DfsWizardBase<GR> >
 		  dfs(const GR &g,typename GR::Node s=INVALID)
+		  {
 		    return DfsWizard<DfsWizardBase<GR> >(g,s);
+		  }
 		#ifdef DOXYGEN
 		  /// \brief Visitor class for dfs.
 		  ///
 		  /// It gives a simple interface for a functional interface for dfs
 		  /// traversal. The traversal on a linear data structure.
 		  template <typename _Digraph>
 		  struct DfsVisitor {
 		    typedef _Digraph Digraph;
 		    typedef typename Digraph::Arc Arc;
 		    typedef typename Digraph::Node Node;
 		    /// \brief Called when the arc reach a node.
 		    ///
 		    /// It is called when the dfs find an arc which target is not
 		    /// reached yet.
 		    void discover(const Arc& arc) {}
 		    /// \brief Called when the node reached first time.
 		    ///
 		    /// It is Called when the node reached first time.
 		    void reach(const Node& node) {}
 		    /// \brief Called when we step back on an arc.
 		    ///
 		    /// It is called when the dfs should step back on the arc.
 		    void backtrack(const Arc& arc) {}
 		    /// \brief Called when we step back from the node.
 		    ///
 		    /// It is called when we step back from the node.
 		    void leave(const Node& node) {}
 		    /// \brief Called when the arc examined but target of the arc
 		    /// already discovered.
 		    ///
 		    /// It called when the arc examined but the target of the arc
 		    /// already discovered.
 		    void examine(const Arc& arc) {}
 		    /// \brief Called for the source node of the dfs.
 		    ///
 		    /// It is called for the source node of the dfs.
 		    void start(const Node& node) {}
 		    /// \brief Called when we leave the source node of the dfs.
 		    ///
 		    /// It is called when we leave the source node of the dfs.
 		    void stop(const Node& node) {}
 		  };
 		#else
 		  template <typename _Digraph>
 		  struct DfsVisitor {
 		    typedef _Digraph Digraph;
 		    typedef typename Digraph::Arc Arc;
 		    typedef typename Digraph::Node Node;
 		    void discover(const Arc&) {}
 		    void reach(const Node&) {}
 		    void backtrack(const Arc&) {}
 		    void leave(const Node&) {}
 		    void examine(const Arc&) {}
 		    void start(const Node&) {}
 		    void stop(const Node&) {}
 		    template <typename _Visitor>
 		    struct Constraints {
 		      void constraints() {
 			Arc arc;
 			Node node;
 			visitor.discover(arc);
 			visitor.reach(node);
 			visitor.backtrack(arc);
 			visitor.leave(node);
 			visitor.examine(arc);
 			visitor.start(node);
 			visitor.stop(arc);
+		      }
 		      _Visitor& visitor;
 		    };
 		  };
 		#endif
 		  /// \brief Default traits class of DfsVisit class.
 		  ///
 		  /// Default traits class of DfsVisit class.
-		  /// \param _Digraph Digraph type.
+		  /// \tparam _Digraph Digraph type.
 		  template<class _Digraph>
 		  struct DfsVisitDefaultTraits {
 		    /// \brief The digraph type the algorithm runs on.
 		    typedef _Digraph Digraph;
 		    /// \brief The type of the map that indicates which nodes are reached.
 		    ///
 		    /// The type of the map that indicates which nodes are reached.
 		    /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    /// \todo named parameter to set this type, function to read and write.
 		    typedef typename Digraph::template NodeMap<bool> ReachedMap;
 		    /// \brief Instantiates a ReachedMap.
 		    ///
 		    /// This function instantiates a \ref ReachedMap.
 		    /// \param digraph is the digraph, to which
 		    /// we would like to define the \ref ReachedMap.
 		    static ReachedMap *createReachedMap(const Digraph &digraph) {
 		      return new ReachedMap(digraph);
+		    }
 		  };
 		  /// %DFS Visit algorithm class.
 		  /// \ingroup search
 		  /// This class provides an efficient implementation of the %DFS algorithm
 		  /// with visitor interface.
 		  ///
 		  /// The %DfsVisit class provides an alternative interface to the Dfs
 		  /// class. It works with callback mechanism, the DfsVisit object calls
 		  /// on every dfs event the \c Visitor class member functions.
 		  ///
-		  /// \param _Digraph The digraph type the algorithm runs on. The default value is
+		  /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
 		  /// \ref ListDigraph. The value of _Digraph is not used directly by Dfs, it
 		  /// is only passed to \ref DfsDefaultTraits.
-		  /// \param _Visitor The Visitor object for the algorithm. The
+		  /// \tparam _Visitor The Visitor object for the algorithm. The
 		  /// \ref DfsVisitor "DfsVisitor<_Digraph>" is an empty Visitor which
 		  /// does not observe the Dfs events. If you want to observe the dfs
 		  /// events you should implement your own Visitor class.
-		  /// \param _Traits Traits class to set various data types used by the
+		  /// \tparam _Traits Traits class to set various data types used by the
 		  /// algorithm. The default traits class is
 		  /// \ref DfsVisitDefaultTraits "DfsVisitDefaultTraits<_Digraph>".
 		  /// See \ref DfsVisitDefaultTraits for the documentation of
 		  /// a Dfs visit traits class.
 		  ///
 		  /// \author Jacint Szabo, Alpar Juttner and Balazs Dezso
 		#ifdef DOXYGEN
 		  template <typename _Digraph, typename _Visitor, typename _Traits>
 		#else
 		  template <typename _Digraph = ListDigraph,
 			    typename _Visitor = DfsVisitor<_Digraph>,
 			    typename _Traits = DfsDefaultTraits<_Digraph> >
 		#endif
 		  class DfsVisit {
 		  public:
 		    /// \brief \ref Exception for uninitialized parameters.
 		    ///
 		    /// This error represents problems in the initialization
 		    /// of the parameters of the algorithms.
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
 		      virtual const char* what() const throw()
+		      {
 			return "lemon::DfsVisit::UninitializedParameter";
+		      }
 		    };
 		    typedef _Traits Traits;
 		    typedef typename Traits::Digraph Digraph;
 		    typedef _Visitor Visitor;
 		    ///The type of the map indicating which nodes are reached.
 		    typedef typename Traits::ReachedMap ReachedMap;
 		  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 *_digraph;
 		    /// Pointer to the visitor object.
 		    Visitor *_visitor;
 		    ///Pointer to the map of reached status of the nodes.
 		    ReachedMap *_reached;
 		    ///Indicates if \ref _reached is locally allocated (\c true) or not.
 		    bool local_reached;
 		    std::vector<typename Digraph::Arc> _stack;
 		    int _stack_head;
 		    /// \brief Creates the maps if necessary.
 		    ///
 		    /// Creates the maps if necessary.
 		    void create_maps() {
 		      if(!_reached) {
 			local_reached = true;
 			_reached = Traits::createReachedMap(*_digraph);
+		      }
+		    }
 		  protected:
 		    DfsVisit() {}
 		  public:
 		    typedef DfsVisit Create;
 		    /// \name Named template parameters
 		    ///@{
 		    template <class T>
 		    struct DefReachedMapTraits : public Traits {
 		      typedef T ReachedMap;
 		      static ReachedMap *createReachedMap(const Digraph &digraph) {
 			throw UninitializedParameter();
+		      }
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// ReachedMap type
 		    ///
 		    /// \ref named-templ-param "Named parameter" for setting ReachedMap type
 		    template <class T>
 		    struct DefReachedMap : public DfsVisit< Digraph, Visitor,
 							    DefReachedMapTraits<T> > {
 		      typedef DfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
 		    };
 		    ///@}
 		  public:
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor.
 		    ///
 		    /// \param digraph the digraph the algorithm will run on.
 		    /// \param visitor The visitor of the algorithm.
 		    ///
 		    DfsVisit(const Digraph& digraph, Visitor& visitor)
 		      : _digraph(&digraph), _visitor(&visitor),
 			_reached(0), local_reached(false) {}
 		    /// \brief Destructor.
 		    ///
 		    /// Destructor.
 		    ~DfsVisit() {
 		      if(local_reached) delete _reached;
+		    }
 		    /// \brief Sets the map indicating if a node is reached.
 		    ///
 		    /// Sets the map indicating if a node is reached.
 		    /// If you don't use this function before calling \ref run(),
 		    /// it will allocate one. The destuctor deallocates this
 		    /// automatically allocated map, of course.
 		    /// \return <tt> (*this) </tt>
 		    DfsVisit &reachedMap(ReachedMap &m) {
 		      if(local_reached) {
 			delete _reached;
 			local_reached=false;
+		      }
 		      _reached = &m;
 		      return *this;
+		    }
 		  public:
 		    /// \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 adda source node
 		    /// with \ref addSource().
 		    /// Finally \ref start() will perform the actual path
 		    /// computation.
 		    /// @{
 		    /// \brief Initializes the internal data structures.
 		    ///
 		    /// Initializes the internal data structures.
 		    ///
 		    void init() {
 		      create_maps();
 		      _stack.resize(countNodes(*_digraph));
 		      _stack_head = -1;
 		      for (NodeIt u(*_digraph) ; u != INVALID ; ++u) {
 			_reached->set(u, false);
+		      }
+		    }
 		    /// \brief Adds a new source node.
 		    ///
 		    /// Adds a new source node to the set of nodes to be processed.
 		    void addSource(Node s) {
 		      if(!(*_reached)[s]) {
 			  _reached->set(s,true);
 			  _visitor->start(s);
 			  _visitor->reach(s);
 			  Arc e;
 			  _digraph->firstOut(e, s);
 			  if (e != INVALID) {
 			    _stack[++_stack_head] = e;
 			  } else {
 			    _visitor->leave(s);
+			  }
+			}
+		    }
 		    /// \brief Processes the next arc.
 		    ///
 		    /// Processes the next arc.
 		    ///
 		    /// \return The processed arc.
 		    ///
 		    /// \pre The stack must not be empty!
 		    Arc processNextArc() {
 		      Arc e = _stack[_stack_head];
 		      Node m = _digraph->target(e);
 		      if(!(*_reached)[m]) {
 			_visitor->discover(e);
 			_visitor->reach(m);
 			_reached->set(m, true);
 			_digraph->firstOut(_stack[++_stack_head], m);
 		      } else {
 			_visitor->examine(e);
 			m = _digraph->source(e);
 			_digraph->nextOut(_stack[_stack_head]);
+		      }
 		      while (_stack_head>=0 && _stack[_stack_head] == INVALID) {
 			_visitor->leave(m);
 			--_stack_head;
 			if (_stack_head >= 0) {
 			  _visitor->backtrack(_stack[_stack_head]);
 			  m = _digraph->source(_stack[_stack_head]);
 			  _digraph->nextOut(_stack[_stack_head]);
 			} else {
 			  _visitor->stop(m);
+			}
+		      }
 		      return e;
+		    }
 		    /// \brief Next arc to be processed.
 		    ///
 		    /// Next arc to be processed.
 		    ///
 		    /// \return The next arc to be processed or INVALID if the stack is
 		    /// empty.
 		    Arc nextArc() {
 		      return _stack_head >= 0 ? _stack[_stack_head] : INVALID;
+		    }
 		    /// \brief Returns \c false if there are nodes
 		    /// to be processed in the queue
 		    ///
 		    /// Returns \c false if there are nodes
 		    /// to be processed in the queue
 		    bool emptyQueue() { return _stack_head < 0; }
 		    /// \brief Returns the number of the nodes to be processed.
 		    ///
 		    /// Returns the number of the nodes to be processed in the queue.
 		    int queueSize() { return _stack_head + 1; }
 		    /// \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.
 		    void start() {
 		      while ( !emptyQueue() ) processNextArc();
+		    }
 		    /// \brief Executes the algorithm until \c dest is reached.
 		    ///
 		    /// Executes the algorithm until \c dest is reached.
 		    ///
 		    /// \pre init() must be called and at least one node should be added
 		    /// with addSource() before using this function.
 		    void start(Node dest) {
 		      while ( !emptyQueue() && _digraph->target(_stack[_stack_head]) != dest )
 			processNextArc();
+		    }
 		    /// \brief Executes the algorithm until a condition is met.
 		    ///
 		    /// Executes the algorithm until a condition is met.
 		    ///
 		    /// \pre init() must be called and at least one node should be added
 		    /// with addSource() before using this function.
 		    ///
 		    /// \param em must be a bool (or convertible) arc map. The algorithm
 		    /// will stop when it reaches an arc \c e with <tt>em[e]</tt> true.
 		    ///
 		    ///\return The reached arc \c e with <tt>em[e]</tt> true or
 		    ///\c INVALID if no such arc was found.
 		    ///
 		    /// \warning Contrary to \ref Bfs and \ref Dijkstra, \c em is an arc map,
 		    /// not a node map.
 		    template <typename EM>
 		    Arc start(const EM &em) {
 		      while ( !emptyQueue() && !em[_stack[_stack_head]] )
 		        processNextArc();
 		      return emptyQueue() ? INVALID : _stack[_stack_head];
+		    }
 		    /// \brief Runs %DFSVisit algorithm from node \c s.
 		    ///
 		    /// This method runs the %DFS algorithm from a root node \c s.
 		    /// \note d.run(s) 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();
+		    }
 		    /// \brief Runs %DFSVisit algorithm to visit all nodes in the digraph.
 		    /// This method runs the %DFS algorithm in order to
 		    /// compute the %DFS path to each node. The algorithm computes
 		    /// - The %DFS tree.
 		    /// - The distance of each node from the root in the %DFS tree.
 		    ///
 		    ///\note d.run() is just a shortcut of the following code.
 		    ///\code
 		    ///  d.init();
 		    ///  for (NodeIt it(digraph); it != INVALID; ++it) {
 		    ///    if (!d.reached(it)) {
 		    ///      d.addSource(it);
 		    ///      d.start();
 		    ///    }
 		    ///  }
 		    ///\endcode
 		    void run() {
 		      init();
 		      for (NodeIt it(*_digraph); it != INVALID; ++it) {
 		        if (!reached(it)) {
 		          addSource(it);
 		          start();
+		        }
+		      }
+		    }
 		    ///@}
 		    /// \name Query Functions
 		    /// The result of the %DFS algorithm can be obtained using these
 		    /// functions.\n
 		    /// Before the use of these functions,
 		    /// either run() or start() must be called.
 		    ///@{
 		    /// \brief Checks if a node is reachable from the root.
 		    ///
 		    /// Returns \c true if \c v is reachable from the root(s).
 		    /// \warning The source nodes are inditated as unreachable.
 		    /// \pre Either \ref run() or \ref start()
 		    /// must be called before using this function.
 		    ///
 		    bool reached(Node v) { return (*_reached)[v]; }
 		    ///@}
 		  };
 		} //END OF NAMESPACE LEMON
 		#endif

lemon/dijkstra.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * 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_DIJKSTRA_H
 		#define LEMON_DIJKSTRA_H
 		///\ingroup shortest_path
 		///\file
 		///\brief Dijkstra algorithm.
 		///
 		#include <lemon/list_digraph.h>
 		#include <lemon/bin_heap.h>
 		#include <lemon/bits/path_dump.h>
 		#include <lemon/bits/invalid.h>
 		#include <lemon/error.h>
 		#include <lemon/maps.h>
 		namespace lemon {
 		  /// \brief Default OperationTraits for the Dijkstra algorithm class.
 		  ///
 		  /// It defines all computational operations and constants which are
 		  /// used in the Dijkstra algorithm.
 		  template <typename Value>
 		  struct DijkstraDefaultOperationTraits {
 		    /// \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 less than the second.
 		    static bool less(const Value& left, const Value& right) {
 		      return left < right;
+		    }
 		  };
 		  /// \brief Widest path OperationTraits for the Dijkstra algorithm class.
 		  ///
 		  /// It defines all computational operations and constants which are
 		  /// used in the Dijkstra algorithm for widest path computation.
 		  template <typename Value>
 		  struct DijkstraWidestPathOperationTraits {
 		    /// \brief Gives back the maximum value of the type.
 		    static Value zero() {
 		      return std::numeric_limits<Value>::max();
+		    }
 		    /// \brief Gives back the minimum of the given two elements.
 		    static Value plus(const Value& left, const Value& right) {
 		      return std::min(left, right);
+		    }
 		    /// \brief Gives back true only if the first value 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.
 		  ///\param GR Digraph type.
 		  ///\param LM Type of length map.
 		  ///\tparam GR Digraph type.
 		  ///\tparam LM Type of length map.
 		  template<class GR, class LM>
 		  struct DijkstraDefaultTraits
+		  {
 		    ///The digraph type 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 LM LengthMap;
 		    //The type of the length of the arcs.
 		    typedef typename LM::Value Value;
 		    /// Operation traits for Dijkstra algorithm.
 		    /// It defines the used operation by the algorithm.
 		    /// \see DijkstraDefaultOperationTraits
 		    typedef DijkstraDefaultOperationTraits<Value> OperationTraits;
 		    /// The cross reference type used by heap.
 		    /// The cross reference type used by heap.
 		    /// Usually it is \c Digraph::NodeMap<int>.
 		    typedef typename Digraph::template NodeMap<int> HeapCrossRef;
 		    ///Instantiates a HeapCrossRef.
 		    ///This function instantiates a \c HeapCrossRef.
 		    /// \param G is the digraph, to which we would like to define the
 		    /// HeapCrossRef.
 		    static HeapCrossRef *createHeapCrossRef(const GR &G)
+		    {
 		      return new HeapCrossRef(G);
+		    }
 		    ///The heap type used by Dijkstra algorithm.
 		    ///The heap type used by Dijkstra algorithm.
 		    ///
 		    ///\sa BinHeap
 		    ///\sa Dijkstra
 		    typedef BinHeap<typename LM::Value, HeapCrossRef, std::less<Value> > Heap;
 		    static Heap *createHeap(HeapCrossRef& R)
+		    {
 		      return new Heap(R);
+		    }
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    ///
 		    ///The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef typename Digraph::template NodeMap<typename GR::Arc> PredMap;
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \c PredMap.
 		    ///\param G is the digraph, to which we would like to define the PredMap.
 		    ///\todo The digraph alone may be insufficient for the initialization
 		    static PredMap *createPredMap(const GR &G)
+		    {
 		      return new PredMap(G);
+		    }
 		    ///The type of the map that stores whether a nodes is processed.
 		    ///The type of the map that stores whether a nodes is processed.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///By default it is a NullMap.
 		    ///\todo If it is set to a real map,
 		    ///Dijkstra::processed() should read this.
 		    ///\todo named parameter to set this type, function to read and write.
 		    typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
 		    ///Instantiates a ProcessedMap.
 		    ///This function instantiates a \c ProcessedMap.
 		    ///\param g is the digraph, to which
 		    ///we would like to define the \c ProcessedMap
 		#ifdef DOXYGEN
 		    static ProcessedMap *createProcessedMap(const GR &g)
 		#else
 		    static ProcessedMap *createProcessedMap(const GR &)
 		#endif
+		    {
 		      return new ProcessedMap();
+		    }
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef typename Digraph::template NodeMap<typename LM::Value> DistMap;
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param G is the digraph, to which we would like to define the \ref DistMap
 		    static DistMap *createDistMap(const GR &G)
+		    {
 		      return new DistMap(G);
+		    }
 		  };
 		  ///%Dijkstra algorithm class.
 		  /// \ingroup shortest_path
 		  ///This class provides an efficient implementation of %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.
 		  ///
-		  ///\param GR The digraph type the algorithm runs on. The default value
+		  ///\tparam GR The digraph type the algorithm runs on. The default value
 		  ///is \ref ListDigraph. The value of GR is not used directly by
 		  ///Dijkstra, it is only passed to \ref DijkstraDefaultTraits.
-		  ///\param LM This read-only ArcMap determines the lengths of the
+		  ///\tparam LM This read-only ArcMap determines 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 length if
 		  ///it is necessary. The default map type is \ref
 		  ///concepts::Digraph::ArcMap "Digraph::ArcMap<int>".  The value
 		  ///of LM is not used directly by Dijkstra, it is only passed to \ref
-		  ///DijkstraDefaultTraits.  \param TR Traits class to set
 		  ///DijkstraDefaultTraits.
 		  ///\tparam TR Traits class to set
 		  ///various data types used by the algorithm.  The default traits
 		  ///class is \ref DijkstraDefaultTraits
 		  ///"DijkstraDefaultTraits<GR,LM>".  See \ref
 		  ///DijkstraDefaultTraits for the documentation of a Dijkstra traits
 		  ///class.
 		  ///
 		  ///\author Jacint Szabo and Alpar Juttner
 		#ifdef DOXYGEN
 		  template <typename GR, typename LM, typename TR>
 		#else
 		  template <typename GR=ListDigraph,
 			    typename LM=typename GR::template ArcMap<int>,
 			    typename TR=DijkstraDefaultTraits<GR,LM> >
 		#endif
 		  class Dijkstra {
 		  public:
 		    /**
 		     * \brief \ref Exception for uninitialized parameters.
+		     *
 		     * This error represents problems in the initialization
 		     * of the parameters of the algorithms.
 		     */
 		    class UninitializedParameter : public lemon::UninitializedParameter {
 		    public:
 		      virtual const char* what() const throw() {
 			return "lemon::Dijkstra::UninitializedParameter";
+		      }
 		    };
 		    typedef TR Traits;
 		    ///The type of the underlying digraph.
 		    typedef typename TR::Digraph Digraph;
 		    ///\e
 		    typedef typename Digraph::Node Node;
 		    ///\e
 		    typedef typename Digraph::NodeIt NodeIt;
 		    ///\e
 		    typedef typename Digraph::Arc Arc;
 		    ///\e
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///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 last
 		    ///arcs of the shortest paths.
 		    typedef typename TR::PredMap PredMap;
 		    ///The type of the map indicating if a node is processed.
 		    typedef typename TR::ProcessedMap ProcessedMap;
 		    ///The type of the map that stores the dists of the nodes.
 		    typedef typename TR::DistMap DistMap;
 		    ///The cross reference type used for the current heap.
 		    typedef typename TR::HeapCrossRef HeapCrossRef;
 		    ///The heap type used by the dijkstra algorithm.
 		    typedef typename TR::Heap Heap;
 		    ///The operation traits.
 		    typedef typename TR::OperationTraits OperationTraits;
 		  private:
 		    /// 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 \ref _pred is locally allocated (\c true) or not.
 		    bool local_pred;
 		    ///Pointer to the map of distances.
 		    DistMap *_dist;
 		    ///Indicates if \ref _dist is locally allocated (\c true) or not.
 		    bool local_dist;
 		    ///Pointer to the map of processed status of the nodes.
 		    ProcessedMap *_processed;
 		    ///Indicates if \ref _processed is locally allocated (\c true) or not.
 		    bool local_processed;
 		    ///Pointer to the heap cross references.
 		    HeapCrossRef *_heap_cross_ref;
 		    ///Indicates if \ref _heap_cross_ref is locally allocated (\c true) or not.
 		    bool local_heap_cross_ref;
 		    ///Pointer to the heap.
 		    Heap *_heap;
 		    ///Indicates if \ref _heap is locally allocated (\c true) or not.
 		    bool local_heap;
 		    ///Creates the maps if necessary.
 		    ///\todo Better memory allocation (instead of new).
 		    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
 		    ///@{
 		    template <class T>
 		    struct DefPredMapTraits : public Traits {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\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 Dijkstra< Digraph,	LengthMap, DefPredMapTraits<T> > {
 		      typedef Dijkstra< Digraph,	LengthMap, DefPredMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct DefDistMapTraits : public Traits {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\ref named-templ-param "Named parameter" for setting DistMap type
 		    ///\ref named-templ-param "Named parameter" for setting DistMap type
 		    ///
 		    template <class T>
 		    struct DefDistMap
 		      : public Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > {
 		      typedef Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct DefProcessedMapTraits : public Traits {
 		      typedef T ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &G)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\ref named-templ-param "Named parameter" for setting ProcessedMap type
 		    ///\ref named-templ-param "Named parameter" for setting ProcessedMap type
 		    ///
 		    template <class T>
 		    struct DefProcessedMap
 		      : public Dijkstra< Digraph,	LengthMap, DefProcessedMapTraits<T> > {
 		      typedef Dijkstra< Digraph,	LengthMap, DefProcessedMapTraits<T> > Create;
 		    };
 		    struct DefDigraphProcessedMapTraits : public Traits {
 		      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
 		      static ProcessedMap *createProcessedMap(const Digraph &G)
+		      {
 			return new ProcessedMap(G);
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///for setting the ProcessedMap type to be Digraph::NodeMap<bool>.
 		    ///
 		    ///\ref named-templ-param "Named parameter"
 		    ///for setting the ProcessedMap type to be Digraph::NodeMap<bool>.
 		    ///If you don't set it explicitely, it will be automatically allocated.
 		    template <class T>
 		    struct DefProcessedMapToBeDefaultMap
 		      : public Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> {
 		      typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> Create;
 		    };
 		    template <class H, class CR>
 		    struct DefHeapTraits : public Traits {
 		      typedef CR HeapCrossRef;
 		      typedef H Heap;
 		      static HeapCrossRef *createHeapCrossRef(const Digraph &) {
 			throw UninitializedParameter();
+		      }
 		      static Heap *createHeap(HeapCrossRef &)
+		      {
 			throw UninitializedParameter();
+		      }
 		    };
 		    ///\brief \ref named-templ-param "Named parameter" for setting
 		    ///heap and cross reference type
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting heap and cross
 		    ///reference type
 		    ///
 		    template <class H, class CR = typename Digraph::template NodeMap<int> >
 		    struct DefHeap
 		      : public Dijkstra< Digraph,	LengthMap, DefHeapTraits<H, CR> > {
 		      typedef Dijkstra< Digraph,	LengthMap, DefHeapTraits<H, CR> > Create;
 		    };
 		    template <class H, class CR>
 		    struct DefStandardHeapTraits : 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 type with automatic allocation
 		    ///
 		    ///\ref named-templ-param "Named parameter" for setting heap and cross
 		    ///reference type. It can allocate the heap and the cross reference
 		    ///object if the cross reference's constructor waits for the digraph as
 		    ///parameter and the heap's constructor waits for the cross reference.
 		    template <class H, class CR = typename Digraph::template NodeMap<int> >
 		    struct DefStandardHeap
 		      : public Dijkstra< Digraph,	LengthMap, DefStandardHeapTraits<H, CR> > {
 		      typedef Dijkstra< Digraph,	LengthMap, DefStandardHeapTraits<H, CR> >
 		      Create;
 		    };
 		    template <class T>
 		    struct DefOperationTraitsTraits : public Traits {
 		      typedef T OperationTraits;
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// OperationTraits type
 		    ///
 		    /// \ref named-templ-param "Named parameter" for setting OperationTraits
 		    /// type
 		    template <class T>
 		    struct DefOperationTraits
 		      : public Dijkstra<Digraph, LengthMap, DefOperationTraitsTraits<T> > {
 		      typedef Dijkstra<Digraph, LengthMap, DefOperationTraitsTraits<T> >
 		      Create;
 		    };
 		    ///@}
 		  protected:
 		    Dijkstra() {}
 		  public:
 		    ///Constructor.
 		    ///\param _G the digraph the algorithm will run 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 storing the predecessor arcs.
 		    ///Sets the map storing the predecessor arcs.
 		    ///If you don't use this function before calling \ref run(),
 		    ///it will allocate one. The destuctor 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 storing the distances calculated by the algorithm.
 		    ///Sets the map storing the distances calculated by the algorithm.
 		    ///If you don't use this function before calling \ref run(),
 		    ///it will allocate one. The destuctor 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(),
 		    ///it will allocate one. The destuctor deallocates this
 		    ///automatically allocated heap and cross reference, 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:
 		    typedef PredMapPath<Digraph, PredMap> Path;
 		    ///\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 actual path
 		    ///computation.
 		    ///@{
 		    ///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.
 		    ///
 		    ///It 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;
+		    }
 		    ///Next node to be processed.
 		    ///Next node to be processed.
 		    ///
 		    ///\return The next node to be processed or INVALID if the priority heap
 		    /// is empty.
 		    Node nextNode()
+		    {
 		      return !_heap->empty()?_heap->top():INVALID;
+		    }
 		    ///\brief Returns \c false if there are nodes
 		    ///to be processed in the priority heap
 		    ///
 		    ///Returns \c false if there are nodes
 		    ///to be processed in the priority heap
 		    bool emptyQueue() { return _heap->empty(); }
 		    ///Returns the number of the nodes to be processed in the priority heap
 		    ///Returns the number of the nodes to be processed in the priority heap
 		    ///
 		    int queueSize() { return _heap->size(); }
 		    ///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.
 		    ///
 		    ///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.
 		    ///- The distance of each node from the root(s).
 		    ///
 		    void start()
+		    {
 		      while ( !_heap->empty() ) processNextNode();
+		    }
 		    ///Executes the algorithm until \c dest is reached.
 		    ///Executes the algorithm until \c dest is reached.
 		    ///
 		    ///\pre init() must be called and at least one node should be added
 		    ///with addSource() before using this function.
 		    ///
 		    ///This method runs the %Dijkstra algorithm from the root node(s)
 		    ///in order to
 		    ///compute the
 		    ///shortest path to \c dest. The algorithm computes
 		    ///- The shortest path to \c  dest.
 		    ///- The distance of \c dest from the root(s).
 		    ///
 		    void start(Node dest)
+		    {
 		      while ( !_heap->empty() && _heap->top()!=dest ) processNextNode();
 		      if ( !_heap->empty() ) finalizeNodeData(_heap->top(),_heap->prio());
+		    }
 		    ///Executes the algorithm until a condition is met.
 		    ///Executes the algorithm until a condition is met.
 		    ///
 		    ///\pre init() must be called and at least one node should be added
 		    ///with addSource() before using this function.
 		    ///
 		    ///\param nm must be a 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.
 		    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 %Dijkstra algorithm from node \c s.
 		    ///This method runs the %Dijkstra algorithm from a root 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 d.run(s) 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.
 		    ///Finds the shortest path between \c s and \c t.
 		    ///
 		    ///\return The length of the shortest s---t path if there exists one,
 		    ///0 otherwise.
 		    ///\note Apart from the return value, d.run(s) is
 		    ///just a shortcut of the following code.
 		    ///\code
 		    ///  d.init();
 		    ///  d.addSource(s);
 		    ///  d.start(t);
 		    ///\endcode
 		    Value run(Node s,Node t) {
 		      init();
 		      addSource(s);
 		      start(t);
 		      return (*_pred)[t]==INVALID?OperationTraits::zero():(*_dist)[t];
+		    }
 		    ///@}
 		    ///\name Query Functions
 		    ///The result of the %Dijkstra algorithm can be obtained using these
 		    ///functions.\n
 		    ///Before the use of these functions,
 		    ///either run() or start() must be called.
 		    ///@{
 		    ///Gives back the shortest path.
 		    ///Gives back the shortest path.
 		    ///\pre The \c t should be reachable from the source.
 		    Path path(Node t)
+		    {
 		      return Path(*G, *_pred, t);
+		    }
 		    ///The distance of a node from the root.
 		    ///Returns the distance of a node from the root.
 		    ///\pre \ref run() must be called before using this function.
 		    ///\warning If node \c v in unreachable from the root the return value
 		    ///of this funcion is undefined.
 		    Value dist(Node v) const { return (*_dist)[v]; }
 		    ///The current distance of a node from the root.
 		    ///Returns the current distance of a node from the root.
 		    ///It may be decreased in the following processes.
 		    ///\pre \c node should be reached but not processed
 		    Value currentDist(Node v) const { return (*_heap)[v]; }
 		    ///Returns the 'previous arc' of the shortest path tree.
 		    ///For a node \c v it returns the 'previous arc' of the shortest path tree,
 		    ///i.e. it returns the last arc of a shortest path from the root to \c
 		    ///v. It is \ref INVALID
 		    ///if \c v is unreachable from the root or if \c v=s. The
 		    ///shortest path tree used here is equal to the shortest path tree used in
 		    ///\ref predNode().  \pre \ref run() must be called before using
 		    ///this function.
 		    Arc predArc(Node v) const { return (*_pred)[v]; }
 		    ///Returns the 'previous node' of the shortest path tree.
 		    ///For a node \c v it returns the 'previous node' of the shortest path tree,
 		    ///i.e. it returns the last but one node from a shortest path from the
 		    ///root to \c /v. It is INVALID if \c v is unreachable from the root or if
 		    ///\c v=s. The shortest path tree used here is equal to the shortest path
 		    ///tree used in \ref predArc().  \pre \ref run() must be called before
 		    ///using this function.
 		    Node predNode(Node v) const { return (*_pred)[v]==INVALID ? INVALID:
 						  G->source((*_pred)[v]); }
 		    ///Returns a reference to the NodeMap of distances.
 		    ///Returns a reference to the NodeMap of distances. \pre \ref run() must
 		    ///be called before using this function.
 		    const DistMap &distMap() const { return *_dist;}
 		    ///Returns a reference to the shortest path tree map.
 		    ///Returns a reference to the NodeMap of the arcs of the
 		    ///shortest path tree.
 		    ///\pre \ref run() must be called before using this function.
 		    const PredMap &predMap() const { return *_pred;}
 		    ///Checks if a node is reachable from the root.
 		    ///Returns \c true if \c v is reachable from the root.
 		    ///\warning The source nodes are inditated as unreached.
 		    ///\pre \ref run() must be called before using this function.
 		    ///
 		    bool reached(Node v) { return (*_heap_cross_ref)[v] != Heap::PRE_HEAP; }
 		    ///Checks if a node is processed.
 		    ///Returns \c true if \c v is processed, i.e. the shortest
 		    ///path to \c v has already found.
 		    ///\pre \ref run() must be called before using this function.
 		    ///
 		    bool processed(Node v) { return (*_heap_cross_ref)[v] == Heap::POST_HEAP; }
 		    ///@}
 		  };
 		  ///Default traits class of Dijkstra function.
 		  ///Default traits class of Dijkstra function.
 		  ///\param GR Digraph type.
 		  ///\param LM Type of length map.
 		  ///\tparam GR Digraph type.
 		  ///\tparam LM Type of length map.
 		  template<class GR, class LM>
 		  struct DijkstraWizardDefaultTraits
+		  {
 		    ///The digraph type 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 LM LengthMap;
 		    //The type of the length of the arcs.
 		    typedef typename LM::Value Value;
 		    /// Operation traits for Dijkstra algorithm.
 		    /// It defines the used operation by the algorithm.
 		    /// \see DijkstraDefaultOperationTraits
 		    typedef DijkstraDefaultOperationTraits<Value> OperationTraits;
 		    ///The heap type used by Dijkstra algorithm.
 		    /// The cross reference type used by heap.
 		    /// The cross reference type used by heap.
 		    /// Usually it is \c Digraph::NodeMap<int>.
 		    typedef typename Digraph::template NodeMap<int> HeapCrossRef;
 		    ///Instantiates a HeapCrossRef.
 		    ///This function instantiates a \ref HeapCrossRef.
 		    /// \param G is the digraph, to which we would like to define the
 		    /// HeapCrossRef.
 		    /// \todo The digraph alone may be insufficient for the initialization
 		    static HeapCrossRef *createHeapCrossRef(const GR &G)
+		    {
 		      return new HeapCrossRef(G);
+		    }
 		    ///The heap type used by Dijkstra algorithm.
 		    ///The heap type used by Dijkstra algorithm.
 		    ///
 		    ///\sa BinHeap
 		    ///\sa Dijkstra
 		    typedef BinHeap<typename LM::Value, typename GR::template NodeMap<int>,
 				    std::less<Value> > Heap;
 		    static Heap *createHeap(HeapCrossRef& R)
+		    {
 		      return new Heap(R);
+		    }
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    ///
 		    ///The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef NullMap <typename GR::Node,typename GR::Arc> PredMap;
 		    ///Instantiates a PredMap.
 		    ///This function instantiates a \ref PredMap.
 		    ///\param g is the digraph, to which we would like to define the PredMap.
 		    ///\todo The digraph alone may be insufficient for the initialization
 		#ifdef DOXYGEN
 		    static PredMap *createPredMap(const GR &g)
 		#else
 		    static PredMap *createPredMap(const GR &)
 		#endif
+		    {
 		      return new PredMap();
+		    }
 		    ///The type of the map that stores whether a nodes is processed.
 		    ///The type of the map that stores whether a nodes is processed.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///By default it is a NullMap.
 		    ///\todo If it is set to a real map,
 		    ///Dijkstra::processed() should read this.
 		    ///\todo named parameter to set this type, function to read and write.
 		    typedef NullMap<typename Digraph::Node,bool> ProcessedMap;
 		    ///Instantiates a 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 GR &g)
 		#else
 		    static ProcessedMap *createProcessedMap(const GR &)
 		#endif
+		    {
 		      return new ProcessedMap();
+		    }
 		    ///The type of the map that stores the dists of the nodes.
 		    ///The type of the map that stores the dists of the nodes.
 		    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
 		    ///
 		    typedef NullMap<typename Digraph::Node,typename LM::Value> DistMap;
 		    ///Instantiates a DistMap.
 		    ///This function instantiates a \ref DistMap.
 		    ///\param g is the digraph, to which we would like to define the \ref DistMap
 		#ifdef DOXYGEN
 		    static DistMap *createDistMap(const GR &g)
 		#else
 		    static DistMap *createDistMap(const GR &)
 		#endif
+		    {
 		      return new DistMap();
+		    }
 		  };
 		  /// Default traits used by \ref DijkstraWizard
 		  /// To make it easier to use Dijkstra algorithm
 		  ///we have created a wizard class.
 		  /// This \ref DijkstraWizard class needs default traits,
 		  ///as well as the \ref Dijkstra class.
 		  /// The \ref DijkstraWizardBase is a class to be the default traits of the
 		  /// \ref DijkstraWizard class.
 		  /// \todo More named parameters are required...
 		  template<class GR,class LM>
 		  class DijkstraWizardBase : public DijkstraWizardDefaultTraits<GR,LM>
+		  {
 		    typedef DijkstraWizardDefaultTraits<GR,LM> Base;
 		  protected:
 		    /// Type of the nodes in the digraph.
 		    typedef typename Base::Digraph::Node Node;
 		    /// Pointer to the underlying digraph.
 		    void *_g;
 		    /// Pointer to the length map
 		    void *_length;
 		    ///Pointer to the map of predecessors arcs.
 		    void *_pred;
 		    ///Pointer to the map of distances.
 		    void *_dist;
 		    ///Pointer to the source node.
 		    Node _source;
 		    public:
 		    /// Constructor.
 		    /// This constructor does not require parameters, therefore it initiates
 		    /// all of the attributes to default values (0, INVALID).
 		    DijkstraWizardBase() : _g(0), _length(0), _pred(0),
 					   _dist(0), _source(INVALID) {}
 		    /// Constructor.
 		    /// This constructor requires some parameters,
 		    /// listed in the parameters list.
 		    /// Others are initiated to 0.
 		    /// \param g is the initial value of  \ref _g
 		    /// \param l is the initial value of  \ref _length
 		    /// \param s is the initial value of  \ref _source
 		    DijkstraWizardBase(const GR &g,const LM &l, Node s=INVALID) :
 		      _g(reinterpret_cast<void*>(const_cast<GR*>(&g))),
 		      _length(reinterpret_cast<void*>(const_cast<LM*>(&l))),
 		      _pred(0), _dist(0), _source(s) {}
 		  };
 		  /// A class to make the usage of Dijkstra algorithm easier
 		  /// This class is created to make it easier to use Dijkstra algorithm.
 		  /// It uses the functions and features of the plain \ref Dijkstra,
 		  /// but it is much simpler to use it.
 		  ///
 		  /// Simplicity means that the way to change the types defined
 		  /// in the traits class is based on functions that returns the new class
 		  /// and not on templatable built-in classes.
 		  /// When using the plain \ref Dijkstra
 		  /// the new class with the modified type comes from
 		  /// the original class by using the ::
 		  /// operator. In the case of \ref DijkstraWizard only
 		  /// a function have to be called and it will
 		  /// return the needed class.
 		  ///
 		  /// It does not have own \ref run method. When its \ref run method is called
 		  /// it initiates a plain \ref Dijkstra class, and calls the \ref
 		  /// Dijkstra::run method of it.
 		  template<class TR>
 		  class DijkstraWizard : public TR
+		  {
 		    typedef TR Base;
 		    ///The type of the underlying digraph.
 		    typedef typename TR::Digraph Digraph;
 		    //\e
 		    typedef typename Digraph::Node Node;
 		    //\e
 		    typedef typename Digraph::NodeIt NodeIt;
 		    //\e
 		    typedef typename Digraph::Arc Arc;
 		    //\e
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    ///The type of the map that stores the arc lengths.
 		    typedef typename TR::LengthMap LengthMap;
 		    ///The type of the length of the arcs.
 		    typedef typename LengthMap::Value Value;
 		    ///\brief The type of the map that stores the last
 		    ///arcs of the shortest paths.
 		    typedef typename TR::PredMap PredMap;
 		    ///The type of the map that stores the dists of the nodes.
 		    typedef typename TR::DistMap DistMap;
 		    ///The heap type used by the dijkstra algorithm.
 		    typedef typename TR::Heap Heap;
 		  public:
 		    /// Constructor.
 		    DijkstraWizard() : TR() {}
 		    /// Constructor that requires parameters.
 		    /// Constructor that requires parameters.
 		    /// These parameters will be the default values for the traits class.
 		    DijkstraWizard(const Digraph &g,const LengthMap &l, Node s=INVALID) :
 		      TR(g,l,s) {}
 		    ///Copy constructor
 		    DijkstraWizard(const TR &b) : TR(b) {}
 		    ~DijkstraWizard() {}
 		    ///Runs Dijkstra algorithm from a given node.
 		    ///Runs Dijkstra algorithm from a given node.
 		    ///The node can be given by the \ref source function.
 		    void run()
+		    {
 		      if(Base::_source==INVALID) throw UninitializedParameter();
 		      Dijkstra<Digraph,LengthMap,TR>
 			dij(*reinterpret_cast<const Digraph*>(Base::_g),
 		            *reinterpret_cast<const LengthMap*>(Base::_length));
 		      if(Base::_pred) dij.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
 		      if(Base::_dist) dij.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
 		      dij.run(Base::_source);
+		    }
 		    ///Runs Dijkstra algorithm from the given node.
 		    ///Runs Dijkstra algorithm from the given node.
 		    ///\param s is the given source.
 		    void run(Node s)
+		    {
 		      Base::_source=s;
 		      run();
+		    }
 		    template<class T>
 		    struct DefPredMapBase : public Base {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &) { return 0; };
 		      DefPredMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting PredMap type
 		    ///
 		    /// \ref named-templ-param "Named parameter"
 		    ///function for setting PredMap type
 		    ///
 		    template<class T>
 		    DijkstraWizard<DefPredMapBase<T> > predMap(const T &t)
+		    {
 		      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return DijkstraWizard<DefPredMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct DefDistMapBase : public Base {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &) { return 0; };
 		      DefDistMapBase(const TR &b) : TR(b) {}
 		    };
 		    ///\brief \ref named-templ-param "Named parameter"
 		    ///function for setting DistMap type
 		    ///
 		    /// \ref named-templ-param "Named parameter"
 		    ///function for setting DistMap type
 		    ///
 		    template<class T>
 		    DijkstraWizard<DefDistMapBase<T> > distMap(const T &t)
+		    {
 		      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return DijkstraWizard<DefDistMapBase<T> >(*this);
+		    }
 		    /// Sets the source node, from which the Dijkstra algorithm runs.
 		    /// Sets the source node, from which the Dijkstra algorithm runs.
 		    /// \param s is the source node.
 		    DijkstraWizard<TR> &source(Node s)
+		    {
 		      Base::_source=s;
 		      return *this;
+		    }
 		  };
 		  ///Function type interface for Dijkstra algorithm.
 		  /// \ingroup shortest_path
 		  ///Function type interface for Dijkstra algorithm.
 		  ///
 		  ///This function also has several
 		  ///\ref named-templ-func-param "named parameters",
 		  ///they are declared as the members of class \ref DijkstraWizard.
 		  ///The following
 		  ///example shows how to use these parameters.
 		  ///\code
 		  ///  dijkstra(g,length,source).predMap(preds).run();
 		  ///\endcode
 		  ///\warning Don't forget to put the \ref DijkstraWizard::run() "run()"
 		  ///to the end of the parameter list.
 		  ///\sa DijkstraWizard
 		  ///\sa Dijkstra
 		  template<class GR, class LM>
 		  DijkstraWizard<DijkstraWizardBase<GR,LM> >
 		  dijkstra(const GR &g,const LM &l,typename GR::Node s=INVALID)
+		  {
 		    return DijkstraWizard<DijkstraWizardBase<GR,LM> >(g,l,s);
+		  }
 		} //END OF NAMESPACE LEMON
 		#endif

lemon/graph_to_eps.h

Show inline comments

@@ -35,817 +35,817 @@
 		#endif
 		#include<lemon/math.h>
 		#include<lemon/bits/invalid.h>
 		#include<lemon/dim2.h>
 		#include<lemon/maps.h>
 		#include<lemon/color.h>
 		#include<lemon/bits/bezier.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 \ref GraphToEps
 		///Default traits class of \ref GraphToEps
 		///
 		///\c G is the type of the underlying graph.
 		template<class G>
 		struct DefaultGraphToEpsTraits
+		{
 		  typedef G 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 _g is a reference to the graph to be printed
 		  ///\param _os is a reference to the output stream.
 		  ///\param _os is a reference to the output stream.
 		  ///\param _pros If it is \c true, then the \c ostream referenced by \c _os
 		  ///will be explicitly deallocated by the destructor.
 		  ///By default it is <tt>std::cout</tt>
 		  DefaultGraphToEpsTraits(const G &_g,std::ostream& _os=std::cout,
 					  bool _pros=false) :
 		    g(_g), os(_os),
 		    _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<G>::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()
 		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
 		    ///
 		    MALE=3,
 		    /// = 4
 		    ///\image html nodeshape_4.png
 		    ///\image latex nodeshape_2.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 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
 		  ///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 centre 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
 		  ///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 a arc map with \c double (or convertible) values.
+		  ///\param x must be an arc map with \c double (or convertible) values.
 		  template<class X> GraphToEps<ArcWidthsTraits<X> > arcWidths(const X &x)
+		  {
 		    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 a arc map with \ref Color values.
+		  ///\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 width scaling.
 		  ///Turns on/off the automatic node width scaling.
 		  ///
 		  ///\sa nodeScale()
 		  ///
 		  GraphToEps<T> &autoNodeScale(bool b=true) {
 		    _autoNodeScale=b;return *this;
+		  }
 		  ///Turns on/off the absolutematic node width scaling.
 		  ///Turns on/off the absolutematic node width scaling.
 		  ///
 		  ///\sa nodeScale()
 		  ///
 		  GraphToEps<T> &absoluteNodeSizes(bool b=true) {
 		    _absoluteNodeSizes=b;return *this;
+		  }
 		  ///Negates the Y coordinates.
 		  ///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
 		  ///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
 		  ///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
 		  ///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
 		  ///Sets whether to draw arrows
 		  ///
 		  GraphToEps<T> &drawArrows(bool b=true) {_drawArrows=b;return *this;}
 		  ///Sets the length of the arrowheads
 		  ///Sets the length of the arrowheads
 		  ///
 		  GraphToEps<T> &arrowLength(double d=1.0) {_arrowLength*=d;return *this;}
 		  ///Sets the width of the arrowheads
 		  ///Sets the width of the arrowheads
 		  ///
 		  GraphToEps<T> &arrowWidth(double d=.3) {_arrowWidth*=d;return *this;}
 		  ///Scales the drawing to fit to A4 page
 		  ///Scales the drawing to fit to A4 page
 		  ///
 		  GraphToEps<T> &scaleToA4() {_scaleToA4=true;return *this;}
 		  ///Enables parallel arcs
 		  ///Enables parallel arcs
 		  GraphToEps<T> &enableParallel(bool b=true) {_enableParallel=b;return *this;}
 		  ///Sets the distance
 		  ///Sets the distance
 		  ///
 		  GraphToEps<T> &parArcDist(double d) {_parArcDist*=d;return *this;}
 		  ///Hides the arcs
 		  ///Hides the arcs
 		  ///
 		  GraphToEps<T> &hideArcs(bool b=true) {_showArcs=!b;return *this;}
 		  ///Hides the nodes
 		  ///Hides the nodes
 		  ///
 		  GraphToEps<T> &hideNodes(bool b=true) {_showNodes=!b;return *this;}
 		  ///Sets the size of the node texts
 		  ///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 the graph is undirected
 		  ///Sets whether the 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 the graph is directed
 		  ///Sets whether the 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() {
 		    //\todo better 'epsilon' would be nice here.
 		    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';
 		//        << "%%Copyright: XXXX\n"
 		    os << "%%Creator: LEMON, graphToEps()\n";
+		    {
 		#ifndef WIN32
 		      timeval tv;
 		      gettimeofday(&tv, 0);
 		      char cbuf[26];
 		      ctime_r(&tv.tv_sec,cbuf);
 		      os << "%%CreationDate: " << cbuf;
 		#else
 		      SYSTEMTIME time;
 		      char buf1[11], buf2[9], buf3[5];
 		      GetSystemTime(&time);
 		      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 					"ddd MMM dd", buf1, 11) &&
 			  GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
 					"HH':'mm':'ss", buf2, 9) &&
 			  GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 						"yyyy", buf3, 5)) {
 			os << "%%CreationDate: " << buf1 << ' '
 			   << buf2 << ' ' << buf3 << std::endl;
+		      }
 		#endif
+		    }
 		    if (_autoArcWidthScale) {
 		      double max_w=0;
 		      for(ArcIt e(g);e!=INVALID;++e)
 			max_w=std::max(double(_arcWidths[e]),max_w);
 		      ///\todo better 'epsilon' would be nice here.
 		      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);
 		      ///\todo better 'epsilon' would be nice here.
 		      if(max_s>EPSILON) {
 			_nodeScale/=max_s;
+		      }
+		    }
 		    double diag_len = 1;
 		    if(!(_absoluteNodeSizes&&_absoluteArcWidths)) {
 		      dim2::BoundingBox<double> bb;
 		      for(NodeIt n(g);n!=INVALID;++n) bb.add(mycoords[n]);
 		      if (bb.empty()) {
 			bb = dim2::BoundingBox<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::BoundingBox<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::BoundingBox<double>(dim2::Point<double>(0,0));
+		    }
 		    if(_scaleToA4)
 		      os <<"%%BoundingBox: 0 0 596 842\n%%DocumentPaperSizes: a4\n";
 		    else {
 		      if(_preScale) {
 			//Rescale so that BoundingBox won't be neither to big nor too small.
 			while(bb.height()*_scale>1000||bb.width()*_scale>1000) _scale/=10;
 			while(bb.height()*_scale<100||bb.width()*_scale<100) _scale*=10;
+		      }
 		      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 "

Changeset was too big and was cut off... Show full diff

0 comments (0 inline)

RhodeCode

Login to your account

Changeset was too big and was cut off... Show full diff

Changeset was too big and was cut off... Show full diff