diff --git a/lemon/bfs.h b/lemon/bfs.h --- a/lemon/bfs.h +++ b/lemon/bfs.h @@ -54,7 +54,6 @@ ///This function instantiates a \ref PredMap. ///\param g is the digraph, to which we would like to define the ///\ref PredMap. - ///\todo The digraph alone may be insufficient to initialize static PredMap *createPredMap(const Digraph &g) { return new PredMap(g); @@ -64,7 +63,6 @@ ///The type of the map that indicates which nodes are processed. ///It must meet the \ref concepts::WriteMap "WriteMap" concept. - ///By default it is a NullMap. typedef NullMap ProcessedMap; ///Instantiates a \ref ProcessedMap. @@ -196,8 +194,7 @@ int _queue_head,_queue_tail,_queue_next_dist; int _curr_dist; - ///Creates the maps if necessary. - ///\todo Better memory allocation (instead of new). + //Creates the maps if necessary. void create_maps() { if(!_pred) { @@ -848,7 +845,6 @@ ///This function instantiates a \ref PredMap. ///\param g is the digraph, to which we would like to define the ///\ref PredMap. - ///\todo The digraph alone may be insufficient to initialize static PredMap *createPredMap(const Digraph &g) { return new PredMap(g); @@ -1370,8 +1366,7 @@ std::vector _list; int _list_front, _list_back; - ///Creates the maps if necessary. - ///\todo Better memory allocation (instead of new). + //Creates the maps if necessary. void create_maps() { if(!_reached) { local_reached = true; diff --git a/lemon/bits/base_extender.h b/lemon/bits/base_extender.h --- a/lemon/bits/base_extender.h +++ b/lemon/bits/base_extender.h @@ -105,9 +105,6 @@ /// Returns whether the given directed arc has the same orientation /// as the corresponding edge. - /// - /// \todo reference to the corresponding point of the undirected digraph - /// concept. "What does the direction of an edge mean?" static bool direction(const Arc &a) { return a.forward; } using Parent::first; diff --git a/lemon/bits/vector_map.h b/lemon/bits/vector_map.h --- a/lemon/bits/vector_map.h +++ b/lemon/bits/vector_map.h @@ -42,10 +42,9 @@ /// 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. /// - /// \tparam _Notifier The AlterationNotifier that will notify this map. + /// \tparam _Graph The graph this map is attached to. /// \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 class VectorMap : public ItemSetTraits<_Graph, _Item>::ItemNotifier::ObserverBase { diff --git a/lemon/concept_check.h b/lemon/concept_check.h --- a/lemon/concept_check.h +++ b/lemon/concept_check.h @@ -16,28 +16,12 @@ * */ -// This file contains a modified version of the concept checking -// utility from BOOST. -// See the appropriate copyright notice below. - -// (C) Copyright Jeremy Siek 2000. -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) -// -// Revision History: -// 05 May 2001: Workarounds for HP aCC from Thomas Matelich. (Jeremy Siek) -// 02 April 2001: Removed limits header altogether. (Jeremy Siek) -// 01 April 2001: Modified to use new header. (JMaddock) -// - -// See http://www.boost.org/libs/concept_check for documentation. +// The contents of this file was inspired by the concept checking +// utility of the BOOST library (http://www.boost.org). ///\file ///\brief Basic utilities for concept checking. /// -///\todo Are we still using BOOST concept checking utility? -///Is the BOOST copyright notice necessary? #ifndef LEMON_CONCEPT_CHECK_H #define LEMON_CONCEPT_CHECK_H diff --git a/lemon/concepts/path.h b/lemon/concepts/path.h --- a/lemon/concepts/path.h +++ b/lemon/concepts/path.h @@ -20,7 +20,6 @@ ///\file ///\brief Classes for representing paths in digraphs. /// -///\todo Iterators have obsolete style #ifndef LEMON_CONCEPT_PATH_H #define LEMON_CONCEPT_PATH_H diff --git a/lemon/core.h b/lemon/core.h --- a/lemon/core.h +++ b/lemon/core.h @@ -58,10 +58,10 @@ /// \addtogroup gutils /// @{ - ///Creates convenience typedefs for the digraph types and iterators + ///Create convenient typedefs for the digraph types and iterators - ///This \c \#define creates convenience typedefs for the following types - ///of \c Digraph: \c Node, \c NodeIt, \c Arc, \c ArcIt, \c InArcIt, + ///This \c \#define creates convenient type definitions for the following + ///types of \c Digraph: \c Node, \c NodeIt, \c Arc, \c ArcIt, \c InArcIt, ///\c OutArcIt, \c BoolNodeMap, \c IntNodeMap, \c DoubleNodeMap, ///\c BoolArcMap, \c IntArcMap, \c DoubleArcMap. /// @@ -80,9 +80,9 @@ typedef Digraph::NodeMap DoubleNodeMap; \ typedef Digraph::ArcMap BoolArcMap; \ typedef Digraph::ArcMap IntArcMap; \ - typedef Digraph::ArcMap DoubleArcMap + typedef Digraph::ArcMap DoubleArcMap; - ///Creates convenience typedefs for the digraph types and iterators + ///Create convenient typedefs for the digraph types and iterators ///\see DIGRAPH_TYPEDEFS /// @@ -100,17 +100,17 @@ typedef typename Digraph::template NodeMap DoubleNodeMap; \ typedef typename Digraph::template ArcMap BoolArcMap; \ typedef typename Digraph::template ArcMap IntArcMap; \ - typedef typename Digraph::template ArcMap DoubleArcMap + typedef typename Digraph::template ArcMap DoubleArcMap; - ///Creates convenience typedefs for the graph types and iterators + ///Create convenient typedefs for the graph types and iterators - ///This \c \#define creates the same convenience typedefs as defined + ///This \c \#define creates the same convenient type definitions as defined ///by \ref DIGRAPH_TYPEDEFS(Graph) and six more, namely it creates ///\c Edge, \c EdgeIt, \c IncEdgeIt, \c BoolEdgeMap, \c IntEdgeMap, ///\c DoubleEdgeMap. /// ///\note If the graph type is a dependent type, ie. the graph type depend - ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS() + ///on a template parameter, then use \c TEMPLATE_GRAPH_TYPEDEFS() ///macro. #define GRAPH_TYPEDEFS(Graph) \ DIGRAPH_TYPEDEFS(Graph); \ @@ -119,9 +119,9 @@ typedef Graph::IncEdgeIt IncEdgeIt; \ typedef Graph::EdgeMap BoolEdgeMap; \ typedef Graph::EdgeMap IntEdgeMap; \ - typedef Graph::EdgeMap DoubleEdgeMap + typedef Graph::EdgeMap DoubleEdgeMap; - ///Creates convenience typedefs for the graph types and iterators + ///Create convenient typedefs for the graph types and iterators ///\see GRAPH_TYPEDEFS /// @@ -134,12 +134,12 @@ typedef typename Graph::IncEdgeIt IncEdgeIt; \ typedef typename Graph::template EdgeMap BoolEdgeMap; \ typedef typename Graph::template EdgeMap IntEdgeMap; \ - typedef typename Graph::template EdgeMap DoubleEdgeMap + typedef typename Graph::template EdgeMap DoubleEdgeMap; - /// \brief Function to count the items in the graph. + /// \brief Function to count the items in a graph. /// - /// This function counts the items (nodes, arcs etc) in the graph. - /// The complexity of the function is O(n) because + /// This function counts the items (nodes, arcs etc.) in a graph. + /// The complexity of the function is linear because /// it iterates on all of the items. template inline int countItems(const Graph& g) { @@ -176,11 +176,11 @@ /// \brief Function to count the nodes in the graph. /// /// This function counts the nodes in the graph. - /// The complexity of the function is O(n) but for some - /// graph structures it is specialized to run in O(1). + /// The complexity of the function is O(n), but for some + /// graph structures it is specialized to run in O(1). /// - /// If the graph contains a \e nodeNum() member function and a - /// \e NodeNumTag tag then this function calls directly the member + /// \note If the graph contains a \c nodeNum() member function and a + /// \c NodeNumTag tag then this function calls directly the member /// function to query the cardinality of the node set. template inline int countNodes(const Graph& g) { @@ -212,11 +212,11 @@ /// \brief Function to count the arcs in the graph. /// /// This function counts the arcs in the graph. - /// The complexity of the function is O(e) but for some - /// graph structures it is specialized to run in O(1). + /// The complexity of the function is O(m), but for some + /// graph structures it is specialized to run in O(1). /// - /// If the graph contains a \e arcNum() member function and a - /// \e EdgeNumTag tag then this function calls directly the member + /// \note If the graph contains a \c arcNum() member function and a + /// \c ArcNumTag tag then this function calls directly the member /// function to query the cardinality of the arc set. template inline int countArcs(const Graph& g) { @@ -224,6 +224,7 @@ } // Edge counting: + namespace _core_bits { template @@ -247,11 +248,11 @@ /// \brief Function to count the edges in the graph. /// /// This function counts the edges in the graph. - /// The complexity of the function is O(m) but for some - /// graph structures it is specialized to run in O(1). + /// The complexity of the function is O(m), but for some + /// graph structures it is specialized to run in O(1). /// - /// If the graph contains a \e edgeNum() member function and a - /// \e EdgeNumTag tag then this function calls directly the member + /// \note If the graph contains a \c edgeNum() member function and a + /// \c EdgeNumTag tag then this function calls directly the member /// function to query the cardinality of the edge set. template inline int countEdges(const Graph& g) { @@ -272,28 +273,28 @@ /// \brief Function to count the number of the out-arcs from node \c n. /// /// This function counts the number of the out-arcs from node \c n - /// in the graph. + /// in the graph \c g. template - inline int countOutArcs(const Graph& _g, const typename Graph::Node& _n) { - return countNodeDegree(_g, _n); + inline int countOutArcs(const Graph& g, const typename Graph::Node& n) { + return countNodeDegree(g, n); } /// \brief Function to count the number of the in-arcs to node \c n. /// /// This function counts the number of the in-arcs to node \c n - /// in the graph. + /// in the graph \c g. template - inline int countInArcs(const Graph& _g, const typename Graph::Node& _n) { - return countNodeDegree(_g, _n); + inline int countInArcs(const Graph& g, const typename Graph::Node& n) { + return countNodeDegree(g, n); } /// \brief Function to count the number of the inc-edges to node \c n. /// /// This function counts the number of the inc-edges to node \c n - /// in the graph. + /// in the undirected graph \c g. template - inline int countIncEdges(const Graph& _g, const typename Graph::Node& _n) { - return countNodeDegree(_g, _n); + inline int countIncEdges(const Graph& g, const typename Graph::Node& n) { + return countNodeDegree(g, n); } namespace _core_bits { @@ -307,12 +308,12 @@ }; template + typename FromMap, typename ToMap> class MapCopy : public MapCopyBase { public: - MapCopy(ToMap& tmap, const FromMap& map) - : _tmap(tmap), _map(map) {} + MapCopy(const FromMap& map, ToMap& tmap) + : _map(map), _tmap(tmap) {} virtual void copy(const Digraph& digraph, const RefMap& refMap) { typedef typename ItemSetTraits::ItemIt ItemIt; @@ -322,23 +323,23 @@ } private: + const FromMap& _map; ToMap& _tmap; - const FromMap& _map; }; template class ItemCopy : public MapCopyBase { public: - ItemCopy(It& it, const Item& item) : _it(it), _item(item) {} + ItemCopy(const Item& item, It& it) : _item(item), _it(it) {} virtual void copy(const Digraph&, const RefMap& refMap) { _it = refMap[_item]; } private: + Item _item; It& _it; - Item _item; }; template @@ -379,7 +380,7 @@ template struct DigraphCopySelector { template - static void copy(Digraph &to, const From& from, + static void copy(const From& from, Digraph &to, NodeRefMap& nodeRefMap, ArcRefMap& arcRefMap) { for (typename From::NodeIt it(from); it != INVALID; ++it) { nodeRefMap[it] = to.addNode(); @@ -397,7 +398,7 @@ typename enable_if::type> { template - static void copy(Digraph &to, const From& from, + static void copy(const From& from, Digraph &to, NodeRefMap& nodeRefMap, ArcRefMap& arcRefMap) { to.build(from, nodeRefMap, arcRefMap); } @@ -406,7 +407,7 @@ template struct GraphCopySelector { template - static void copy(Graph &to, const From& from, + static void copy(const From& from, Graph &to, NodeRefMap& nodeRefMap, EdgeRefMap& edgeRefMap) { for (typename From::NodeIt it(from); it != INVALID; ++it) { nodeRefMap[it] = to.addNode(); @@ -424,7 +425,7 @@ typename enable_if::type> { template - static void copy(Graph &to, const From& from, + static void copy(const From& from, Graph &to, NodeRefMap& nodeRefMap, EdgeRefMap& edgeRefMap) { to.build(from, nodeRefMap, edgeRefMap); } @@ -435,39 +436,39 @@ /// \brief Class to copy a digraph. /// /// Class to copy a digraph to another digraph (duplicate a digraph). The - /// simplest way of using it is through the \c copyDigraph() function. + /// simplest way of using it is through the \c digraphCopy() function. /// - /// This class not just make a copy of a graph, but it can create + /// This class not only make a copy of a digraph, but it can create /// references and cross references between the nodes and arcs of - /// the two graphs, it can copy maps for use with the newly created - /// graph and copy nodes and arcs. + /// the two digraphs, and it can copy maps to use with the newly created + /// digraph. /// - /// To make a copy from a graph, first an instance of DigraphCopy - /// should be created, then the data belongs to the graph should + /// To make a copy from a digraph, first an instance of DigraphCopy + /// should be created, then the data belongs to the digraph should /// assigned to copy. In the end, the \c run() member should be /// called. /// - /// The next code copies a graph with several data: + /// The next code copies a digraph with several data: ///\code - /// DigraphCopy dc(new_graph, orig_graph); - /// // create a reference for the nodes + /// DigraphCopy cg(orig_graph, new_graph); + /// // Create references for the nodes /// OrigGraph::NodeMap nr(orig_graph); - /// dc.nodeRef(nr); - /// // create a cross reference (inverse) for the arcs + /// cg.nodeRef(nr); + /// // Create cross references (inverse) for the arcs /// NewGraph::ArcMap acr(new_graph); - /// dc.arcCrossRef(acr); - /// // copy an arc map + /// cg.arcCrossRef(acr); + /// // Copy an arc map /// OrigGraph::ArcMap oamap(orig_graph); /// NewGraph::ArcMap namap(new_graph); - /// dc.arcMap(namap, oamap); - /// // copy a node + /// cg.arcMap(oamap, namap); + /// // Copy a node /// OrigGraph::Node on; /// NewGraph::Node nn; - /// dc.node(nn, on); - /// // Executions of copy - /// dc.run(); + /// cg.node(on, nn); + /// // Execute copying + /// cg.run(); ///\endcode - template + template class DigraphCopy { private: @@ -482,20 +483,18 @@ typedef typename From::template NodeMap NodeRefMap; typedef typename From::template ArcMap ArcRefMap; - public: - - /// \brief Constructor for the DigraphCopy. + /// \brief Constructor of DigraphCopy. /// - /// It copies the content of the \c _from digraph into the - /// \c _to digraph. - DigraphCopy(To& to, const From& from) + /// Constructor of DigraphCopy for copying the content of the + /// \c from digraph into the \c to digraph. + DigraphCopy(const From& from, To& to) : _from(from), _to(to) {} - /// \brief Destructor of the DigraphCopy + /// \brief Destructor of DigraphCopy /// - /// Destructor of the DigraphCopy + /// Destructor of DigraphCopy. ~DigraphCopy() { for (int i = 0; i < int(_node_maps.size()); ++i) { delete _node_maps[i]; @@ -506,12 +505,12 @@ } - /// \brief Copies the node references into the given map. + /// \brief Copy the node references into the given map. /// - /// Copies the node references into the given map. The parameter - /// should be a map, which key type is the Node type of the source - /// graph, while the value type is the Node type of the - /// destination graph. + /// This function copies the node references into the given map. + /// The parameter should be a map, whose key type is the Node type of + /// the source digraph, while the value type is the Node type of the + /// destination digraph. template DigraphCopy& nodeRef(NodeRef& map) { _node_maps.push_back(new _core_bits::RefCopy DigraphCopy& nodeCrossRef(NodeCrossRef& map) { _node_maps.push_back(new _core_bits::CrossRefCopy - DigraphCopy& nodeMap(ToMap& tmap, const FromMap& map) { + /// This function makes a copy of the given node map for the newly + /// created digraph. + /// The key type of the new map \c tmap should be the Node type of the + /// destination digraph, and the key type of the original map \c map + /// should be the Node type of the source digraph. + template + DigraphCopy& nodeMap(const FromMap& map, ToMap& tmap) { _node_maps.push_back(new _core_bits::MapCopy(tmap, map)); + NodeRefMap, FromMap, ToMap>(map, tmap)); return *this; } /// \brief Make a copy of the given node. /// - /// Make a copy of the given node. - DigraphCopy& node(TNode& tnode, const Node& snode) { + /// This function makes a copy of the given node. + DigraphCopy& node(const Node& node, TNode& tnode) { _node_maps.push_back(new _core_bits::ItemCopy(tnode, snode)); + NodeRefMap, TNode>(node, tnode)); return *this; } - /// \brief Copies the arc references into the given map. + /// \brief Copy the arc references into the given map. /// - /// Copies the arc references into the given map. + /// This function copies the arc references into the given map. + /// The parameter should be a map, whose key type is the Arc type of + /// the source digraph, while the value type is the Arc type of the + /// destination digraph. template DigraphCopy& arcRef(ArcRef& map) { _arc_maps.push_back(new _core_bits::RefCopy DigraphCopy& arcCrossRef(ArcCrossRef& map) { _arc_maps.push_back(new _core_bits::CrossRefCopy - DigraphCopy& arcMap(ToMap& tmap, const FromMap& map) { + /// This function makes a copy of the given arc map for the newly + /// created digraph. + /// The key type of the new map \c tmap should be the Arc type of the + /// destination digraph, and the key type of the original map \c map + /// should be the Arc type of the source digraph. + template + DigraphCopy& arcMap(const FromMap& map, ToMap& tmap) { _arc_maps.push_back(new _core_bits::MapCopy(tmap, map)); + ArcRefMap, FromMap, ToMap>(map, tmap)); return *this; } /// \brief Make a copy of the given arc. /// - /// Make a copy of the given arc. - DigraphCopy& arc(TArc& tarc, const Arc& sarc) { + /// This function makes a copy of the given arc. + DigraphCopy& arc(const Arc& arc, TArc& tarc) { _arc_maps.push_back(new _core_bits::ItemCopy(tarc, sarc)); + ArcRefMap, TArc>(arc, tarc)); return *this; } - /// \brief Executes the copies. + /// \brief Execute copying. /// - /// Executes the copies. + /// This function executes the copying of the digraph along with the + /// copying of the assigned data. void run() { NodeRefMap nodeRefMap(_from); ArcRefMap arcRefMap(_from); _core_bits::DigraphCopySelector:: - copy(_to, _from, nodeRefMap, arcRefMap); + copy(_from, _to, nodeRefMap, arcRefMap); for (int i = 0; i < int(_node_maps.size()); ++i) { _node_maps[i]->copy(_from, nodeRefMap); } @@ -614,47 +622,46 @@ protected: - const From& _from; To& _to; std::vector<_core_bits::MapCopyBase* > - _node_maps; + _node_maps; std::vector<_core_bits::MapCopyBase* > - _arc_maps; + _arc_maps; }; /// \brief Copy a digraph to another digraph. /// - /// Copy a digraph to another digraph. The complete usage of the - /// function is detailed in the DigraphCopy class, but a short - /// example shows a basic work: + /// This function copies a digraph to another digraph. + /// The complete usage of it is detailed in the DigraphCopy class, but + /// a short example shows a basic work: ///\code - /// copyDigraph(trg, src).nodeRef(nr).arcCrossRef(ecr).run(); + /// digraphCopy(src, trg).nodeRef(nr).arcCrossRef(acr).run(); ///\endcode /// /// After the copy the \c nr map will contain the mapping from the /// nodes of the \c from digraph to the nodes of the \c to digraph and - /// \c ecr will contain the mapping from the arcs of the \c to digraph + /// \c acr will contain the mapping from the arcs of the \c to digraph /// to the arcs of the \c from digraph. /// /// \see DigraphCopy - template - DigraphCopy copyDigraph(To& to, const From& from) { - return DigraphCopy(to, from); + template + DigraphCopy digraphCopy(const From& from, To& to) { + return DigraphCopy(from, to); } /// \brief Class to copy a graph. /// /// Class to copy a graph to another graph (duplicate a graph). The - /// simplest way of using it is through the \c copyGraph() function. + /// simplest way of using it is through the \c graphCopy() function. /// - /// This class not just make a copy of a graph, but it can create + /// This class not only make a copy of a graph, but it can create /// references and cross references between the nodes, edges and arcs of - /// the two graphs, it can copy maps for use with the newly created - /// graph and copy nodes, edges and arcs. + /// the two graphs, and it can copy maps for using with the newly created + /// graph. /// /// To make a copy from a graph, first an instance of GraphCopy /// should be created, then the data belongs to the graph should @@ -663,25 +670,25 @@ /// /// The next code copies a graph with several data: ///\code - /// GraphCopy dc(new_graph, orig_graph); - /// // create a reference for the nodes + /// GraphCopy cg(orig_graph, new_graph); + /// // Create references for the nodes /// OrigGraph::NodeMap nr(orig_graph); - /// dc.nodeRef(nr); - /// // create a cross reference (inverse) for the edges - /// NewGraph::EdgeMap ecr(new_graph); - /// dc.edgeCrossRef(ecr); - /// // copy an arc map - /// OrigGraph::ArcMap oamap(orig_graph); - /// NewGraph::ArcMap namap(new_graph); - /// dc.arcMap(namap, oamap); - /// // copy a node + /// cg.nodeRef(nr); + /// // Create cross references (inverse) for the edges + /// NewGraph::EdgeMap ecr(new_graph); + /// cg.edgeCrossRef(ecr); + /// // Copy an edge map + /// OrigGraph::EdgeMap oemap(orig_graph); + /// NewGraph::EdgeMap nemap(new_graph); + /// cg.edgeMap(oemap, nemap); + /// // Copy a node /// OrigGraph::Node on; /// NewGraph::Node nn; - /// dc.node(nn, on); - /// // Executions of copy - /// dc.run(); + /// cg.node(on, nn); + /// // Execute copying + /// cg.run(); ///\endcode - template + template class GraphCopy { private: @@ -700,9 +707,9 @@ typedef typename From::template EdgeMap EdgeRefMap; struct ArcRefMap { - ArcRefMap(const To& to, const From& from, + ArcRefMap(const From& from, const To& to, const EdgeRefMap& edge_ref, const NodeRefMap& node_ref) - : _to(to), _from(from), + : _from(from), _to(to), _edge_ref(edge_ref), _node_ref(node_ref) {} typedef typename From::Arc Key; @@ -716,26 +723,24 @@ return _to.direct(_edge_ref[key], forward); } + const From& _from; const To& _to; - const From& _from; const EdgeRefMap& _edge_ref; const NodeRefMap& _node_ref; }; - public: - - /// \brief Constructor for the GraphCopy. + /// \brief Constructor of GraphCopy. /// - /// It copies the content of the \c _from graph into the - /// \c _to graph. - GraphCopy(To& to, const From& from) + /// Constructor of GraphCopy for copying the content of the + /// \c from graph into the \c to graph. + GraphCopy(const From& from, To& to) : _from(from), _to(to) {} - /// \brief Destructor of the GraphCopy + /// \brief Destructor of GraphCopy /// - /// Destructor of the GraphCopy + /// Destructor of GraphCopy. ~GraphCopy() { for (int i = 0; i < int(_node_maps.size()); ++i) { delete _node_maps[i]; @@ -746,12 +751,14 @@ for (int i = 0; i < int(_edge_maps.size()); ++i) { delete _edge_maps[i]; } - } - /// \brief Copies the node references into the given map. + /// \brief Copy the node references into the given map. /// - /// Copies the node references into the given map. + /// This function copies the node references into the given map. + /// The parameter should be a map, whose key type is the Node type of + /// the source graph, while the value type is the Node type of the + /// destination graph. template GraphCopy& nodeRef(NodeRef& map) { _node_maps.push_back(new _core_bits::RefCopy GraphCopy& nodeCrossRef(NodeCrossRef& map) { _node_maps.push_back(new _core_bits::CrossRefCopy - GraphCopy& nodeMap(ToMap& tmap, const FromMap& map) { + /// This function makes a copy of the given node map for the newly + /// created graph. + /// The key type of the new map \c tmap should be the Node type of the + /// destination graph, and the key type of the original map \c map + /// should be the Node type of the source graph. + template + GraphCopy& nodeMap(const FromMap& map, ToMap& tmap) { _node_maps.push_back(new _core_bits::MapCopy(tmap, map)); + NodeRefMap, FromMap, ToMap>(map, tmap)); return *this; } /// \brief Make a copy of the given node. /// - /// Make a copy of the given node. - GraphCopy& node(TNode& tnode, const Node& snode) { + /// This function makes a copy of the given node. + GraphCopy& node(const Node& node, TNode& tnode) { _node_maps.push_back(new _core_bits::ItemCopy(tnode, snode)); + NodeRefMap, TNode>(node, tnode)); return *this; } - /// \brief Copies the arc references into the given map. + /// \brief Copy the arc references into the given map. /// - /// Copies the arc references into the given map. + /// This function copies the arc references into the given map. + /// The parameter should be a map, whose key type is the Arc type of + /// the source graph, while the value type is the Arc type of the + /// destination graph. template GraphCopy& arcRef(ArcRef& map) { _arc_maps.push_back(new _core_bits::RefCopy GraphCopy& arcCrossRef(ArcCrossRef& map) { _arc_maps.push_back(new _core_bits::CrossRefCopy - GraphCopy& arcMap(ToMap& tmap, const FromMap& map) { + /// This function makes a copy of the given arc map for the newly + /// created graph. + /// The key type of the new map \c tmap should be the Arc type of the + /// destination graph, and the key type of the original map \c map + /// should be the Arc type of the source graph. + template + GraphCopy& arcMap(const FromMap& map, ToMap& tmap) { _arc_maps.push_back(new _core_bits::MapCopy(tmap, map)); + ArcRefMap, FromMap, ToMap>(map, tmap)); return *this; } /// \brief Make a copy of the given arc. /// - /// Make a copy of the given arc. - GraphCopy& arc(TArc& tarc, const Arc& sarc) { + /// This function makes a copy of the given arc. + GraphCopy& arc(const Arc& arc, TArc& tarc) { _arc_maps.push_back(new _core_bits::ItemCopy(tarc, sarc)); + ArcRefMap, TArc>(arc, tarc)); return *this; } - /// \brief Copies the edge references into the given map. + /// \brief Copy the edge references into the given map. /// - /// Copies the edge references into the given map. + /// This function copies the edge references into the given map. + /// The parameter should be a map, whose key type is the Edge type of + /// the source graph, while the value type is the Edge type of the + /// destination graph. template GraphCopy& edgeRef(EdgeRef& map) { _edge_maps.push_back(new _core_bits::RefCopy GraphCopy& edgeCrossRef(EdgeCrossRef& map) { _edge_maps.push_back(new _core_bits::CrossRefCopy - GraphCopy& edgeMap(ToMap& tmap, const FromMap& map) { + /// This function makes a copy of the given edge map for the newly + /// created graph. + /// The key type of the new map \c tmap should be the Edge type of the + /// destination graph, and the key type of the original map \c map + /// should be the Edge type of the source graph. + template + GraphCopy& edgeMap(const FromMap& map, ToMap& tmap) { _edge_maps.push_back(new _core_bits::MapCopy(tmap, map)); + EdgeRefMap, FromMap, ToMap>(map, tmap)); return *this; } /// \brief Make a copy of the given edge. /// - /// Make a copy of the given edge. - GraphCopy& edge(TEdge& tedge, const Edge& sedge) { + /// This function makes a copy of the given edge. + GraphCopy& edge(const Edge& edge, TEdge& tedge) { _edge_maps.push_back(new _core_bits::ItemCopy(tedge, sedge)); + EdgeRefMap, TEdge>(edge, tedge)); return *this; } - /// \brief Executes the copies. + /// \brief Execute copying. /// - /// Executes the copies. + /// This function executes the copying of the graph along with the + /// copying of the assigned data. void run() { NodeRefMap nodeRefMap(_from); EdgeRefMap edgeRefMap(_from); - ArcRefMap arcRefMap(_to, _from, edgeRefMap, nodeRefMap); + ArcRefMap arcRefMap(_from, _to, edgeRefMap, nodeRefMap); _core_bits::GraphCopySelector:: - copy(_to, _from, nodeRefMap, edgeRefMap); + copy(_from, _to, nodeRefMap, edgeRefMap); for (int i = 0; i < int(_node_maps.size()); ++i) { _node_maps[i]->copy(_from, nodeRefMap); } @@ -904,35 +927,35 @@ To& _to; std::vector<_core_bits::MapCopyBase* > - _node_maps; + _node_maps; std::vector<_core_bits::MapCopyBase* > - _arc_maps; + _arc_maps; std::vector<_core_bits::MapCopyBase* > - _edge_maps; + _edge_maps; }; /// \brief Copy a graph to another graph. /// - /// Copy a graph to another graph. The complete usage of the - /// function is detailed in the GraphCopy class, but a short - /// example shows a basic work: + /// This function copies a graph to another graph. + /// The complete usage of it is detailed in the GraphCopy class, + /// but a short example shows a basic work: ///\code - /// copyGraph(trg, src).nodeRef(nr).arcCrossRef(ecr).run(); + /// graphCopy(src, trg).nodeRef(nr).edgeCrossRef(ecr).run(); ///\endcode /// /// After the copy the \c nr map will contain the mapping from the /// nodes of the \c from graph to the nodes of the \c to graph and - /// \c ecr will contain the mapping from the arcs of the \c to graph - /// to the arcs of the \c from graph. + /// \c ecr will contain the mapping from the edges of the \c to graph + /// to the edges of the \c from graph. /// /// \see GraphCopy - template - GraphCopy - copyGraph(To& to, const From& from) { - return GraphCopy(to, from); + template + GraphCopy + graphCopy(const From& from, To& to) { + return GraphCopy(from, to); } namespace _core_bits { @@ -957,7 +980,7 @@ template struct FindArcSelector< Graph, - typename enable_if::type> + typename enable_if::type> { typedef typename Graph::Node Node; typedef typename Graph::Arc Arc; @@ -967,9 +990,10 @@ }; } - /// \brief Finds an arc between two nodes of a graph. + /// \brief Find an arc between two nodes of a digraph. /// - /// Finds an arc from node \c u to node \c v in graph \c g. + /// This function finds an arc from node \c u to node \c v in the + /// digraph \c g. /// /// If \c prev is \ref INVALID (this is the default value), then /// it finds the first arc from \c u to \c v. Otherwise it looks for @@ -978,15 +1002,16 @@ /// /// Thus you can iterate through each arc from \c u to \c v as it follows. ///\code - /// for(Arc e=findArc(g,u,v);e!=INVALID;e=findArc(g,u,v,e)) { + /// for(Arc e = findArc(g,u,v); e != INVALID; e = findArc(g,u,v,e)) { /// ... /// } ///\endcode /// - ///\sa ArcLookUp - ///\sa AllArcLookUp - ///\sa DynArcLookUp + /// \note \ref ConArcIt provides iterator interface for the same + /// functionality. + /// ///\sa ConArcIt + ///\sa ArcLookUp, AllArcLookUp, DynArcLookUp template inline typename Graph::Arc findArc(const Graph &g, typename Graph::Node u, typename Graph::Node v, @@ -994,10 +1019,10 @@ return _core_bits::FindArcSelector::find(g, u, v, prev); } - /// \brief Iterator for iterating on arcs connected the same nodes. + /// \brief Iterator for iterating on parallel arcs connecting the same nodes. /// - /// Iterator for iterating on arcs connected the same nodes. It is - /// higher level interface for the findArc() function. You can + /// Iterator for iterating on parallel arcs connecting the same nodes. It is + /// a higher level interface for the \ref findArc() function. You can /// use it the following way: ///\code /// for (ConArcIt it(g, src, trg); it != INVALID; ++it) { @@ -1006,9 +1031,7 @@ ///\endcode /// ///\sa findArc() - ///\sa ArcLookUp - ///\sa AllArcLookUp - ///\sa DynArcLookUp + ///\sa ArcLookUp, AllArcLookUp, DynArcLookUp template class ConArcIt : public _Graph::Arc { public: @@ -1021,16 +1044,15 @@ /// \brief Constructor. /// - /// Construct a new ConArcIt iterating on the arcs which - /// connects the \c u and \c v node. + /// Construct a new ConArcIt iterating on the arcs that + /// connects nodes \c u and \c v. ConArcIt(const Graph& g, Node u, Node v) : _graph(g) { Parent::operator=(findArc(_graph, u, v)); } /// \brief Constructor. /// - /// Construct a new ConArcIt which continues the iterating from - /// the \c e arc. + /// Construct a new ConArcIt that continues the iterating from arc \c a. ConArcIt(const Graph& g, Arc a) : Parent(a), _graph(g) {} /// \brief Increment operator. @@ -1091,27 +1113,29 @@ }; } - /// \brief Finds an edge between two nodes of a graph. + /// \brief Find an edge between two nodes of a graph. /// - /// Finds an edge from node \c u to node \c v in graph \c g. - /// If the node \c u and node \c v is equal then each loop edge + /// This function finds an edge from node \c u to node \c v in graph \c g. + /// If node \c u and node \c v is equal then each loop edge /// will be enumerated once. /// /// If \c prev is \ref INVALID (this is the default value), then - /// it finds the first arc from \c u to \c v. Otherwise it looks for - /// the next arc from \c u to \c v after \c prev. - /// \return The found arc or \ref INVALID if there is no such an arc. + /// it finds the first edge from \c u to \c v. Otherwise it looks for + /// the next edge from \c u to \c v after \c prev. + /// \return The found edge or \ref INVALID if there is no such an edge. /// - /// Thus you can iterate through each arc from \c u to \c v as it follows. + /// Thus you can iterate through each edge between \c u and \c v + /// as it follows. ///\code - /// for(Edge e = findEdge(g,u,v); e != INVALID; - /// e = findEdge(g,u,v,e)) { + /// for(Edge e = findEdge(g,u,v); e != INVALID; e = findEdge(g,u,v,e)) { /// ... /// } ///\endcode /// + /// \note \ref ConEdgeIt provides iterator interface for the same + /// functionality. + /// ///\sa ConEdgeIt - template inline typename Graph::Edge findEdge(const Graph &g, typename Graph::Node u, typename Graph::Node v, @@ -1119,13 +1143,13 @@ return _core_bits::FindEdgeSelector::find(g, u, v, p); } - /// \brief Iterator for iterating on edges connected the same nodes. + /// \brief Iterator for iterating on parallel edges connecting the same nodes. /// - /// Iterator for iterating on edges connected the same nodes. It is - /// higher level interface for the findEdge() function. You can + /// Iterator for iterating on parallel edges connecting the same nodes. + /// It is a higher level interface for the findEdge() function. You can /// use it the following way: ///\code - /// for (ConEdgeIt it(g, src, trg); it != INVALID; ++it) { + /// for (ConEdgeIt it(g, u, v); it != INVALID; ++it) { /// ... /// } ///\endcode @@ -1143,16 +1167,15 @@ /// \brief Constructor. /// - /// Construct a new ConEdgeIt iterating on the edges which - /// connects the \c u and \c v node. + /// Construct a new ConEdgeIt iterating on the edges that + /// connects nodes \c u and \c v. ConEdgeIt(const Graph& g, Node u, Node v) : _graph(g) { Parent::operator=(findEdge(_graph, u, v)); } /// \brief Constructor. /// - /// Construct a new ConEdgeIt which continues the iterating from - /// the \c e edge. + /// Construct a new ConEdgeIt that continues iterating from edge \c e. ConEdgeIt(const Graph& g, Edge e) : Parent(e), _graph(g) {} /// \brief Increment operator. @@ -1168,21 +1191,21 @@ }; - ///Dynamic arc look up between given endpoints. + ///Dynamic arc look-up between given endpoints. ///Using this class, you can find an arc in a digraph from a given - ///source to a given target in amortized time O(logd), + ///source to a given target in amortized time O(logd), ///where d is the out-degree of the source node. /// ///It is possible to find \e all parallel arcs between two nodes with ///the \c operator() member. /// - ///See the \ref ArcLookUp and \ref AllArcLookUp classes if your - ///digraph is not changed so frequently. + ///This is a dynamic data structure. Consider to use \ref ArcLookUp or + ///\ref AllArcLookUp if your digraph is not changed so frequently. /// - ///This class uses a self-adjusting binary search tree, Sleator's - ///and Tarjan's Splay tree for guarantee the logarithmic amortized - ///time bound for arc lookups. This class also guarantees the + ///This class uses a self-adjusting binary search tree, the Splay tree + ///of Sleator and Tarjan to guarantee the logarithmic amortized + ///time bound for arc look-ups. This class also guarantees the ///optimal time bound in a constant factor for any distribution of ///queries. /// @@ -1507,8 +1530,8 @@ ///Find an arc between two nodes. ///Find an arc between two nodes. - ///\param s The source node - ///\param t The target node + ///\param s The source node. + ///\param t The target node. ///\param p The previous arc between \c s and \c t. It it is INVALID or ///not given, the operator finds the first appropriate arc. ///\return An arc from \c s to \c t after \c p or @@ -1519,21 +1542,20 @@ ///\code ///DynArcLookUp ae(g); ///... - ///int n=0; - ///for(Arc e=ae(u,v);e!=INVALID;e=ae(u,v,e)) n++; + ///int n = 0; + ///for(Arc a = ae(u,v); a != INVALID; a = ae(u,v,a)) n++; ///\endcode /// - ///Finding the arcs take at most O(logd) + ///Finding the arcs take at most O(logd) ///amortized time, specifically, the time complexity of the lookups ///is equal to the optimal search tree implementation for the ///current query distribution in a constant factor. /// ///\note This is a dynamic data structure, therefore the data - ///structure is updated after each graph alteration. However, - ///theoretically this data structure is faster than \c ArcLookUp - ///or AllEdgeLookup, but it often provides worse performance than + ///structure is updated after each graph alteration. Thus although + ///this data structure is theoretically faster than \ref ArcLookUp + ///and \ref AllArcLookup, it often provides worse performance than ///them. - /// Arc operator()(Node s, Node t, Arc p = INVALID) const { if (p == INVALID) { Arc a = _head[s]; @@ -1585,19 +1607,19 @@ }; - ///Fast arc look up between given endpoints. + ///Fast arc look-up between given endpoints. ///Using this class, you can find an arc in a digraph from a given - ///source to a given target in time O(log d), + ///source to a given target in time O(logd), ///where d is the out-degree of the source node. /// ///It is not possible to find \e all parallel arcs between two nodes. ///Use \ref AllArcLookUp for this purpose. /// - ///\warning This class is static, so you should refresh() (or at least - ///refresh(Node)) this data structure - ///whenever the digraph changes. This is a time consuming (superlinearly - ///proportional (O(mlogm)) to the number of arcs). + ///\warning This class is static, so you should call refresh() (or at + ///least refresh(Node)) to refresh this data structure whenever the + ///digraph changes. This is a time consuming (superlinearly proportional + ///(O(m logm)) to the number of arcs). /// ///\tparam G The type of the underlying digraph. /// @@ -1646,12 +1668,12 @@ return me; } public: - ///Refresh the data structure at a node. + ///Refresh the search data structure at a node. ///Build up the search database of node \c n. /// - ///It runs in time O(dlogd), where d is - ///the number of the outgoing arcs of \c n. + ///It runs in time O(d logd), where d + ///is the number of the outgoing arcs of \c n. void refresh(Node n) { std::vector v; @@ -1667,10 +1689,9 @@ ///Build up the full search database. In fact, it simply calls ///\ref refresh(Node) "refresh(n)" for each node \c n. /// - ///It runs in time O(mlogD), where m is - ///the number of the arcs of \c n and D is the maximum + ///It runs in time O(m logD), where m is + ///the number of the arcs in the digraph and D is the maximum ///out-degree of the digraph. - void refresh() { for(NodeIt n(_g);n!=INVALID;++n) refresh(n); @@ -1678,18 +1699,16 @@ ///Find an arc between two nodes. - ///Find an arc between two nodes in time O(logd), where - /// d is the number of outgoing arcs of \c s. - ///\param s The source node - ///\param t The target node + ///Find an arc between two nodes in time O(logd), where + ///d is the number of outgoing arcs of \c s. + ///\param s The source node. + ///\param t The target node. ///\return An arc from \c s to \c t if there exists, ///\ref INVALID otherwise. /// ///\warning If you change the digraph, refresh() must be called before using ///this operator. If you change the outgoing arcs of - ///a single node \c n, then - ///\ref refresh(Node) "refresh(n)" is enough. - /// + ///a single node \c n, then \ref refresh(Node) "refresh(n)" is enough. Arc operator()(Node s, Node t) const { Arc e; @@ -1701,15 +1720,16 @@ }; - ///Fast look up of all arcs between given endpoints. + ///Fast look-up of all arcs between given endpoints. ///This class is the same as \ref ArcLookUp, with the addition - ///that it makes it possible to find all arcs between given endpoints. + ///that it makes it possible to find all parallel arcs between given + ///endpoints. /// - ///\warning This class is static, so you should refresh() (or at least - ///refresh(Node)) this data structure - ///whenever the digraph changes. This is a time consuming (superlinearly - ///proportional (O(mlogm)) to the number of arcs). + ///\warning This class is static, so you should call refresh() (or at + ///least refresh(Node)) to refresh this data structure whenever the + ///digraph changes. This is a time consuming (superlinearly proportional + ///(O(m logm)) to the number of arcs). /// ///\tparam G The type of the underlying digraph. /// @@ -1733,7 +1753,6 @@ if(head==INVALID) return next; else { next=refreshNext(_right[head],next); -// _next[head]=next; _next[head]=( next!=INVALID && _g.target(next)==_g.target(head)) ? next : INVALID; return refreshNext(_left[head],head); @@ -1758,9 +1777,8 @@ ///Build up the search database of node \c n. /// - ///It runs in time O(dlogd), where d is + ///It runs in time O(d logd), where d is ///the number of the outgoing arcs of \c n. - void refresh(Node n) { ArcLookUp::refresh(n); @@ -1772,10 +1790,9 @@ ///Build up the full search database. In fact, it simply calls ///\ref refresh(Node) "refresh(n)" for each node \c n. /// - ///It runs in time O(mlogD), where m is - ///the number of the arcs of \c n and D is the maximum + ///It runs in time O(m logD), where m is + ///the number of the arcs in the digraph and D is the maximum ///out-degree of the digraph. - void refresh() { for(NodeIt n(_g);n!=INVALID;++n) refresh(_head[n]); @@ -1784,8 +1801,8 @@ ///Find an arc between two nodes. ///Find an arc between two nodes. - ///\param s The source node - ///\param t The target node + ///\param s The source node. + ///\param t The target node. ///\param prev The previous arc between \c s and \c t. It it is INVALID or ///not given, the operator finds the first appropriate arc. ///\return An arc from \c s to \c t after \c prev or @@ -1796,18 +1813,17 @@ ///\code ///AllArcLookUp ae(g); ///... - ///int n=0; - ///for(Arc e=ae(u,v);e!=INVALID;e=ae(u,v,e)) n++; + ///int n = 0; + ///for(Arc a = ae(u,v); a != INVALID; a=ae(u,v,a)) n++; ///\endcode /// - ///Finding the first arc take O(logd) time, where - /// d is the number of outgoing arcs of \c s. Then, the + ///Finding the first arc take O(logd) time, where + ///d is the number of outgoing arcs of \c s. Then, the ///consecutive arcs are found in constant time. /// ///\warning If you change the digraph, refresh() must be called before using ///this operator. If you change the outgoing arcs of - ///a single node \c n, then - ///\ref refresh(Node) "refresh(n)" is enough. + ///a single node \c n, then \ref refresh(Node) "refresh(n)" is enough. /// #ifdef DOXYGEN Arc operator()(Node s, Node t, Arc prev=INVALID) const {} diff --git a/lemon/dfs.h b/lemon/dfs.h --- a/lemon/dfs.h +++ b/lemon/dfs.h @@ -55,7 +55,6 @@ ///This function instantiates a \ref PredMap. ///\param g is the digraph, to which we would like to define the ///\ref PredMap. - ///\todo The digraph alone may be insufficient to initialize static PredMap *createPredMap(const Digraph &g) { return new PredMap(g); @@ -65,7 +64,6 @@ ///The type of the map that indicates which nodes are processed. ///It must meet the \ref concepts::WriteMap "WriteMap" concept. - ///By default it is a NullMap. typedef NullMap ProcessedMap; ///Instantiates a \ref ProcessedMap. @@ -196,8 +194,7 @@ std::vector _stack; int _stack_head; - ///Creates the maps if necessary. - ///\todo Better memory allocation (instead of new). + //Creates the maps if necessary. void create_maps() { if(!_pred) { @@ -782,7 +779,6 @@ ///This function instantiates a \ref PredMap. ///\param g is the digraph, to which we would like to define the ///\ref PredMap. - ///\todo The digraph alone may be insufficient to initialize static PredMap *createPredMap(const Digraph &g) { return new PredMap(g); @@ -1317,8 +1313,7 @@ std::vector _stack; int _stack_head; - ///Creates the maps if necessary. - ///\todo Better memory allocation (instead of new). + //Creates the maps if necessary. void create_maps() { if(!_reached) { local_reached = true; diff --git a/lemon/dijkstra.h b/lemon/dijkstra.h --- a/lemon/dijkstra.h +++ b/lemon/dijkstra.h @@ -144,7 +144,6 @@ ///This function instantiates a \ref PredMap. ///\param g is the digraph, to which we would like to define the ///\ref PredMap. - ///\todo The digraph alone may be insufficient for the initialization static PredMap *createPredMap(const Digraph &g) { return new PredMap(g); @@ -155,8 +154,6 @@ ///The type of the map that indicates which nodes are processed. ///It must meet the \ref concepts::WriteMap "WriteMap" concept. ///By default it is a NullMap. - ///\todo If it is set to a real map, - ///Dijkstra::processed() should read this. typedef NullMap ProcessedMap; ///Instantiates a \ref ProcessedMap. @@ -297,8 +294,7 @@ //Indicates if _heap is locally allocated (true) or not. bool local_heap; - ///Creates the maps if necessary. - ///\todo Better memory allocation (instead of new). + //Creates the maps if necessary. void create_maps() { if(!_pred) { @@ -965,7 +961,6 @@ ///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 Digraph &g) { return new HeapCrossRef(g); @@ -1001,7 +996,6 @@ ///This function instantiates a \ref PredMap. ///\param g is the digraph, to which we would like to define the ///\ref PredMap. - ///\todo The digraph alone may be insufficient to initialize static PredMap *createPredMap(const Digraph &g) { return new PredMap(g); @@ -1012,9 +1006,6 @@ ///The type of the map that indicates which nodes are processed. ///It must meet the \ref concepts::WriteMap "WriteMap" concept. ///By default it is a NullMap. - ///\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 ProcessedMap; ///Instantiates a \ref ProcessedMap. @@ -1060,7 +1051,6 @@ /// 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 DijkstraWizardBase : public DijkstraWizardDefaultTraits { diff --git a/lemon/error.h b/lemon/error.h --- a/lemon/error.h +++ b/lemon/error.h @@ -102,8 +102,6 @@ protected: ///\e - ///\todo The good solution is boost::shared_ptr... - /// mutable std::auto_ptr buf; ///\e diff --git a/lemon/graph_to_eps.h b/lemon/graph_to_eps.h --- a/lemon/graph_to_eps.h +++ b/lemon/graph_to_eps.h @@ -666,7 +666,6 @@ ///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; @@ -707,7 +706,6 @@ 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; } @@ -717,7 +715,6 @@ 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; } @@ -873,7 +870,6 @@ << -bb.left() << ' ' << -bb.bottom() << " translate\n"; } else { - //\todo Verify centering double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.width(), (A4WIDTH-2*A4BORDER)/bb.height()); os << ((A4WIDTH -2*A4BORDER)-sc*bb.height())/2 + A4BORDER << ' ' @@ -906,7 +902,6 @@ dim2::Point dvec(mycoords[g.target(*i)]-mycoords[g.source(*i)]); double l=std::sqrt(dvec.normSquare()); - //\todo better 'epsilon' would be nice here. dim2::Point d(dvec/std::max(l,EPSILON)); dim2::Point m; // m=dim2::Point(mycoords[g.target(*i)]+ diff --git a/lemon/list_graph.h b/lemon/list_graph.h --- a/lemon/list_graph.h +++ b/lemon/list_graph.h @@ -501,10 +501,8 @@ ///valid. However InArcIts and OutArcIts may ///be invalidated. /// - ///\warning This functionality cannot be used together with the + ///\warning This functionality cannot be used in conjunction with the ///Snapshot feature. - /// - ///\todo It could be implemented in a bit faster way. Node split(Node n, bool connect = true) { Node b = addNode(); for(OutArcIt e(*this,n);e!=INVALID;) { diff --git a/lemon/maps.h b/lemon/maps.h --- a/lemon/maps.h +++ b/lemon/maps.h @@ -484,8 +484,6 @@ /// function. /// /// \sa CombineMap - /// - /// \todo Check the requirements. template class ComposeMap : public MapBase { const M1 &_m1; @@ -540,8 +538,6 @@ /// function. /// /// \sa ComposeMap - /// - /// \todo Check the requirements. template class CombineMap : public MapBase { diff --git a/lemon/random.h b/lemon/random.h --- a/lemon/random.h +++ b/lemon/random.h @@ -821,7 +821,6 @@ /// Standard Gauss distribution. /// \note The Cartesian form of the Box-Muller /// transformation is used to generate a random normal distribution. - /// \todo Consider using the "ziggurat" method instead. double gauss() { double V1,V2,S; diff --git a/lemon/smart_graph.h b/lemon/smart_graph.h --- a/lemon/smart_graph.h +++ b/lemon/smart_graph.h @@ -300,7 +300,6 @@ ///may be invalidated. ///\warning This functionality cannot be used together with the Snapshot ///feature. - ///\todo It could be implemented in a bit faster way. Node split(Node n, bool connect = true) { Node b = addNode(); diff --git a/lemon/time_measure.h b/lemon/time_measure.h --- a/lemon/time_measure.h +++ b/lemon/time_measure.h @@ -292,7 +292,6 @@ ///\note If you want to measure the running time of the execution of a certain ///function, consider the usage of \ref TimeReport instead. /// - ///\todo This shouldn't be Unix (Linux) specific. ///\sa TimeReport class Timer { @@ -487,7 +486,6 @@ /// ///\sa Timer ///\sa NoTimeReport - ///\todo There is no test case for this class TimeReport : public Timer { std::string _title; diff --git a/lemon/tolerance.h b/lemon/tolerance.h --- a/lemon/tolerance.h +++ b/lemon/tolerance.h @@ -24,8 +24,6 @@ ///\brief A basic tool to handle the anomalies of calculation with ///floating point numbers. /// -///\todo It should be in a module like "Basic tools" - namespace lemon { diff --git a/scripts/chg-len.py b/scripts/chg-len.py --- a/scripts/chg-len.py +++ b/scripts/chg-len.py @@ -9,13 +9,14 @@ in the revision graph from revison 0 to the current one. """ exit(0) -plist = os.popen("hg parents --template='{rev}\n'").readlines() +plist = os.popen("HGRCPATH='' hg parents --template='{rev}\n'").readlines() if len(plist)>1: print "You are in the process of merging" exit(1) PAR = int(plist[0]) -f = os.popen("hg log -r 0:tip --template='{rev} {parents}\n'").readlines() +f = os.popen("HGRCPATH='' hg log -r 0:tip --template='{rev} {parents}\n'").\ + readlines() REV = -1 lengths=[] for l in f: diff --git a/test/graph_copy_test.cc b/test/graph_copy_test.cc --- a/test/graph_copy_test.cc +++ b/test/graph_copy_test.cc @@ -63,11 +63,11 @@ ListDigraph::NodeMap ncr(to); ListDigraph::ArcMap ecr(to); - DigraphCopy(to, from). - nodeMap(tnm, fnm).arcMap(tam, fam). + digraphCopy(from, to). + nodeMap(fnm, tnm).arcMap(fam, tam). nodeRef(nr).arcRef(er). nodeCrossRef(ncr).arcCrossRef(ecr). - node(tn, fn).arc(ta, fa).run(); + node(fn, tn).arc(fa, ta).run(); for (SmartDigraph::NodeIt it(from); it != INVALID; ++it) { check(ncr[nr[it]] == it, "Wrong copy."); @@ -138,11 +138,11 @@ ListGraph::ArcMap acr(to); ListGraph::EdgeMap ecr(to); - GraphCopy(to, from). - nodeMap(tnm, fnm).arcMap(tam, fam).edgeMap(tem, fem). + graphCopy(from, to). + nodeMap(fnm, tnm).arcMap(fam, tam).edgeMap(fem, tem). nodeRef(nr).arcRef(ar).edgeRef(er). nodeCrossRef(ncr).arcCrossRef(acr).edgeCrossRef(ecr). - node(tn, fn).arc(ta, fa).edge(te, fe).run(); + node(fn, tn).arc(fa, ta).edge(fe, te).run(); for (SmartGraph::NodeIt it(from); it != INVALID; ++it) { check(ncr[nr[it]] == it, "Wrong copy.");