Changeset 67:5f86199dcf3e in lemon-0.x for src/work

Timestamp:

02/06/04 12:45:47 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

Location:

src/work

Files:

• alpar/emptygraph.h (modified) (4 diffs)
• list_graph.hh (modified) (2 diffs)

src/work/alpar/emptygraph.h

@@ -6 +6 @@
   class EdgeIt {};
   
-  class InEdgeIt : public EdgeIt
+  class InEdgeIt : public EdgeIt {};
   class OutEdgeIt : public EdgeIt {};
   class SymEdgeIt : public EdgeIt {};
@@ -13 +13 @@
   class NodeIt {};
     
-  NodeIt &getFirst(NodeIt &) const {};
-  InEdgeIt &getFirst(InEdgeIt &,const NodeIt) const {};
-  OutEdgeIt &getFirst(OutEdgeIt &,const NodeIt) const {};
-  SymEdgeIt &getFirst(SymEdgeIt &,const NodeIt) const {};
-  EachEdgeIt &getFirst(EachEdgeIt &) const {};
+  NodeIt &getFirst(NodeIt &) const {}
+  InEdgeIt &getFirst(InEdgeIt &, NodeIt) const {}
+  OutEdgeIt &getFirst(OutEdgeIt &, NodeIt) const {}
+  SymEdgeIt &getFirst(SymEdgeIt &, NodeIt) const {}
+  EachEdgeIt &getFirst(EachEdgeIt &) const {}
 
-  NodeIt next(const NodeIt) const {};
-  InEdgeIt next(const InEdgeIt) const {};
-  OutEdgeIt next(const OutEdgeIt) const {};
-  SymEdgeIt next(const SymEdgeIt) const {};
-  EachEdgeIt next(const EachEdgeIt) const {};
+  NodeIt next(NodeIt) const {}
+  InEdgeIt next(InEdgeIt) const {}
+  OutEdgeIt next(OutEdgeIt) const {}
+  SymEdgeIt next(SymEdgeIt) const {}
+  EachEdgeIt next(EachEdgeIt) const {}
 
-  NodeIt &goNext(NodeIt &) const {};
-  InEdgeIt &goNext(InEdgeIt &) const {};
-  OutEdgeIt &goNext(OutEdgeIt &) const {};
-  SymEdgeIt &goNext(SymEdgeIt &) const {};
-  EachEdgeIt &goNext(EachEdgeIt &) const {};
+  NodeIt &goNext(NodeIt &) const {}
+  InEdgeIt &goNext(InEdgeIt &) const {}
+  OutEdgeIt &goNext(OutEdgeIt &) const {}
+  SymEdgeIt &goNext(SymEdgeIt &) const {}
+  EachEdgeIt &goNext(EachEdgeIt &) const {}
 
-  NodeIt head(const EdgeIt) const {};
-  NodeIt tail(const EdgeIt) const {};
+  NodeIt head(EdgeIt) const {}
+  NodeIt tail(EdgeIt) const {}
   
-  NodeIt aNode(const InEdgeIt) const {};
-  NodeIt aNode(const OutEdgeIt) const {};
-  NodeIt aNode(const SymEdgeIt) const {};
+  NodeIt aNode(InEdgeIt) const {}
+  NodeIt aNode(OutEdgeIt) const {}
+  NodeIt aNode(SymEdgeIt) const {}
 
-  NodeIt bNode(const InEdgeIt) const {};
-  NodeIt bNode(const OutEdgeIt) const {};
-  NodeIt bNode(const SymEdgeIt) const {};
+  NodeIt bNode(InEdgeIt) const {}
+  NodeIt bNode(OutEdgeIt) const {}
+  NodeIt bNode(SymEdgeIt) const {}
 
-  bool valid(const NodeIt) const {};
-  bool valid(const EdgeIt) const {};
+  //bool valid(const NodeIt) const {};
+  //bool valid(const EdgeIt) const {};
 
-  void setInvalid(NodeIt &) const {};
-  void setInvalid(EdgeIt &) const {};
+  //void setInvalid(NodeIt &) const {};
+  //void setInvalid(EdgeIt &) const {};
   
-  NodeIt addNode() {};
-  EdgeIt addEdge(const NodeIt from,const NodeIt to) {};
+  NodeIt addNode() {}
+  EdgeIt addEdge(NodeIt tail, NodeIt head) {}
     
-  void delete(NodeIt n) {};
-  void delete(EdgeIt e) {};
+  void erase(NodeIt n) {}
+  void erase(EdgeIt e) {}
 
-  void clear() {};
+  void clear() {}
 
   template<class T> class NodeMap
@@ -61 +61 @@
     typedef T ValueType;
     typedef NodeIt KeyType;
-    void set(const NodeIt i, const T &t) {};
-    T get(const NodeIt i) const {};
-    T &operator[](const NodeIt i) {};
+    void set(NodeIt i, T t) {}
+    T get(NodeIt i) const {}
+    T &operator[](NodeIt i) {}
       
-    NodeMap(const Graph &G) {};
+    NodeMap(const Graph &G) {}
+    NodeMap(const Graph &G, T t) {}
   };
 
@@ -73 +74 @@
     typedef T ValueType;
     typedef EdgeIt KeyType;
-    void set(const EdgeIt i, const T &t) {};
-    T get(const EdgeIt i) const {};
-    T &operator[](const EdgeIt i) {};
+    void set(EdgeIt i, T t) {}
+    T get(EdgeIt i) const {}
+    T &operator[](EdgeIt i) {}
       
-    EdgeMap(const Graph &G) {};
+    EdgeMap(const Graph &G) {}
+    EdgeMap(const Graph &G, T t) {}
   };
 };

src/work/list_graph.hh

@@ -213 +213 @@
     
     ~ListGraph() { 
-      while (first<EachNodeIt>().valid()) deleteNode(first<EachNodeIt>());
+      while (first<EachNodeIt>().valid()) erase(first<EachNodeIt>());
     }
 
@@ -294 +294 @@
     }
 
-    void deleteNode(NodeIt i) { 
-      while (first<OutEdgeIt>(i).valid()) deleteEdge(first<OutEdgeIt>(i));
-      while (first<InEdgeIt>(i).valid()) deleteEdge(first<InEdgeIt>(i));
+    void erase(NodeIt i) { 
+      while (first<OutEdgeIt>(i).valid()) erase(first<OutEdgeIt>(i));
+      while (first<InEdgeIt>(i).valid()) erase(first<InEdgeIt>(i));
       _delete_node(i.node); 
     }
   
-    void deleteEdge(EdgeIt e) { _delete_edge(e.edge); }
+    void erase(EdgeIt e) { _delete_edge(e.edge); }
 
     void setTail(EdgeIt e, NodeIt tail) {