# HG changeset patch # User deba # Date 1118405785 0 # Node ID 9b6f8c3587f0b4a67abcb0a1c75bf3415d46064a # Parent 104aab6e5d864c47e2e743575cc6d1a227f042ef Minor changes diff -r 104aab6e5d86 -r 9b6f8c3587f0 lemon/concept/graph.h --- a/lemon/concept/graph.h Fri Jun 10 12:11:50 2005 +0000 +++ b/lemon/concept/graph.h Fri Jun 10 12:16:25 2005 +0000 @@ -211,11 +211,11 @@ NodeIt(const StaticGraph&) { } /// Node -> NodeIt conversion. - /// Sets the iterator to the node of \c g pointed by the trivial - /// iterator n. + /// Sets the iterator to the node of \c the graph pointed by + /// the trivial iterator. /// This feature necessitates that each time we /// iterate the edge-set, the iteration order is the same. - NodeIt(const StaticGraph& g, const Node& n) { } + NodeIt(const StaticGraph&, const Node&) { } /// Next node. /// Assign the iterator to the next node. @@ -295,10 +295,10 @@ OutEdgeIt(const StaticGraph&, const Node&) { } /// Edge -> OutEdgeIt conversion - /// Sets the iterator to the value of the trivial iterator \c e. - /// This feature necessitates that each time we + /// Sets the iterator to the value of the trivial iterator. + /// This feature necessitates that each time we /// iterate the edge-set, the iteration order is the same. - OutEdgeIt(const StaticGraph& g, const Edge& e) { } + OutEdgeIt(const StaticGraph&, const Edge&) { } ///Next outgoing edge /// Assign the iterator to the next diff -r 104aab6e5d86 -r 9b6f8c3587f0 lemon/graph_to_eps.h --- a/lemon/graph_to_eps.h Fri Jun 10 12:11:50 2005 +0000 +++ b/lemon/graph_to_eps.h Fri Jun 10 12:16:25 2005 +0000 @@ -775,7 +775,7 @@ os << "\ngsave\n"; if(_scaleToA4) if(bb.height()>bb.width()) { - double sc= min((A4HEIGHT-2*A4BORDER)/bb.height(), + double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.height(), (A4WIDTH-2*A4BORDER)/bb.width()); os << ((A4WIDTH -2*A4BORDER)-sc*bb.width())/2 + A4BORDER << ' ' << ((A4HEIGHT-2*A4BORDER)-sc*bb.height())/2 + A4BORDER << " translate\n" @@ -784,7 +784,7 @@ } else { //\todo Verify centering - double sc= min((A4HEIGHT-2*A4BORDER)/bb.width(), + double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.width(), (A4WIDTH-2*A4BORDER)/bb.height()); os << ((A4WIDTH -2*A4BORDER)-sc*bb.height())/2 + A4BORDER << ' ' << ((A4HEIGHT-2*A4BORDER)-sc*bb.width())/2 + A4BORDER << " translate\n" diff -r 104aab6e5d86 -r 9b6f8c3587f0 lemon/graph_utils.h --- a/lemon/graph_utils.h Fri Jun 10 12:11:50 2005 +0000 +++ b/lemon/graph_utils.h Fri Jun 10 12:16:25 2005 +0000 @@ -678,6 +678,13 @@ Value operator[](const Key& key) const { return inverted.invMap[key]; } + + /// \brief Size of the map. + /// + /// Returns the size of the map. + unsigned size() const { + return inverted.invMap.size(); + } private: const DescriptorMap& inverted; diff -r 104aab6e5d86 -r 9b6f8c3587f0 lemon/list_graph.h --- a/lemon/list_graph.h Fri Jun 10 12:11:50 2005 +0000 +++ b/lemon/list_graph.h Fri Jun 10 12:16:25 2005 +0000 @@ -38,7 +38,7 @@ protected: struct NodeT { - int first_in,first_out; + int first_in, first_out; int prev, next; };