Changeset 713:57c0b110b31e in lemon-0.x for src/hugo

Timestamp:

07/20/04 12:58:11 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Oops: "static" and "const" does not like each other.

Location:

src/hugo

Files:

• full_graph.h (modified) (2 diffs)
• list_graph.h (modified) (4 diffs)
• smart_graph.h (modified) (5 diffs)

src/hugo/full_graph.h

@@ -78 +78 @@
       e=InEdgeIt(*this,v); return e; }
 
-    static bool valid(Edge e) const { return e.n!=-1; }
-    static bool valid(Node n) const { return n.n!=-1; }
+    static bool valid(Edge e) { return e.n!=-1; }
+    static bool valid(Node n) { return n.n!=-1; }
     
     template <typename It> It getNext(It it) const
@@ -92 +92 @@
     InEdgeIt& next(InEdgeIt& it) const
     { if(!((++it.n)%NodeNum)) it.n=-1; return it; }
-    static EdgeIt& next(EdgeIt& it) const { --it.n; return it; }
-
-    static int id(Node v) const { return v.n; }
-    static int id(Edge e) const { return e.n; }
+    static EdgeIt& next(EdgeIt& it) { --it.n; return it; }
+
+    static int id(Node v) { return v.n; }
+    static int id(Edge e) { return e.n; }
 
     class Node {

src/hugo/list_graph.h

@@ -138 +138 @@
     Node bNode(InEdgeIt e) const { return edges[e.n].tail; }
 
-    static NodeIt& first(NodeIt& v) const { 
+    NodeIt& first(NodeIt& v) const { 
       v=NodeIt(*this); return v; }
-    static EdgeIt& first(EdgeIt& e) const { 
+    EdgeIt& first(EdgeIt& e) const { 
       e=EdgeIt(*this); return e; }
-    static OutEdgeIt& first(OutEdgeIt& e, const Node v) const { 
+    OutEdgeIt& first(OutEdgeIt& e, const Node v) const { 
       e=OutEdgeIt(*this,v); return e; }
-    static InEdgeIt& first(InEdgeIt& e, const Node v) const { 
+    InEdgeIt& first(InEdgeIt& e, const Node v) const { 
       e=InEdgeIt(*this,v); return e; }
 
@@ -153 +153 @@
 //     It first(Node v) const { It e; first(e,v); return e; }
 
-    static bool valid(Edge e) const { return e.n!=-1; }
-    static bool valid(Node n) const { return n.n!=-1; }
+    static bool valid(Edge e) { return e.n!=-1; }
+    static bool valid(Node n) { return n.n!=-1; }
     
     static void setInvalid(Edge &e) { e.n=-1; }
     static void setInvalid(Node &n) { n.n=-1; }
     
-    template <typename It> static It getNext(It it) const
+    template <typename It> static It getNext(It it)
     { It tmp(it); return next(tmp); }
 
@@ -184 +184 @@
     }
 
-    static int id(Node v) const { return v.n; }
-    static int id(Edge e) const { return e.n; }
+    static int id(Node v) { return v.n; }
+    static int id(Edge e) { return e.n; }
 
     /// Adds a new node to the graph.
@@ -628 +628 @@
     ///Returns the oppositely directed
     ///pair of the edge \c e.
-    static Edge opposite(Edge e) const
+    static Edge opposite(Edge e)
     {
       Edge f;

src/hugo/smart_graph.h

@@ -137 +137 @@
 //     It first(Node v) const { It e; first(e,v); return e; }
 
-    bool valid(Edge e) const { return e.n!=-1; }
-    bool valid(Node n) const { return n.n!=-1; }
+    static bool valid(Edge e) { return e.n!=-1; }
+    static bool valid(Node n) { return n.n!=-1; }
     
     ///\deprecated Use
@@ -145 +145 @@
     ///\endcode
     ///instead.
-    void setInvalid(Edge &e) { e.n=-1; }
+    static void setInvalid(Edge &e) { e.n=-1; }
     ///\deprecated Use
     ///\code
@@ -151 +151 @@
     ///\endcode
     ///instead.
-    void setInvalid(Node &n) { n.n=-1; }
+    static void setInvalid(Node &n) { n.n=-1; }
     
     template <typename It> It getNext(It it) const
@@ -166 +166 @@
     EdgeIt& next(EdgeIt& it) const { --it.n; return it; }
 
-    int id(Node v) const { return v.n; }
-    int id(Edge e) const { return e.n; }
+    static int id(Node v) { return v.n; }
+    static int id(Edge e) { return e.n; }
 
     Node addNode() {
@@ -504 +504 @@
     ///Returns the oppositely directed
     ///pair of the edge \c e.
-    Edge opposite(Edge e) const
+    static Edge opposite(Edge e)
     {
       Edge f;