Minor changes
authordeba
Fri, 10 Jun 2005 12:16:25 +0000
changeset 14709b6f8c3587f0
parent 1469 104aab6e5d86
child 1471 11a13908b510
Minor changes
lemon/concept/graph.h
lemon/graph_to_eps.h
lemon/graph_utils.h
lemon/list_graph.h
     1.1 --- a/lemon/concept/graph.h	Fri Jun 10 12:11:50 2005 +0000
     1.2 +++ b/lemon/concept/graph.h	Fri Jun 10 12:16:25 2005 +0000
     1.3 @@ -211,11 +211,11 @@
     1.4          NodeIt(const StaticGraph&) { }
     1.5          /// Node -> NodeIt conversion.
     1.6  
     1.7 -        /// Sets the iterator to the node of \c g pointed by the trivial 
     1.8 -        /// iterator n.
     1.9 +        /// Sets the iterator to the node of \c the graph pointed by 
    1.10 +	/// the trivial iterator.
    1.11          /// This feature necessitates that each time we 
    1.12          /// iterate the edge-set, the iteration order is the same.
    1.13 -        NodeIt(const StaticGraph& g, const Node& n) { }
    1.14 +        NodeIt(const StaticGraph&, const Node&) { }
    1.15          /// Next node.
    1.16  
    1.17          /// Assign the iterator to the next node.
    1.18 @@ -295,10 +295,10 @@
    1.19          OutEdgeIt(const StaticGraph&, const Node&) { }
    1.20          /// Edge -> OutEdgeIt conversion
    1.21  
    1.22 -        /// Sets the iterator to the value of the trivial iterator \c e.
    1.23 -        /// This feature necessitates that each time we 
    1.24 +        /// Sets the iterator to the value of the trivial iterator.
    1.25 +	/// This feature necessitates that each time we 
    1.26          /// iterate the edge-set, the iteration order is the same.
    1.27 -        OutEdgeIt(const StaticGraph& g, const Edge& e) { }
    1.28 +        OutEdgeIt(const StaticGraph&, const Edge&) { }
    1.29          ///Next outgoing edge
    1.30          
    1.31          /// Assign the iterator to the next 
     2.1 --- a/lemon/graph_to_eps.h	Fri Jun 10 12:11:50 2005 +0000
     2.2 +++ b/lemon/graph_to_eps.h	Fri Jun 10 12:16:25 2005 +0000
     2.3 @@ -775,7 +775,7 @@
     2.4      os << "\ngsave\n";
     2.5      if(_scaleToA4)
     2.6        if(bb.height()>bb.width()) {
     2.7 -	double sc= min((A4HEIGHT-2*A4BORDER)/bb.height(),
     2.8 +	double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.height(),
     2.9  		  (A4WIDTH-2*A4BORDER)/bb.width());
    2.10  	os << ((A4WIDTH -2*A4BORDER)-sc*bb.width())/2 + A4BORDER << ' '
    2.11  	   << ((A4HEIGHT-2*A4BORDER)-sc*bb.height())/2 + A4BORDER << " translate\n"
    2.12 @@ -784,7 +784,7 @@
    2.13        }
    2.14        else {
    2.15  	//\todo Verify centering
    2.16 -	double sc= min((A4HEIGHT-2*A4BORDER)/bb.width(),
    2.17 +	double sc= std::min((A4HEIGHT-2*A4BORDER)/bb.width(),
    2.18  		  (A4WIDTH-2*A4BORDER)/bb.height());
    2.19  	os << ((A4WIDTH -2*A4BORDER)-sc*bb.height())/2 + A4BORDER << ' '
    2.20  	   << ((A4HEIGHT-2*A4BORDER)-sc*bb.width())/2 + A4BORDER  << " translate\n"
     3.1 --- a/lemon/graph_utils.h	Fri Jun 10 12:11:50 2005 +0000
     3.2 +++ b/lemon/graph_utils.h	Fri Jun 10 12:16:25 2005 +0000
     3.3 @@ -678,6 +678,13 @@
     3.4        Value operator[](const Key& key) const {
     3.5  	return inverted.invMap[key];
     3.6        }
     3.7 +
     3.8 +      /// \brief Size of the map.
     3.9 +      ///
    3.10 +      /// Returns the size of the map.
    3.11 +      unsigned size() const {
    3.12 +	return inverted.invMap.size();
    3.13 +      }
    3.14        
    3.15      private:
    3.16        const DescriptorMap& inverted;
     4.1 --- a/lemon/list_graph.h	Fri Jun 10 12:11:50 2005 +0000
     4.2 +++ b/lemon/list_graph.h	Fri Jun 10 12:16:25 2005 +0000
     4.3 @@ -38,7 +38,7 @@
     4.4  
     4.5    protected:
     4.6      struct NodeT {
     4.7 -      int first_in,first_out;
     4.8 +      int first_in, first_out;
     4.9        int prev, next;
    4.10      };
    4.11