1.1 --- a/src/lemon/bfs.h Mon Apr 18 14:18:12 2005 +0000
1.2 +++ b/src/lemon/bfs.h Mon Apr 18 14:59:24 2005 +0000
1.3 @@ -86,7 +86,7 @@
1.4 ///This function instantiates a \ref ProcessedMap.
1.5 ///\param G is the graph, to which
1.6 ///we would like to define the \ref ProcessedMap
1.7 - static ProcessedMap *createProcessedMap(const GR &G)
1.8 + static ProcessedMap *createProcessedMap(const GR &)
1.9 {
1.10 return new ProcessedMap();
1.11 }
1.12 @@ -769,7 +769,7 @@
1.13 ///This function instantiates a \ref PredMap.
1.14 ///\param G is the graph, to which we would like to define the PredMap.
1.15 ///\todo The graph alone may be insufficient to initialize
1.16 - static PredMap *createPredMap(const GR &G)
1.17 + static PredMap *createPredMap(const GR &)
1.18 {
1.19 return new PredMap();
1.20 }
1.21 @@ -802,7 +802,7 @@
1.22 ///This function instantiates a \ref ProcessedMap.
1.23 ///\param G is the graph, to which
1.24 ///we would like to define the \ref ProcessedMap
1.25 - static ProcessedMap *createProcessedMap(const GR &G)
1.26 + static ProcessedMap *createProcessedMap(const GR &)
1.27 {
1.28 return new ProcessedMap();
1.29 }
1.30 @@ -831,7 +831,7 @@
1.31
1.32 ///This function instantiates a \ref DistMap.
1.33 ///\param G is the graph, to which we would like to define the \ref DistMap
1.34 - static DistMap *createDistMap(const GR &G)
1.35 + static DistMap *createDistMap(const GR &)
1.36 {
1.37 return new DistMap();
1.38 }
1.39 @@ -988,7 +988,7 @@
1.40 template<class T>
1.41 struct DefPredMapBase : public Base {
1.42 typedef T PredMap;
1.43 - static PredMap *createPredMap(const Graph &G) { return 0; };
1.44 + static PredMap *createPredMap(const Graph &) { return 0; };
1.45 DefPredMapBase(const TR &b) : TR(b) {}
1.46 };
1.47
1.48 @@ -1009,7 +1009,7 @@
1.49 template<class T>
1.50 struct DefReachedMapBase : public Base {
1.51 typedef T ReachedMap;
1.52 - static ReachedMap *createReachedMap(const Graph &G) { return 0; };
1.53 + static ReachedMap *createReachedMap(const Graph &) { return 0; };
1.54 DefReachedMapBase(const TR &b) : TR(b) {}
1.55 };
1.56
1.57 @@ -1030,7 +1030,7 @@
1.58 template<class T>
1.59 struct DefProcessedMapBase : public Base {
1.60 typedef T ProcessedMap;
1.61 - static ProcessedMap *createProcessedMap(const Graph &G) { return 0; };
1.62 + static ProcessedMap *createProcessedMap(const Graph &) { return 0; };
1.63 DefProcessedMapBase(const TR &b) : TR(b) {}
1.64 };
1.65
1.66 @@ -1071,7 +1071,7 @@
1.67 template<class T>
1.68 struct DefDistMapBase : public Base {
1.69 typedef T DistMap;
1.70 - static DistMap *createDistMap(const Graph &G) { return 0; };
1.71 + static DistMap *createDistMap(const Graph &) { return 0; };
1.72 DefDistMapBase(const TR &b) : TR(b) {}
1.73 };
1.74
2.1 --- a/src/lemon/concept/graph.h Mon Apr 18 14:18:12 2005 +0000
2.2 +++ b/src/lemon/concept/graph.h Mon Apr 18 14:59:24 2005 +0000
2.3 @@ -185,7 +185,7 @@
2.4
2.5 /// Copy constructor.
2.6 ///
2.7 - NodeIt(const NodeIt&) { }
2.8 + NodeIt(const NodeIt& n) : Node(n) { }
2.9 /// Invalid constructor \& conversion.
2.10
2.11 /// Initialize the iterator to be invalid.
2.12 @@ -195,7 +195,7 @@
2.13
2.14 /// Sets the iterator to the first node of \c g.
2.15 ///
2.16 - NodeIt(const StaticGraph& g) { }
2.17 + NodeIt(const StaticGraph&) { }
2.18 /// Node -> NodeIt conversion.
2.19
2.20 /// Sets the iterator to the node of \c g pointed by the trivial
2.21 @@ -267,7 +267,7 @@
2.22
2.23 /// Copy constructor.
2.24 ///
2.25 - OutEdgeIt(const OutEdgeIt&) { }
2.26 + OutEdgeIt(const OutEdgeIt& e) : Edge(e) { }
2.27 /// Initialize the iterator to be invalid.
2.28
2.29 /// Initialize the iterator to be invalid.
2.30 @@ -279,7 +279,7 @@
2.31 /// node
2.32 ///@param n the node
2.33 ///@param g the graph
2.34 - OutEdgeIt(const StaticGraph& g, const Node& n) { }
2.35 + OutEdgeIt(const StaticGraph&, const Node&) { }
2.36 /// Edge -> OutEdgeIt conversion
2.37
2.38 /// Sets the iterator to the value of the trivial iterator \c e.
2.39 @@ -316,7 +316,7 @@
2.40
2.41 /// Copy constructor.
2.42 ///
2.43 - InEdgeIt(const InEdgeIt&) { }
2.44 + InEdgeIt(const InEdgeIt& e) : Edge(e) { }
2.45 /// Initialize the iterator to be invalid.
2.46
2.47 /// Initialize the iterator to be invalid.
2.48 @@ -328,13 +328,13 @@
2.49 /// node
2.50 ///@param n the node
2.51 ///@param g the graph
2.52 - InEdgeIt(const StaticGraph& g, const Node& n) { }
2.53 + InEdgeIt(const StaticGraph&, const Node&) { }
2.54 /// Edge -> InEdgeIt conversion
2.55
2.56 /// Sets the iterator to the value of the trivial iterator \c e.
2.57 /// This feature necessitates that each time we
2.58 /// iterate the edge-set, the iteration order is the same.
2.59 - InEdgeIt(const StaticGraph& g, const Edge& n) { }
2.60 + InEdgeIt(const StaticGraph&, const Edge&) { }
2.61 /// Next incoming edge
2.62
2.63 /// Assign the iterator to the next inedge of the corresponding node.
2.64 @@ -361,7 +361,7 @@
2.65
2.66 /// Copy constructor.
2.67 ///
2.68 - EdgeIt(const EdgeIt&) { }
2.69 + EdgeIt(const EdgeIt& e) : Edge(e) { }
2.70 /// Initialize the iterator to be invalid.
2.71
2.72 /// Initialize the iterator to be invalid.
2.73 @@ -372,7 +372,7 @@
2.74 /// This constructor set the iterator to the first edge of
2.75 /// node
2.76 ///@param g the graph
2.77 - EdgeIt(const StaticGraph& g) { }
2.78 + EdgeIt(const StaticGraph&) { }
2.79 /// Edge -> EdgeIt conversion
2.80
2.81 /// Sets the iterator to the value of the trivial iterator \c e.
2.82 @@ -413,7 +413,7 @@
2.83 NodeMap(const StaticGraph&, T) { }
2.84
2.85 ///Copy constructor
2.86 - NodeMap(const NodeMap&) { }
2.87 + NodeMap(const NodeMap& nm) : ReadWriteMap< Node, T >(nm) { }
2.88 ///Assignment operator
2.89 NodeMap& operator=(const NodeMap&) { return *this; }
2.90 // \todo fix this concept
2.91 @@ -436,7 +436,7 @@
2.92 ///\e
2.93 EdgeMap(const StaticGraph&, T) { }
2.94 ///Copy constructor
2.95 - EdgeMap(const EdgeMap&) { }
2.96 + EdgeMap(const EdgeMap& em) : ReadWriteMap<Edge,T>(em) { }
2.97 ///Assignment operator
2.98 EdgeMap& operator=(const EdgeMap&) { return *this; }
2.99 // \todo fix this concept
2.100 @@ -470,7 +470,7 @@
2.101 ///Add a new edge to the graph with source node \c s
2.102 ///and target node \c t.
2.103 ///\return the new edge.
2.104 - Edge addEdge(Node s, Node t) { return INVALID; }
2.105 + Edge addEdge(Node, Node) { return INVALID; }
2.106
2.107 /// Resets the graph.
2.108
2.109 @@ -500,12 +500,12 @@
2.110
2.111 /// Deletes node \c n node.
2.112 ///
2.113 - void erase(Node n) { }
2.114 + void erase(Node) { }
2.115 /// Deletes an edge.
2.116
2.117 /// Deletes edge \c e edge.
2.118 ///
2.119 - void erase(Edge e) { }
2.120 + void erase(Edge) { }
2.121
2.122 template <typename _Graph>
2.123 struct Constraints : public _ErasableGraph::Constraints<_Graph> {};
3.1 --- a/src/lemon/concept/graph_component.h Mon Apr 18 14:18:12 2005 +0000
3.2 +++ b/src/lemon/concept/graph_component.h Mon Apr 18 14:59:24 2005 +0000
3.3 @@ -304,7 +304,7 @@
3.4 /// Gives back the node by the unique id.
3.5 /// If the graph does not contain node with the given id
3.6 /// then the result of the function is undetermined.
3.7 - Node fromId(int id, Node) const { return INVALID;}
3.8 + Node fromId(int , Node) const { return INVALID;}
3.9
3.10 /// \brief Gives back an unique integer id for the Edge.
3.11 ///
3.12 @@ -317,7 +317,7 @@
3.13 /// Gives back the edge by the unique id.
3.14 /// If the graph does not contain edge with the given id
3.15 /// then the result of the function is undetermined.
3.16 - Edge fromId(int id, Edge) const { return INVALID;}
3.17 + Edge fromId(int, Edge) const { return INVALID;}
3.18
3.19 template <typename _Graph>
3.20 struct Constraints {
3.21 @@ -398,7 +398,7 @@
3.22
3.23 /// Adds a new Edge connects the two Nodes to the graph.
3.24 ///
3.25 - Edge addEdge(const Node& from, const Node& to) {
3.26 + Edge addEdge(const Node&, const Node&) {
3.27 return INVALID;
3.28 }
3.29
3.30 @@ -745,7 +745,7 @@
3.31 /// \brief Copy constructor.
3.32 ///
3.33 /// Copy Constructor.
3.34 - GraphMap(const GraphMap&) {}
3.35 + GraphMap(const GraphMap& gm) :ReadWriteMap<Item, _Value>(gm) {}
3.36
3.37 /// \brief Assign operator.
3.38 ///
3.39 @@ -809,7 +809,7 @@
3.40 /// \brief Copy constructor.
3.41 ///
3.42 /// Copy Constructor.
3.43 - NodeMap(const NodeMap&) {}
3.44 + NodeMap(const NodeMap& nm) : GraphMap<Graph, Node, _Value>(nm) {}
3.45
3.46 /// \brief Assign operator.
3.47 ///
3.48 @@ -839,7 +839,7 @@
3.49 /// \brief Copy constructor.
3.50 ///
3.51 /// Copy Constructor.
3.52 - EdgeMap(const EdgeMap&) {}
3.53 + EdgeMap(const EdgeMap& em) :GraphMap<Graph, Edge, _Value>(em) {}
3.54
3.55 /// \brief Assign operator.
3.56 ///
3.57 @@ -917,7 +917,7 @@
3.58 /// \brief Add an edge to the graph.
3.59 ///
3.60 /// Add an edge to the graph and notify the observers.
3.61 - Edge addEdge(const Node& from, const Node& to) {
3.62 + Edge addEdge(const Node&, const Node&) {
3.63 return INVALID;
3.64 }
3.65
4.1 --- a/src/lemon/concept/maps.h Mon Apr 18 14:18:12 2005 +0000
4.2 +++ b/src/lemon/concept/maps.h Mon Apr 18 14:59:24 2005 +0000
4.3 @@ -76,7 +76,7 @@
4.4 typedef T Value;
4.5
4.6 /// Sets the value associated with a key.
4.7 - void set(const Key &k,const Value &t) {}
4.8 + void set(const Key &,const Value &) {}
4.9
4.10 ///Default constructor
4.11 WriteMap() {}
4.12 @@ -114,9 +114,9 @@
4.13 typedef T Value;
4.14
4.15 /// Returns the value associated with a key.
4.16 - Value operator[](const Key &k) const {return Value();}
4.17 + Value operator[](const Key &) const {return Value();}
4.18 /// Sets the value associated with a key.
4.19 - void set(const Key &k,const Value &t) {}
4.20 + void set(const Key & ,const Value &) {}
4.21
4.22 template<typename _ReadWriteMap>
4.23 struct Constraints {
5.1 --- a/src/lemon/concept/path.h Mon Apr 18 14:18:12 2005 +0000
5.2 +++ b/src/lemon/concept/path.h Mon Apr 18 14:59:24 2005 +0000
5.3 @@ -54,7 +54,7 @@
5.4
5.5 /// \param _G The graph in which the path is.
5.6 ///
5.7 - Path(const Graph &_G) {}
5.8 + Path(const Graph &) {}
5.9
5.10 /// Length of the path.
5.11 int length() const {return 0;}
5.12 @@ -86,13 +86,13 @@
5.13 ///
5.14 /// Returns node iterator pointing to the target node of the
5.15 /// given edge iterator.
5.16 - NodeIt target(const EdgeIt& e) const {return INVALID;}
5.17 + NodeIt target(const EdgeIt&) const {return INVALID;}
5.18
5.19 /// \brief The source of an edge.
5.20 ///
5.21 /// Returns node iterator pointing to the source node of the
5.22 /// given edge iterator.
5.23 - NodeIt source(const EdgeIt& e) const {return INVALID;}
5.24 + NodeIt source(const EdgeIt&) const {return INVALID;}
5.25
5.26
5.27 /* Iterator classes */
5.28 @@ -112,7 +112,7 @@
5.29 /// Invalid constructor
5.30 EdgeIt(Invalid) {}
5.31 /// Constructor with starting point
5.32 - EdgeIt(const Path &_p) {}
5.33 + EdgeIt(const Path &) {}
5.34
5.35 operator GraphEdge () const {}
5.36
5.37 @@ -120,9 +120,9 @@
5.38 EdgeIt& operator++() {return *this;}
5.39
5.40 /// Comparison operator
5.41 - bool operator==(const EdgeIt& e) const {return true;}
5.42 + bool operator==(const EdgeIt&) const {return true;}
5.43 /// Comparison operator
5.44 - bool operator!=(const EdgeIt& e) const {return true;}
5.45 + bool operator!=(const EdgeIt&) const {return true;}
5.46 // /// Comparison operator
5.47 // /// \todo It is not clear what is the "natural" ordering.
5.48 // bool operator<(const EdgeIt& e) const {}
5.49 @@ -144,7 +144,7 @@
5.50 /// Invalid constructor
5.51 NodeIt(Invalid) {}
5.52 /// Constructor with starting point
5.53 - NodeIt(const Path &_p) {}
5.54 + NodeIt(const Path &) {}
5.55
5.56 ///Conversion to Graph::Node
5.57 operator const GraphNode& () const {}
5.58 @@ -152,9 +152,9 @@
5.59 NodeIt& operator++() {return *this;}
5.60
5.61 /// Comparison operator
5.62 - bool operator==(const NodeIt& e) const {return true;}
5.63 + bool operator==(const NodeIt&) const {return true;}
5.64 /// Comparison operator
5.65 - bool operator!=(const NodeIt& e) const {return true;}
5.66 + bool operator!=(const NodeIt&) const {return true;}
5.67 // /// Comparison operator
5.68 // /// \todo It is not clear what is the "natural" ordering.
5.69 // bool operator<(const NodeIt& e) const {}
5.70 @@ -201,14 +201,14 @@
5.71 ///Push a new edge to the front of the path.
5.72 ///If the path is empty, you \em must call \ref setStartNode() before
5.73 ///the first use of \ref pushFront().
5.74 - void pushFront(const GraphEdge& e) {}
5.75 + void pushFront(const GraphEdge&) {}
5.76
5.77 ///Push a new edge to the back of the path
5.78
5.79 ///Push a new edge to the back of the path.
5.80 ///If the path is empty, you \em must call \ref setStartNode() before
5.81 ///the first use of \ref pushBack().
5.82 - void pushBack(const GraphEdge& e) {}
5.83 + void pushBack(const GraphEdge&) {}
5.84
5.85 ///Commit the changes to the path.
5.86 void commit() {}
5.87 @@ -218,13 +218,13 @@
5.88 ///If you know a reasonable upper bound on the number of the edges
5.89 ///to add to the front of the path,
5.90 ///using this function you may speed up the building.
5.91 - void reserveFront(size_t r) {}
5.92 + void reserveFront(size_t) {}
5.93 ///Reserve (back) storage for the builder in advance.
5.94
5.95 ///If you know a reasonable upper bound on the number of the edges
5.96 ///to add to the back of the path,
5.97 ///using this function you may speed up the building.
5.98 - void reserveBack(size_t r) {}
5.99 + void reserveBack(size_t) {}
5.100 };
5.101 };
5.102
6.1 --- a/src/lemon/concept/undir_graph.h Mon Apr 18 14:18:12 2005 +0000
6.2 +++ b/src/lemon/concept/undir_graph.h Mon Apr 18 14:59:24 2005 +0000
6.3 @@ -46,7 +46,7 @@
6.4 UndirGraphEdge() {}
6.5
6.6 /// \e
6.7 - UndirGraphEdge(const UndirGraphEdge&) {}
6.8 + UndirGraphEdge(const UndirGraphEdge& e) : UndirGraph::UndirEdge(e) {}
6.9
6.10 /// \e
6.11 UndirGraphEdge(Invalid) {}
6.12 @@ -469,13 +469,13 @@
6.13 /// Base node of the iterator
6.14 ///
6.15 /// Returns the base node of the iterator
6.16 - Node baseNode(IncEdgeIt e) const {
6.17 + Node baseNode(IncEdgeIt) const {
6.18 return INVALID;
6.19 }
6.20 /// Running node of the iterator
6.21 ///
6.22 /// Returns the running node of the iterator
6.23 - Node runningNode(IncEdgeIt e) const {
6.24 + Node runningNode(IncEdgeIt) const {
6.25 return INVALID;
6.26 }
6.27
7.1 --- a/src/lemon/dfs.h Mon Apr 18 14:18:12 2005 +0000
7.2 +++ b/src/lemon/dfs.h Mon Apr 18 14:59:24 2005 +0000
7.3 @@ -86,7 +86,7 @@
7.4 ///This function instantiates a \ref ProcessedMap.
7.5 ///\param G is the graph, to which
7.6 ///we would like to define the \ref ProcessedMap
7.7 - static ProcessedMap *createProcessedMap(const GR &G)
7.8 + static ProcessedMap *createProcessedMap(const GR &)
7.9 {
7.10 return new ProcessedMap();
7.11 }
7.12 @@ -776,7 +776,7 @@
7.13 ///This function instantiates a \ref PredMap.
7.14 ///\param G is the graph, to which we would like to define the PredMap.
7.15 ///\todo The graph alone may be insufficient to initialize
7.16 - static PredMap *createPredMap(const GR &G)
7.17 + static PredMap *createPredMap(const GR &)
7.18 {
7.19 return new PredMap();
7.20 }
7.21 @@ -809,7 +809,7 @@
7.22 ///This function instantiates a \ref ProcessedMap.
7.23 ///\param G is the graph, to which
7.24 ///we would like to define the \ref ProcessedMap
7.25 - static ProcessedMap *createProcessedMap(const GR &G)
7.26 + static ProcessedMap *createProcessedMap(const GR &)
7.27 {
7.28 return new ProcessedMap();
7.29 }
7.30 @@ -838,7 +838,7 @@
7.31
7.32 ///This function instantiates a \ref DistMap.
7.33 ///\param G is the graph, to which we would like to define the \ref DistMap
7.34 - static DistMap *createDistMap(const GR &G)
7.35 + static DistMap *createDistMap(const GR &)
7.36 {
7.37 return new DistMap();
7.38 }
7.39 @@ -994,7 +994,7 @@
7.40 template<class T>
7.41 struct DefPredMapBase : public Base {
7.42 typedef T PredMap;
7.43 - static PredMap *createPredMap(const Graph &G) { return 0; };
7.44 + static PredMap *createPredMap(const Graph &) { return 0; };
7.45 DefPredMapBase(const TR &b) : TR(b) {}
7.46 };
7.47
7.48 @@ -1015,7 +1015,7 @@
7.49 template<class T>
7.50 struct DefReachedMapBase : public Base {
7.51 typedef T ReachedMap;
7.52 - static ReachedMap *createReachedMap(const Graph &G) { return 0; };
7.53 + static ReachedMap *createReachedMap(const Graph &) { return 0; };
7.54 DefReachedMapBase(const TR &b) : TR(b) {}
7.55 };
7.56
7.57 @@ -1036,7 +1036,7 @@
7.58 template<class T>
7.59 struct DefProcessedMapBase : public Base {
7.60 typedef T ProcessedMap;
7.61 - static ProcessedMap *createProcessedMap(const Graph &G) { return 0; };
7.62 + static ProcessedMap *createProcessedMap(const Graph &) { return 0; };
7.63 DefProcessedMapBase(const TR &b) : TR(b) {}
7.64 };
7.65
7.66 @@ -1077,7 +1077,7 @@
7.67 template<class T>
7.68 struct DefDistMapBase : public Base {
7.69 typedef T DistMap;
7.70 - static DistMap *createDistMap(const Graph &G) { return 0; };
7.71 + static DistMap *createDistMap(const Graph &) { return 0; };
7.72 DefDistMapBase(const TR &b) : TR(b) {}
7.73 };
7.74
8.1 --- a/src/lemon/dijkstra.h Mon Apr 18 14:18:12 2005 +0000
8.2 +++ b/src/lemon/dijkstra.h Mon Apr 18 14:59:24 2005 +0000
8.3 @@ -787,7 +787,7 @@
8.4 ///This function instantiates a \ref PredMap.
8.5 ///\param G is the graph, to which we would like to define the PredMap.
8.6 ///\todo The graph alone may be insufficient for the initialization
8.7 - static PredMap *createPredMap(const GR &G)
8.8 + static PredMap *createPredMap(const GR &)
8.9 {
8.10 return new PredMap();
8.11 }
8.12 @@ -805,7 +805,7 @@
8.13 ///This function instantiates a \ref ProcessedMap.
8.14 ///\param G is the graph, to which
8.15 ///we would like to define the \ref ProcessedMap
8.16 - static ProcessedMap *createProcessedMap(const GR &G)
8.17 + static ProcessedMap *createProcessedMap(const GR &)
8.18 {
8.19 return new ProcessedMap();
8.20 }
8.21 @@ -819,7 +819,7 @@
8.22
8.23 ///This function instantiates a \ref DistMap.
8.24 ///\param G is the graph, to which we would like to define the \ref DistMap
8.25 - static DistMap *createDistMap(const GR &G)
8.26 + static DistMap *createDistMap(const GR &)
8.27 {
8.28 return new DistMap();
8.29 }
8.30 @@ -974,7 +974,7 @@
8.31 template<class T>
8.32 struct DefPredMapBase : public Base {
8.33 typedef T PredMap;
8.34 - static PredMap *createPredMap(const Graph &G) { return 0; };
8.35 + static PredMap *createPredMap(const Graph &) { return 0; };
8.36 DefPredMapBase(const TR &b) : TR(b) {}
8.37 };
8.38
8.39 @@ -1015,7 +1015,7 @@
8.40 template<class T>
8.41 struct DefDistMapBase : public Base {
8.42 typedef T DistMap;
8.43 - static DistMap *createDistMap(const Graph &G) { return 0; };
8.44 + static DistMap *createDistMap(const Graph &) { return 0; };
8.45 DefDistMapBase(const TR &b) : TR(b) {}
8.46 };
8.47
9.1 --- a/src/lemon/graph_to_eps.h Mon Apr 18 14:18:12 2005 +0000
9.2 +++ b/src/lemon/graph_to_eps.h Mon Apr 18 14:59:24 2005 +0000
9.3 @@ -363,10 +363,10 @@
9.4 edgeLess(const Graph &_g) : g(_g) {}
9.5 bool operator()(Edge a,Edge b) const
9.6 {
9.7 - Node ai=min(g.source(a),g.target(a));
9.8 - Node aa=max(g.source(a),g.target(a));
9.9 - Node bi=min(g.source(b),g.target(b));
9.10 - Node ba=max(g.source(b),g.target(b));
9.11 + Node ai=std::min(g.source(a),g.target(a));
9.12 + Node aa=std::max(g.source(a),g.target(a));
9.13 + Node bi=std::min(g.source(b),g.target(b));
9.14 + Node ba=std::max(g.source(b),g.target(b));
9.15 return ai<bi ||
9.16 (ai==bi && (aa < ba ||
9.17 (aa==ba && ai==g.source(a) && bi==g.target(b))));
10.1 --- a/src/test/undir_graph_test.cc Mon Apr 18 14:18:12 2005 +0000
10.2 +++ b/src/test/undir_graph_test.cc Mon Apr 18 14:59:24 2005 +0000
10.3 @@ -56,26 +56,26 @@
10.4 typedef typename Graph::UndirEdgeIt UEdgeIt;
10.5 typedef typename Graph::EdgeIt EdgeIt;
10.6
10.7 - cout << "Nodes" << endl;
10.8 + std::cout << "Nodes" << std::endl;
10.9 int i=0;
10.10 for(NodeIt it(g); it!=INVALID; ++it, ++i) {
10.11 - cout << " " << i << ": " << g.id(it) << endl;
10.12 + std::cout << " " << i << ": " << g.id(it) << std::endl;
10.13 }
10.14
10.15 - cout << "UndirEdge" << endl;
10.16 + std::cout << "UndirEdge" << std::endl;
10.17 i=0;
10.18 for(UEdgeIt it(g); it!=INVALID; ++it, ++i) {
10.19 - cout << " " << i << ": " << g.id(it)
10.20 + std::cout << " " << i << ": " << g.id(it)
10.21 << " (" << g.id(g.source(it)) << ", " << g.id(g.target(it))
10.22 - << ")" << endl;
10.23 + << ")" << std::endl;
10.24 }
10.25
10.26 - cout << "Edge" << endl;
10.27 + std::cout << "Edge" << std::endl;
10.28 i=0;
10.29 for(EdgeIt it(g); it!=INVALID; ++it, ++i) {
10.30 - cout << " " << i << ": " << g.id(it)
10.31 + std::cout << " " << i << ": " << g.id(it)
10.32 << " (" << g.id(g.source(it)) << ", " << g.id(g.target(it))
10.33 - << ")" << endl;
10.34 + << ")" << std::endl;
10.35 }
10.36
10.37 }