LEMON/LEMON-official Changeset - r472:91fcb8ed4cdc

Repositories » LEMON » LEMON-official

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

Changeset - r472:91fcb8ed4cdc

« 471:9d9990

473:14bb88 »

r472:91fcb8ed4cdc

Fri, 12 Dec 2008 22:59:17

[Not Reviewed]

0 comments (0 inline)

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

Various bug fixes and code improvements in adaptors.h (#67) - Fix UndirectorBase::nodeNum(). - Fix UndirectorBase::findEdge(). - Fix OrienterBase::addArc(). - Fix OrienterBase::findArc(). - Improve SplitNodesBase::findArc(). - Add missing notifier() function in UndirectorBase. - Add missing typedefs for maps (conform to the ReferenceMap concept). - Add some useful typedefs for graph adaptors.

0 1 0

default

1 file changed with 71 insertions and 46 deletions:

lemon/adaptors.h

↑ Collapse diff ↑

lemon/adaptors.h

Show inline comments

@@ -819,4 +819,4 @@
 		  template <typename _Graph, typename NodeFilterMap,
 		            typename EdgeFilterMap, bool _checked = true>
 		  template <typename _Graph, typename _NodeFilterMap,
 		            typename _EdgeFilterMap, bool _checked = true>
 		  class SubGraphBase : public GraphAdaptorBase<_Graph> {
@@ -824,2 +824,5 @@
 		    typedef _Graph Graph;
 		    typedef _NodeFilterMap NodeFilterMap;
 		    typedef _EdgeFilterMap EdgeFilterMap;
 		    typedef SubGraphBase Adaptor;
@@ -1050,4 +1053,4 @@
 		  template <typename _Graph, typename NodeFilterMap, typename EdgeFilterMap>
 		  class SubGraphBase<_Graph, NodeFilterMap, EdgeFilterMap, false>
 		  template <typename _Graph, typename _NodeFilterMap, typename _EdgeFilterMap>
 		  class SubGraphBase<_Graph, _NodeFilterMap, _EdgeFilterMap, false>
 		    : public GraphAdaptorBase<_Graph> {
@@ -1055,2 +1058,5 @@
 		    typedef _Graph Graph;
 		    typedef _NodeFilterMap NodeFilterMap;
 		    typedef _EdgeFilterMap EdgeFilterMap;
 		    typedef SubGraphBase Adaptor;
@@ -1859,3 +1865,3 @@
 		    typedef NodeNumTagIndicator<Digraph> NodeNumTag;
-		    int nodeNum() const { return 2 * _digraph->arcNum(); }
+		    int nodeNum() const { return _digraph->nodeNum(); }
@@ -1894,3 +1900,3 @@
 		          if (arc != INVALID) return arc;
-		        } else if (_digraph->s(p) == s) {
+		        } else if (_digraph->source(p) == s) {
 		          Edge arc = _digraph->findArc(s, t, p);
@@ -1923,2 +1929,6 @@
 		      typedef Arc Key;
 		      typedef typename MapTraits<MapImpl>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<MapImpl>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<MapImpl>::ConstReturnValue ConstReference;
 		      typedef typename MapTraits<MapImpl>::ReturnValue Reference;
@@ -1938,4 +1948,3 @@
 		      typename MapTraits<MapImpl>::ConstReturnValue
 		      operator[](const Arc& a) const {
 		      ConstReturnValue operator[](const Arc& a) const {
 		        if (direction(a)) {
@@ -1947,4 +1956,3 @@
 		      typename MapTraits<MapImpl>::ReturnValue
 		      operator[](const Arc& a) {
 		      ReturnValue operator[](const Arc& a) {
 		        if (direction(a)) {
@@ -1998,3 +2006,3 @@
 		      ArcMap(const Adaptor& adaptor)
+		      explicit ArcMap(const Adaptor& adaptor)
 		        : Parent(adaptor) {}
@@ -2045,2 +2053,5 @@
 		    typedef typename ItemSetTraits<Digraph, Edge>::ItemNotifier EdgeNotifier;
 		    EdgeNotifier& notifier(Edge) const { return _digraph->notifier(Edge()); }
 		  protected:
@@ -2102,2 +2113,7 @@
 		      typedef typename MapTraits<ForwardMap>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<ForwardMap>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<ForwardMap>::ReturnValue Reference;
 		      typedef typename MapTraits<ForwardMap>::ConstReturnValue ConstReference;
 		      /// \brief Constructor
@@ -2123,4 +2139,3 @@
 		      /// Returns the value associated with a key.
 		      typename MapTraits<ForwardMap>::ConstReturnValue
 		      operator[](const Key& e) const {
 		      ConstReturnValue operator[](const Key& e) const {
 		        if (Parent::direction(e)) {
@@ -2135,4 +2150,3 @@
 		      /// Returns the value associated with a key.
 		      typename MapTraits<ForwardMap>::ReturnValue
 		      operator[](const Key& e) {
 		      ReturnValue operator[](const Key& e) {
 		        if (Parent::direction(e)) {
@@ -2248,14 +2262,5 @@
 		                const Arc& prev = INVALID) const {
 		      Arc arc = prev;
 		      bool d = arc == INVALID ? true : (*_direction)[arc];
-		      if (d) {
+		      Arc arc = _graph->findEdge(u, v, prev);
 		      while (arc != INVALID && source(arc) != u) {
 		        arc = _graph->findEdge(u, v, arc);
 		        while (arc != INVALID && !(*_direction)[arc]) {
 		          _graph->findEdge(u, v, arc);
+		        }
 		        if (arc != INVALID) return arc;
+		      }
 		      _graph->findEdge(v, u, arc);
 		      while (arc != INVALID && (*_direction)[arc]) {
 		        _graph->findEdge(u, v, arc);
+		      }
@@ -2269,4 +2274,4 @@
 		    Arc addArc(const Node& u, const Node& v) {
 		      Arc arc = _graph->addArc(u, v);
 		      _direction->set(arc, _graph->source(arc) == u);
 		      Arc arc = _graph->addEdge(u, v);
 		      _direction->set(arc, _graph->u(arc) == u);
 		      return arc;
@@ -2914,13 +2919,10 @@
 		                const Arc& prev = INVALID) const {
 		      if (inNode(u)) {
 		        if (outNode(v)) {
 		          if (static_cast<const DigraphNode&>(u) ==
 		              static_cast<const DigraphNode&>(v) && prev == INVALID) {
 		            return Arc(u);
+		          }
 		      if (inNode(u) && outNode(v)) {
 		        if (static_cast<const DigraphNode&>(u) ==
 		            static_cast<const DigraphNode&>(v) && prev == INVALID) {
 		          return Arc(u);
+		        }
 		      } else {
 		        if (inNode(v)) {
 		          return Arc(::lemon::findArc(*_digraph, u, v, prev));
+		        }
+		      }
 		      else if (outNode(u) && inNode(v)) {
 		        return Arc(::lemon::findArc(*_digraph, u, v, prev));
+		      }
@@ -2938,2 +2940,7 @@
 		      typedef _Value Value;
 		      typedef typename MapTraits<NodeImpl>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<NodeImpl>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<NodeImpl>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<NodeImpl>::ReturnValue Reference;
 		      typedef typename MapTraits<NodeImpl>::ConstReturnValue ConstReference;
@@ -2950,4 +2957,3 @@
 		      typename MapTraits<NodeImpl>::ReturnValue
 		      operator[](const Node& key) {
 		      ReturnValue operator[](const Node& key) {
 		        if (Adaptor::inNode(key)) { return _in_map[key]; }
@@ -2956,4 +2962,3 @@
 		      typename MapTraits<NodeImpl>::ConstReturnValue
 		      operator[](const Node& key) const {
 		      ConstReturnValue operator[](const Node& key) const {
 		        if (Adaptor::inNode(key)) { return _in_map[key]; }
@@ -2974,2 +2979,7 @@
 		      typedef _Value Value;
 		      typedef typename MapTraits<ArcImpl>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<ArcImpl>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<ArcImpl>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<ArcImpl>::ReturnValue Reference;
 		      typedef typename MapTraits<ArcImpl>::ConstReturnValue ConstReference;
@@ -2989,4 +2999,3 @@
 		      typename MapTraits<ArcImpl>::ReturnValue
 		      operator[](const Arc& key) {
 		      ReturnValue operator[](const Arc& key) {
 		        if (Adaptor::origArc(key)) {
@@ -2998,4 +3007,3 @@
 		      typename MapTraits<ArcImpl>::ConstReturnValue
 		      operator[](const Arc& key) const {
 		      ConstReturnValue operator[](const Arc& key) const {
 		        if (Adaptor::origArc(key)) {
@@ -3186,2 +3194,8 @@
 		      typedef typename MapTraits<InNodeMap>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<InNodeMap>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<InNodeMap>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<InNodeMap>::ReturnValue Reference;
 		      typedef typename MapTraits<InNodeMap>::ConstReturnValue ConstReference;
 		      /// \brief Constructor
@@ -3272,2 +3286,13 @@
 		      typedef typename MapTraits<DigraphArcMap>::ReferenceMapTag
 		        ReferenceMapTag;
 		      typedef typename MapTraits<DigraphArcMap>::ReturnValue
 		        ReturnValue;
 		      typedef typename MapTraits<DigraphArcMap>::ConstReturnValue
 		        ConstReturnValue;
 		      typedef typename MapTraits<DigraphArcMap>::ReturnValue
 		        Reference;
 		      typedef typename MapTraits<DigraphArcMap>::ConstReturnValue
 		        ConstReference;
 		      /// \brief Constructor

0 comments (0 inline)

RhodeCode

Login to your account