[Lemon-commits] [lemon_svn] marci: r1284 - hugo/branches/graph_factory/src/lemon

[Lemon SVN]

Author: marci
Date: Fri Oct  8 15:16:28 2004
New Revision: 1284

Added:
   hugo/branches/graph_factory/src/lemon/graph_extender.h
      - copied, changed from r1283, /hugo/branches/graph_factory/src/lemon/graph_factory.h
Removed:
   hugo/branches/graph_factory/src/lemon/graph_factory.h

Log:
corrections in naming.


Copied: hugo/branches/graph_factory/src/lemon/graph_extender.h (from r1283, /hugo/branches/graph_factory/src/lemon/graph_factory.h)
==============================================================================
--- /hugo/branches/graph_factory/src/lemon/graph_factory.h	(original)
+++ hugo/branches/graph_factory/src/lemon/graph_extender.h	Fri Oct  8 15:16:28 2004
@@ -1,6 +1,6 @@
 // -*- c++ -*-
-#ifndef LEMON_GRAPH_FACTORY_H
-#define LEMON_GRAPH_FACTORY_H
+#ifndef LEMON_GRAPH_EXTENDER_H
+#define LEMON_GRAPH_EXTENDER_H
 
 #include <lemon/invalid.h>
 
@@ -22,12 +22,12 @@
       NodeIt() { }
       NodeIt(Invalid i) : Node(i) { }
       NodeIt(const Graph& _g) : Node() {
-	_g.firstNode(*this);
+	_g.first(*this);
       }
       NodeIt(const Graph& _g, const Node& n) : 
 	Node(n), g(&_g) { }
       NodeIt& operator++() { 
-	g->nextNode(*this);
+	g->next(*this);
 	return *this; 
       }
     };
@@ -40,12 +40,12 @@
       EdgeIt() { }
       EdgeIt(Invalid i) : Edge(i) { }
       EdgeIt(const Graph& _g) : Edge() {
-	_g.firstEdge(*this);
+	_g.first(*this);
       }
       EdgeIt(const Graph& _g, const Edge& e) : 
 	Edge(e), g(&_g) { }
       EdgeIt& operator++() { 
-	g->nextEdge(*this);
+	g->next(*this);
 	return *this; 
       }
     };
@@ -56,12 +56,12 @@
       OutEdgeIt() { }
       OutEdgeIt(Invalid i) : Edge(i) { }
       OutEdgeIt(const Graph& _g, const Node& n) : Edge() {
-	_g.firstOutEdge(*this, n);
+	_g.firstOut(*this, n);
       }
       OutEdgeIt(const Graph& _g, const Edge& e) : 
 	Edge(e), g(&_g) { }
       OutEdgeIt& operator++() { 
-	g->nextOutEdge(*this);
+	g->nextOut(*this);
 	return *this; 
       }
     };
@@ -72,28 +72,28 @@
       InEdgeIt() { }
       InEdgeIt(Invalid i) : Edge(i) { }
       InEdgeIt(const Graph& _g, const Node& n) : Edge() {
-	_g.firstInEdge(*this, n);
+	_g.firstIn(*this, n);
       }
       InEdgeIt(const Graph& _g, const Edge& e) : 
 	Edge(e), g(&_g) { }
       InEdgeIt& operator++() { 
-	g->nextInEdge(*this);
+	g->nextIn(*this);
 	return *this; 
       }
     };
    
-    NodeIt& first(NodeIt& i) const { 
-      i=NodeIt(*this); return i;
-    }
-    OutEdgeIt& first(OutEdgeIt& i, const Node& p) const { 
-      i=OutEdgeIt(*this, p); return i;
-    }
-    InEdgeIt& first(InEdgeIt& i, const Node& p) const { 
-      i=InEdgeIt(*this, p); return i;
-    }
-    EdgeIt& first(EdgeIt& i) const { 
-      i=EdgeIt(*this); return i;
-    }
+//     NodeIt& first(NodeIt& i) const { 
+//       i=NodeIt(*this); return i;
+//     }
+//     OutEdgeIt& first(OutEdgeIt& i, const Node& p) const { 
+//       i=OutEdgeIt(*this, p); return i;
+//     }
+//     InEdgeIt& first(InEdgeIt& i, const Node& p) const { 
+//       i=InEdgeIt(*this, p); return i;
+//     }
+//     EdgeIt& first(EdgeIt& i) const { 
+//       i=EdgeIt(*this); return i;
+//     }
 
 //     Node tail(const Edge& e) const { 
 //       return Node(graph->tail(static_cast<typename Graph::Edge>(e))); }
@@ -128,4 +128,4 @@
   
 }
 
-#endif // LEMON_GRAPH_FACTORY_H
+#endif // LEMON_GRAPH_EXTENDER_H