Changeset 174:44700ed9ffaa in lemon-0.x for src/work/alpar

Timestamp:

03/12/04 10:19:54 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

towards on ListGraph?, SmartGraph? compatibility

Location:

src/work/alpar

Files:

• emptygraph.h (modified) (11 diffs)
• smart_graph.h (modified) (5 diffs)

src/work/alpar/emptygraph.h

@@ -1 @@
-// -*-mode: c++; -*-
+// -*- c++ -*-
+#ifndef EMPTYGRAPH_H
+#define EMPTYGRAPH_H
 
 #include <invalid.h>
@@ -35 +37 @@
       Node() {}   //FIXME
       /// Initialize the iterator to be invalid
-      Node(Invalid) {};
+      Node(Invalid) {}
       //Node(const Node &) {} 
       bool operator==(Node n) const { return true; } //FIXME
@@ -48 +50 @@
       NodeIt() {} //FIXME
       /// Initialize the iterator to be invalid
-      NodeIt(Invalid) {};
+      NodeIt(Invalid) {}
       /// Sets the iterator to the first node of \c G.
       NodeIt(const EmptyGraph &G) {}
@@ -62 +64 @@
       Edge() {}   //FIXME
       /// Initialize the iterator to be invalid
-      Edge(Invalid) {};
+      Edge(Invalid) {}
       //Edge(const Edge &) {} 
       bool operator==(Edge n) const { return true; } //FIXME
@@ -76 +78 @@
       OutEdgeIt() {}
       /// Initialize the iterator to be invalid
-      OutEdgeIt(Invalid) {};
+      OutEdgeIt(Invalid) {}
       /// This constructor sets the iterator to first outgoing edge.
     
@@ -92 +94 @@
       InEdgeIt() {}
       /// Initialize the iterator to be invalid
-      InEdgeIt(Invalid) {};
+      InEdgeIt(Invalid) {}
       InEdgeIt(const EmptyGraph &, Node) {}    
     };
@@ -102 +104 @@
       EdgeIt() {}
       /// Initialize the iterator to be invalid
-      EdgeIt(Invalid) {};
+      EdgeIt(Invalid) {}
       EdgeIt(const EmptyGraph &) {}
     };
@@ -150 +152 @@
 
     /// Checks if a node iterator is valid
-    bool valid(const Node) const { return true;};
+    bool valid(const Node) const { return true;}
     /// Checks if an edge iterator is valid
-    bool valid(const Edge) const { return true;};
+    bool valid(const Edge) const { return true;}
 
     ///Gives back the \e id of a node.
-    int id(const Node) const { return 0;};
+    int id(const Node) const { return 0;}
     ///Gives back the \e id of an edge.
-    int id(const Edge) const { return 0;};
+    int id(const Edge) const { return 0;}
 
     //void setInvalid(Node &) const {};
@@ -173 +175 @@
     int edgeNum() { return 0;}
 
-    EmptyGraph() {};
-    EmptyGraph(const EmptyGraph &G) {};
+    EmptyGraph() {}
+    EmptyGraph(const EmptyGraph &G) {}
   
   
@@ -218 +220 @@
   // @}
 
-};
+} //namespace hugo
 
 
@@ -237 +239 @@
 
 // }
+
+#endif // EMPTYGRAPH_H

src/work/alpar/smart_graph.h

@@ -97 +97 @@
     Node head(Edge e) const { return edges[e.n].head; }
 
-//     Node aNode(const OutEdgeIt& e) const { return tail(e); }
-//     Node aNode(const InEdgeIt& e) const { return head(e); }
+    // Marci
+    Node aNode(OutEdgeIt e) const { return edges[e.n].tail; }
+    Node aNode(InEdgeIt e) const { return edges[e.n].head; }
 //     //Node aNode(const SymEdge& e) const { return e.aNode(); }
 
-//     Node bNode(const OutEdgeIt& e) const { return head(e); }
-//     Node bNode(const InEdgeIt& e) const { return tail(e); }
+    // Marci
+    Node bNode(OutEdgeIt e) const { return edges[e.n].head; }
+    Node bNode(InEdgeIt e) const { return edges[e.n].tail; }
 //     //Node bNode(const SymEdge& e) const { return e.bNode(); }
 
@@ -117 +119 @@
     It first() const { 
       It e;
-      getFirst(e);
+      //Marci
+      /*getF*/first(e);
       return e; 
     }
@@ -124 +127 @@
     It first(Node v) const { 
       It e;
-      getFirst(e, v);
+      //Marci
+      /*getF*/first(e, v);
       return e; 
     }
@@ -139 +143 @@
     //{ It tmp; tmp.n=it.n+1; return tmp; }
 
-    Node& next(Node& it) const { it.n=(it.n+2)%nodes.size()-1; return it; }
+    //FIXME correction Marci: I changed to NodeIt from Node
+    //NodeIt& next(NodeIt& it) const { it.n=(it.n+2)%nodes.size()-1; return it; }
+    NodeIt& next(NodeIt& it) const { 
+      it.n=(it.n+2)%(nodes.size()+1)-1; 
+      return it; 
+    }
     OutEdgeIt& next(OutEdgeIt& it) const
     { it.n=edges[it.n].next_out; return it; }
@@ -217 +226 @@
     public:
       Edge() { }
-      Edge (Invalid i) { n=-1; }
+      // Marci: kiszedtem az Invalid i-bol az i-t 
+      Edge (Invalid) { n=-1; }
       bool operator==(const Edge i) const {return n==i.n;}
       bool operator!=(const Edge i) const {return n!=i.n;}