Changeset 1060:7a24bb2e7480 in lemon-0.x

Timestamp:

01/07/05 19:53:02 (18 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1456

Message:

Nasty bug in undir_graph_extender.h

Location:

src

Files:

• lemon/undir_graph_extender.h (modified) (2 diffs)
• work/jacint/bug.cc (modified) (5 diffs)

src/lemon/undir_graph_extender.h

@@ -141 +141 @@
     template <typename E>
     void _dirFirstOut(E &e, const Node &n) const {
+      Parent::firstIn(e,n);
+      if( UndirEdge(e) != INVALID ) {
+        e.forward = false;
+      }
+      else {
+        Parent::firstOut(e,n);
+        e.forward = true;
+      }
+    }
+    template <typename E>
+    void _dirFirstIn(E &e, const Node &n) const {
       Parent::firstOut(e,n);
       if( UndirEdge(e) != INVALID ) {
+        e.forward = false;
+      }
+      else {
+        Parent::firstIn(e,n);
         e.forward = true;
       }
-      else {
-        Parent::firstIn(e,n);
-        e.forward = false;
-      }
-    }
-    template <typename E>
-    void _dirFirstIn(E &e, const Node &n) const {
-      Parent::firstIn(e,n);
-      if( UndirEdge(e) != INVALID ) {
-        e.forward = true;
-      }
-      else {
-        Parent::firstOut(e,n);
-        e.forward = false;
-      }
     }
 
     template <typename E>
     void _dirNextOut(E &e) const {
-      if( e.forward ) {
+      if( ! e.forward ) {
+        Node n = Parent::target(e);
+        Parent::nextIn(e);
+        if( UndirEdge(e) == INVALID ) {
+          Parent::firstOut(e, n);
+          e.forward = true;
+        }
+      }
+      else {
+        Parent::nextOut(e);
+      }
+    }
+    template <typename E>
+    void _dirNextIn(E &e) const {
+      if( ! e.forward ) {
+        Node n = Parent::source(e);
         Parent::nextOut(e);
         if( UndirEdge(e) == INVALID ) {
-          Parent::firstIn(e, Parent::source(e));
-          e.forward = false;
+          Parent::firstIn(e, n);
+          e.forward = true;
         }
       }
       else {
         Parent::nextIn(e);
-      }
-    }
-    template <typename E>
-    void _dirNextIn(E &e) const {
-      if( e.forward ) {
-        Parent::nextIn(e);
-        if( UndirEdge(e) == INVALID ) {
-          Parent::firstOut(e, Parent::target(e));
-          e.forward = false;
-        }
-      }
-      else {
-        Parent::nextOut(e);
       }
     }
@@ -227 +229 @@
 
 
-    int maxId(Node n) const {
+    int maxId(Node) const {
       return Parent::maxId(Node());
     }

src/work/jacint/bug.cc

@@ -1 @@
-//lasd megjegyzes a 49-es sorban
 #include <iostream>
 #include <queue>
@@ -7 +6 @@
 #include <lemon/invalid.h>
 #include <lemon/list_graph.h>
+#include <lemon/smart_graph.h>
 #include <matching.h>
 
 using namespace lemon;
+using namespace std;
 
-int main(int, char **) {
 
-  typedef UndirListGraph Graph;
+int main() {
+
+  typedef UndirSmartGraph Graph;
 
   typedef Graph::Edge Edge;
@@ -20 +22 @@
   typedef Graph::NodeIt NodeIt;
   typedef Graph::Node Node;
+
+  typedef Graph::OutEdgeIt OutEdgeIt;
    
   Graph G;
 
-  G.clear();
+  // G.clear();
   std::vector<Graph::Node> nodes;
   for (int i=0; i<5; ++i)
@@ -36 +40 @@
 
   for(UndirEdgeIt e(G); e!=INVALID; ++e) {
-    std::cout<<G.id(e)<<" : "<<G.id(G.source(e))<<" " <<G.id(G.target(e))<<std::endl;
+    std::cout<<G.id(e)<<" : "<<G.id(G.source(e))
+             <<" " <<G.id(G.target(e))<<std::endl;
   }
 
@@ -45 +50 @@
   }
 
+  cout << "Dev Out edges from node " << G.id(nodes[1])<<std::endl;
+  Edge f;
+  for(G.firstOut(f, nodes[1]); f!=INVALID; G.nextOut(f)) {
+    cout<<"edge " << G.id(f) << " goes"
+             <<" from "<< G.id(G.source(f)) 
+             << " to " << G.id(G.target(f))<<std::endl;
+  }
+
+  cout << "Out edges from node " << G.id(nodes[1])<<std::endl;
+  for( OutEdgeIt f(G,nodes[1]); f!=INVALID; ++f ) {
+    cout<<"edge " << G.id(f) << " goes"
+             <<" from "<< G.id(G.source(f)) 
+             << " to " << G.id(G.target(f))<<std::endl;
+  }
+
   std::cout<<"Edges of node " << G.id(nodes[1])<<std::endl;
+  for( IncEdgeIt f(G,nodes[1]); f!=INVALID; ++f ) {
+    cout<<"edge " << G.id(f) << " goes"
+             <<" from "<< G.id(G.source(f)) 
+             << " to " << G.id(G.target(f))<<std::endl;
+  }
 
-  for( IncEdgeIt f(G,nodes[1]); f!=INVALID; ++f ) {
-    std::cout<<"edge " << G.id(f)<< " goes to " << G.id(G.target(f))<<std::endl;
-  }//ez a ket for ciklus meg lefut - bar hibas eleken iteral -, de a matching.h-s mar segfaultol
+  //return 0;
+
+  //ez a ket for ciklus meg lefut - bar hibas eleken iteral -, de a
+  //matching.h-s mar segfaultol
 
   for( IncEdgeIt f(G,nodes[1]); f!=INVALID; ++f ) {