[Lemon-commits] [lemon_svn] deba: r1950 - in hugo/trunk/lemon: . concept

[Lemon SVN]

Author: deba
Date: Fri Jun 10 14:16:25 2005
New Revision: 1950

Modified:
   hugo/trunk/lemon/concept/graph.h
   hugo/trunk/lemon/graph_to_eps.h
   hugo/trunk/lemon/graph_utils.h
   hugo/trunk/lemon/list_graph.h

Log:
Minor changes



Modified: hugo/trunk/lemon/concept/graph.h
==============================================================================
--- hugo/trunk/lemon/concept/graph.h	(original)
+++ hugo/trunk/lemon/concept/graph.h	Fri Jun 10 14:16:25 2005
@@ -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 

Modified: hugo/trunk/lemon/graph_to_eps.h
==============================================================================
--- hugo/trunk/lemon/graph_to_eps.h	(original)
+++ hugo/trunk/lemon/graph_to_eps.h	Fri Jun 10 14:16:25 2005
@@ -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"

Modified: hugo/trunk/lemon/graph_utils.h
==============================================================================
--- hugo/trunk/lemon/graph_utils.h	(original)
+++ hugo/trunk/lemon/graph_utils.h	Fri Jun 10 14:16:25 2005
@@ -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;

Modified: hugo/trunk/lemon/list_graph.h
==============================================================================
--- hugo/trunk/lemon/list_graph.h	(original)
+++ hugo/trunk/lemon/list_graph.h	Fri Jun 10 14:16:25 2005
@@ -38,7 +38,7 @@
 
   protected:
     struct NodeT {
-      int first_in,first_out;
+      int first_in, first_out;
       int prev, next;
     };