LEMON/LEMON-official Changeset - r238:79643f6e8c52

Repositories » LEMON » LEMON-official

Changeset - r238:79643f6e8c52

« 237:9c8efa

239:7b7e3f »

r238:79643f6e8c52

Tue, 29 Jul 2008 13:58:03

[Not Reviewed]

0 comments (0 inline)

deba@inf.elte.hu
deba@inf.elte.hu

Converting INVALID arc to INVALID edge

0 2 0

default

2 files changed with 6 insertions and 2 deletions:

lemon/list_graph.h

lemon/smart_graph.h

↑ Collapse diff ↑

lemon/list_graph.h

Show inline comments

@@ -833,25 +833,27 @@
 		      bool operator!=(const Edge& edge) const {return id != edge.id;}
 		      bool operator<(const Edge& edge) const {return id < edge.id;}
 		    };
 		    class Arc {
 		      friend class ListGraphBase;
 		    protected:
 		      int id;
 		      explicit Arc(int pid) { id = pid;}
 		    public:
-		      operator Edge() const { return edgeFromId(id / 2); }
 		      operator Edge() const {
 		        return id != -1 ? edgeFromId(id / 2) : INVALID;
+		      }
 		      Arc() {}
 		      Arc (Invalid) { id = -1; }
 		      bool operator==(const Arc& arc) const {return id == arc.id;}
 		      bool operator!=(const Arc& arc) const {return id != arc.id;}
 		      bool operator<(const Arc& arc) const {return id < arc.id;}
 		    };
 		    ListGraphBase()
 		      : nodes(), first_node(-1),

lemon/smart_graph.h

Show inline comments

@@ -456,25 +456,27 @@
 		      bool operator!=(const Edge& arc) const {return _id != arc._id;}
 		      bool operator<(const Edge& arc) const {return _id < arc._id;}
 		    };
 		    class Arc {
 		      friend class SmartGraphBase;
 		    protected:
 		      int _id;
 		      explicit Arc(int id) { _id = id;}
 		    public:
-		      operator Edge() const { return edgeFromId(_id / 2); }
 		      operator Edge() const {
 		        return _id != -1 ? edgeFromId(_id / 2) : INVALID;
+		      }
 		      Arc() {}
 		      Arc (Invalid) { _id = -1; }
 		      bool operator==(const Arc& arc) const {return _id == arc._id;}
 		      bool operator!=(const Arc& arc) const {return _id != arc._id;}
 		      bool operator<(const Arc& arc) const {return _id < arc._id;}
 		    };
 		    SmartGraphBase()
 		      : nodes(), arcs() {}

0 comments (0 inline)

RhodeCode