LEMON/LEMON-official Changeset - r825:a143f19f465b

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r825:a143f19f465b

« 823:eff1ca

826:c160bf »

r825:a143f19f465b

Tue, 29 Sep 2009 13:03:34

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Make some graph member functions static (#311, #68)

0 6 0

default

6 files changed with 25 insertions and 25 deletions:

lemon/bits/graph_extender.h

lemon/edge_set.h

lemon/full_graph.h

lemon/hypercube_graph.h

lemon/smart_graph.h

lemon/static_graph.h

↑ Collapse diff ↑

lemon/bits/graph_extender.h

Show inline comments

@@ -57,9 +57,9 @@
    }

    Node fromId(int id, Node) const {
    static Node fromId(int id, Node) {
      return Parent::nodeFromId(id);
    }

    Arc fromId(int id, Arc) const {
    static Arc fromId(int id, Arc) {
      return Parent::arcFromId(id);
    }
@@ -356,13 +356,13 @@
    }

    Node fromId(int id, Node) const {
    static Node fromId(int id, Node) {
      return Parent::nodeFromId(id);
    }

    Arc fromId(int id, Arc) const {
    static Arc fromId(int id, Arc) {
      return Parent::arcFromId(id);
    }

    Edge fromId(int id, Edge) const {
    static Edge fromId(int id, Edge) {
      return Parent::edgeFromId(id);
    }

lemon/edge_set.h

Show inline comments

@@ -868,5 +868,5 @@
    }

    void next(Arc& arc) const {
    static void next(Arc& arc) {
      --arc.id;
    }
@@ -1174,5 +1174,5 @@
    }

    void next(Arc& arc) const {
    static void next(Arc& arc) {
      --arc.id;
    }
@@ -1182,5 +1182,5 @@
    }

    void next(Edge& arc) const {
    static void next(Edge& arc) {
      --arc.id;
    }

lemon/full_graph.h

Show inline comments

@@ -52,5 +52,5 @@
 		    Node operator()(int ix) const { return Node(ix); }
-		    int index(const Node& node) const { return node._id; }
+		    static int index(const Node& node) { return node._id; }
 		    Arc arc(const Node& s, const Node& t) const {
@@ -210,5 +210,5 @@
 		    /// <tt>[0..nodeNum()-1]</tt>.
 		    /// \sa operator()
-		    int index(const Node& node) const { return Parent::index(node); }
+		    static int index(const Node& node) { return Parent::index(node); }
 		    /// \brief Returns the arc connecting the given nodes.
@@ -284,5 +284,5 @@
 		    Node operator()(int ix) const { return Node(ix); }
-		    int index(const Node& node) const { return node._id; }
+		    static int index(const Node& node) { return node._id; }
 		    Edge edge(const Node& u, const Node& v) const {
@@ -581,5 +581,5 @@
 		    /// <tt>[0..nodeNum()-1]</tt>.
 		    /// \sa operator()
-		    int index(const Node& node) const { return Parent::index(node); }
+		    static int index(const Node& node) { return Parent::index(node); }
 		    /// \brief Returns the arc connecting the given nodes.

lemon/hypercube_graph.h

Show inline comments

@@ -263,5 +263,5 @@
    }

    int index(Node node) const {
    static int index(Node node) {
      return node._id;
    }
@@ -338,5 +338,5 @@
    /// Gives back the index of the given node.
    /// The lower bits of the integer describes the node.
    int index(Node node) const {
    static int index(Node node) {
      return Parent::index(node);
    }

lemon/smart_graph.h

Show inline comments

@@ -509,5 +509,5 @@
    }

    void next(Node& node) const {
    static void next(Node& node) {
      --node._id;
    }
@@ -517,5 +517,5 @@
    }

    void next(Arc& arc) const {
    static void next(Arc& arc) {
      --arc._id;
    }
@@ -525,5 +525,5 @@
    }

    void next(Edge& arc) const {
    static void next(Edge& arc) {
      --arc._id;
    }

lemon/static_graph.h

Show inline comments

@@ -93,10 +93,10 @@
 		    void nextIn(Arc& e) const { e.id = arc_next_in[e.id]; }
 		    int id(const Node& n) const { return n.id; }
 		    Node nodeFromId(int id) const { return Node(id); }
 		    static int id(const Node& n) { return n.id; }
 		    static Node nodeFromId(int id) { return Node(id); }
 		    int maxNodeId() const { return node_num - 1; }
 		    int id(const Arc& e) const { return e.id; }
 		    Arc arcFromId(int id) const { return Arc(id); }
 		    static int id(const Arc& e) { return e.id; }
 		    static Arc arcFromId(int id) { return Arc(id); }
 		    int maxArcId() const { return arc_num - 1; }
@@ -269,5 +269,5 @@
 		    /// This function returns the node with the given index.
 		    /// \sa index()
-		    Node node(int ix) const { return Parent::nodeFromId(ix); }
+		    static Node node(int ix) { return Parent::nodeFromId(ix); }
 		    /// \brief The arc with the given index.
@@ -275,5 +275,5 @@
 		    /// This function returns the arc with the given index.
 		    /// \sa index()
-		    Arc arc(int ix) const { return Parent::arcFromId(ix); }
+		    static Arc arc(int ix) { return Parent::arcFromId(ix); }
 		    /// \brief The index of the given node.
@@ -281,5 +281,5 @@
 		    /// This function returns the index of the the given node.
 		    /// \sa node()
-		    int index(Node node) const { return Parent::id(node); }
+		    static int index(Node node) { return Parent::id(node); }
 		    /// \brief The index of the given arc.
@@ -287,5 +287,5 @@
 		    /// This function returns the index of the the given arc.
 		    /// \sa arc()
-		    int index(Arc arc) const { return Parent::id(arc); }
+		    static int index(Arc arc) { return Parent::id(arc); }
 		    /// \brief Number of nodes.

0 comments (0 inline)

...	...	@@ -57,9 +57,9 @@
57	57	}
58	58
59		Node fromId(int id, Node) ~~const~~ {
	59	static Node fromId(int id, Node) {
60	60	return Parent::nodeFromId(id);
61	61	}
62	62
63		Arc fromId(int id, Arc) ~~const~~ {
	63	static Arc fromId(int id, Arc) {
64	64	return Parent::arcFromId(id);
65	65	}
...	...	@@ -356,13 +356,13 @@
356	356	}
357	357
358		Node fromId(int id, Node) ~~const~~ {
	358	static Node fromId(int id, Node) {
359	359	return Parent::nodeFromId(id);
360	360	}
361	361
362		Arc fromId(int id, Arc) ~~const~~ {
	362	static Arc fromId(int id, Arc) {
363	363	return Parent::arcFromId(id);
364	364	}
365	365
366		Edge fromId(int id, Edge) ~~const~~ {
	366	static Edge fromId(int id, Edge) {
367	367	return Parent::edgeFromId(id);
368	368	}

...	...	@@ -868,5 +868,5 @@
868	868	}
869	869
870		void next(Arc& arc) ~~const~~ {
	870	static void next(Arc& arc) {
871	871	--arc.id;
872	872	}
...	...	@@ -1174,5 +1174,5 @@
1174	1174	}
1175	1175
1176		void next(Arc& arc) ~~const~~ {
	1176	static void next(Arc& arc) {
1177	1177	--arc.id;
1178	1178	}
...	...	@@ -1182,5 +1182,5 @@
1182	1182	}
1183	1183
1184		void next(Edge& arc) ~~const~~ {
	1184	static void next(Edge& arc) {
1185	1185	--arc.id;
1186	1186	}

...	...	@@ -263,5 +263,5 @@
263	263	}
264	264
265		int index(Node node) ~~const~~ {
	265	static int index(Node node) {
266	266	return node._id;
267	267	}
...	...	@@ -338,5 +338,5 @@
338	338	/// Gives back the index of the given node.
339	339	/// The lower bits of the integer describes the node.
340		int index(Node node) ~~const~~ {
	340	static int index(Node node) {
341	341	return Parent::index(node);
342	342	}

...	...	@@ -509,5 +509,5 @@
509	509	}
510	510
511		void next(Node& node) ~~const~~ {
	511	static void next(Node& node) {
512	512	--node._id;
513	513	}
...	...	@@ -517,5 +517,5 @@
517	517	}
518	518
519		void next(Arc& arc) ~~const~~ {
	519	static void next(Arc& arc) {
520	520	--arc._id;
521	521	}
...	...	@@ -525,5 +525,5 @@
525	525	}
526	526
527		void next(Edge& arc) ~~const~~ {
	527	static void next(Edge& arc) {
528	528	--arc._id;
529	529	}

RhodeCode

Login to your account