LEMON/LEMON-official Changeset - r974:8af504c71ac4

Repositories » LEMON » LEMON-official

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

Changeset - r974:8af504c71ac4

« 920:ece1f8
« 959:1248d2

977:290f3c »

r974:8af504c71ac4

Tue, 06 Apr 2010 06:43:04

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge bugfix #364 to branch 1.1

0 2 0

merge 1.1

1 file changed with 4 insertions and 0 deletions:

lemon/bits/edge_set_extender.h

lemon/bits/graph_adaptor_extender.h

↑ Collapse diff ↑

lemon/bits/edge_set_extender.h

Show inline comments

@@ -259,48 +259,50 @@
    }

    ArcSetExtender() {
      arc_notifier.setContainer(*this);
    }

    ~ArcSetExtender() {
      arc_notifier.clear();
    }

  };


  // \ingroup digraphbits
  //
  // \brief Extender for the EdgeSets
  template <typename Base>
  class EdgeSetExtender : public Base {
    typedef Base Parent;

  public:

    typedef EdgeSetExtender Graph;

    typedef True UndirectedTag;

    typedef typename Parent::Node Node;
    typedef typename Parent::Arc Arc;
    typedef typename Parent::Edge Edge;

    int maxId(Node) const {
      return Parent::maxNodeId();
    }

    int maxId(Arc) const {
      return Parent::maxArcId();
    }

    int maxId(Edge) const {
      return Parent::maxEdgeId();
    }

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

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


lemon/bits/graph_adaptor_extender.h

Show inline comments

@@ -160,48 +160,50 @@
      return Parent::source(e);
    }
    Node runningNode(const OutArcIt &e) const {
      return Parent::target(e);
    }

    Node baseNode(const InArcIt &e) const {
      return Parent::target(e);
    }
    Node runningNode(const InArcIt &e) const {
      return Parent::source(e);
    }

  };

  template <typename _Graph>
  class GraphAdaptorExtender : public _Graph {
    typedef _Graph Parent;

  public:

    typedef _Graph Graph;
    typedef GraphAdaptorExtender Adaptor;

    typedef True UndirectedTag;

    typedef typename Parent::Node Node;
    typedef typename Parent::Arc Arc;
    typedef typename Parent::Edge Edge;

    // Graph extension

    int maxId(Node) const {
      return Parent::maxNodeId();
    }

    int maxId(Arc) const {
      return Parent::maxArcId();
    }

    int maxId(Edge) const {
      return Parent::maxEdgeId();
    }

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

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

0 comments (0 inline)

...	...	@@ -259,48 +259,50 @@
259	259	}
260	260
261	261	ArcSetExtender() {
262	262	arc_notifier.setContainer(*this);
263	263	}
264	264
265	265	~ArcSetExtender() {
266	266	arc_notifier.clear();
267	267	}
268	268
269	269	};
270	270
271	271
272	272	// \ingroup digraphbits
273	273	//
274	274	// \brief Extender for the EdgeSets
275	275	template <typename Base>
276	276	class EdgeSetExtender : public Base {
277	277	typedef Base Parent;
278	278
279	279	public:
280	280
281	281	typedef EdgeSetExtender Graph;
282	282
	283	typedef True UndirectedTag;
	284
283	285	typedef typename Parent::Node Node;
284	286	typedef typename Parent::Arc Arc;
285	287	typedef typename Parent::Edge Edge;
286	288
287	289	int maxId(Node) const {
288	290	return Parent::maxNodeId();
289	291	}
290	292
291	293	int maxId(Arc) const {
292	294	return Parent::maxArcId();
293	295	}
294	296
295	297	int maxId(Edge) const {
296	298	return Parent::maxEdgeId();
297	299	}
298	300
299	301	Node fromId(int id, Node) const {
300	302	return Parent::nodeFromId(id);
301	303	}
302	304
303	305	Arc fromId(int id, Arc) const {
304	306	return Parent::arcFromId(id);
305	307	}
306	308

...	...	@@ -160,48 +160,50 @@
160	160	return Parent::source(e);
161	161	}
162	162	Node runningNode(const OutArcIt &e) const {
163	163	return Parent::target(e);
164	164	}
165	165
166	166	Node baseNode(const InArcIt &e) const {
167	167	return Parent::target(e);
168	168	}
169	169	Node runningNode(const InArcIt &e) const {
170	170	return Parent::source(e);
171	171	}
172	172
173	173	};
174	174
175	175	template <typename _Graph>
176	176	class GraphAdaptorExtender : public _Graph {
177	177	typedef _Graph Parent;
178	178
179	179	public:
180	180
181	181	typedef _Graph Graph;
182	182	typedef GraphAdaptorExtender Adaptor;
183	183
	184	typedef True UndirectedTag;
	185
184	186	typedef typename Parent::Node Node;
185	187	typedef typename Parent::Arc Arc;
186	188	typedef typename Parent::Edge Edge;
187	189
188	190	// Graph extension
189	191
190	192	int maxId(Node) const {
191	193	return Parent::maxNodeId();
192	194	}
193	195
194	196	int maxId(Arc) const {
195	197	return Parent::maxArcId();
196	198	}
197	199
198	200	int maxId(Edge) const {
199	201	return Parent::maxEdgeId();
200	202	}
201	203
202	204	Node fromId(int id, Node) const {
203	205	return Parent::nodeFromId(id);
204	206	}
205	207
206	208	Arc fromId(int id, Arc) const {
207	209	return Parent::arcFromId(id);

RhodeCode

Login to your account