Changeset 239:3f76d1aa9d37 in lemon-0.x for src

Timestamp:

03/23/04 14:47:31 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

File:

• src/work/marci/graph_wrapper.h (modified) (5 diffs)

src/work/marci/graph_wrapper.h

@@ -541 +541 @@
         if (out_or_in) return(out); else return(in);
       }
+//FIXME
+//2 edges are equal if they "refer" to the same physical edge 
+//is it good?
       friend bool operator==(const Edge& u, const Edge& v) { 
         if (v.out_or_in) 
-          return (u.out_or_in && u.out==v.out);
+          if (u.out_or_in) return (u.out==v.out); else return (u.out==v.in);
+        //return (u.out_or_in && u.out==v.out);
         else
-          return (!u.out_or_in && u.in==v.in);
+          if (u.out_or_in) return (u.out==v.in); else return (u.in==v.in);
+        //return (!u.out_or_in && u.in==v.in);
       } 
       friend bool operator!=(const Edge& u, const Edge& v) { 
         if (v.out_or_in) 
-          return (!u.out_or_in || u.out!=v.out);
+          if (u.out_or_in) return (u.out!=v.out); else return (u.out!=v.in);
+        //return (!u.out_or_in || u.out!=v.out);
         else
-          return (u.out_or_in || u.in!=v.in);
+          if (u.out_or_in) return (u.out!=v.in); else return (u.in!=v.in);
+        //return (u.out_or_in || u.in!=v.in);
       } 
     };
@@ -562 +569 @@
       OutEdgeIt(const UndirGraphWrapper<GraphWrapper>& _G, const Node& n) 
         : Edge() { 
-        out_or_in=true;
-        _G.gw.first(out, n);
-        if (!(_G.gw.valid(out))) {
-          out_or_in=false;
-          _G.gw.first(in, n);
-        }
+        out_or_in=true; _G.gw.first(out, n);
+        if (!(_G.gw.valid(out))) { out_or_in=false; _G.gw.first(in, n); }
       }
     };
@@ -594 +597 @@
 
     OutEdgeIt& first(OutEdgeIt& e, const Node& n) const {
-      e.out_or_in=true;
-      gw.first(e.out, n);
-      if (!(gw.valid(e.out))) {
-        e.out_or_in=false;
-        gw.first(e.in, n);
-      }
+      e.out_or_in=true; gw.first(e.out, n);
+      if (!(gw.valid(e.out))) { e.out_or_in=false; gw.first(e.in, n); }
       return e;
     }
@@ -623 +622 @@
         Node n=gw.tail(e.out);
         gw.next(e.out);
-        if (!gw.valid(e.out)) {
-          e.out_or_in=false;
-          gw.first(e.in, n);
-        }
+        if (!gw.valid(e.out)) { e.out_or_in=false; gw.first(e.in, n); }
       } else {
         gw.next(e.in);
@@ -644 +640 @@
 
     template<typename I> I& next(I &i) const { return gw.next(i); }    
-    
-    template<typename I> I getNext(const I& i) const { 
-      return gw.getNext(i); }
+    template<typename I> I getNext(const I& i) const { return gw.getNext(i); }
 
     template< typename It > It first() const {