diff -r e225719bde6b -r 2d806130e700 lemon/bits/default_map.h
--- a/lemon/bits/default_map.h	Thu Jan 26 06:44:22 2006 +0000
+++ b/lemon/bits/default_map.h	Thu Jan 26 15:42:13 2006 +0000
@@ -266,37 +266,37 @@
 
   /// \e
   template <typename _Base> 
-  class MappableUndirGraphExtender : 
+  class MappableUGraphExtender : 
     public MappableGraphExtender<_Base> {
   public:
 
-    typedef MappableUndirGraphExtender Graph;
+    typedef MappableUGraphExtender Graph;
     typedef MappableGraphExtender<_Base> Parent;
 
-    typedef typename Parent::UndirEdge UndirEdge;
+    typedef typename Parent::UEdge UEdge;
 
     template <typename _Value>
-    class UndirEdgeMap 
-      : public IterableMapExtender<DefaultMap<Graph, UndirEdge, _Value> > {
+    class UEdgeMap 
+      : public IterableMapExtender<DefaultMap<Graph, UEdge, _Value> > {
     public:
-      typedef MappableUndirGraphExtender Graph;
+      typedef MappableUGraphExtender Graph;
       typedef IterableMapExtender<
-	DefaultMap<Graph, UndirEdge, _Value> > Parent;
+	DefaultMap<Graph, UEdge, _Value> > Parent;
 
-      UndirEdgeMap(const Graph& _g) 
+      UEdgeMap(const Graph& _g) 
 	: Parent(_g) {}
-      UndirEdgeMap(const Graph& _g, const _Value& _v) 
+      UEdgeMap(const Graph& _g, const _Value& _v) 
 	: Parent(_g, _v) {}
 
-      UndirEdgeMap& operator=(const UndirEdgeMap& cmap) {
-	return operator=<UndirEdgeMap>(cmap);
+      UEdgeMap& operator=(const UEdgeMap& cmap) {
+	return operator=<UEdgeMap>(cmap);
       }
 
       template <typename CMap>
-      UndirEdgeMap& operator=(const CMap& cmap) {
-	checkConcept<concept::ReadMap<UndirEdge, _Value>, CMap>();
+      UEdgeMap& operator=(const CMap& cmap) {
+	checkConcept<concept::ReadMap<UEdge, _Value>, CMap>();
 	const typename Parent::Graph* graph = Parent::getGraph();
-	UndirEdge it;
+	UEdge it;
 	for (graph->first(it); it != INVALID; graph->next(it)) {
 	  Parent::set(it, cmap[it]);
 	}
@@ -309,37 +309,37 @@
 
   /// \e
   template <typename _Base> 
-  class MappableUndirEdgeSetExtender : 
+  class MappableUEdgeSetExtender : 
     public MappableEdgeSetExtender<_Base> {
   public:
 
-    typedef MappableUndirEdgeSetExtender Graph;
+    typedef MappableUEdgeSetExtender Graph;
     typedef MappableEdgeSetExtender<_Base> Parent;
 
-    typedef typename Parent::UndirEdge UndirEdge;
+    typedef typename Parent::UEdge UEdge;
 
     template <typename _Value>
-    class UndirEdgeMap 
-      : public IterableMapExtender<DefaultMap<Graph, UndirEdge, _Value> > {
+    class UEdgeMap 
+      : public IterableMapExtender<DefaultMap<Graph, UEdge, _Value> > {
     public:
-      typedef MappableUndirEdgeSetExtender Graph;
+      typedef MappableUEdgeSetExtender Graph;
       typedef IterableMapExtender<
-	DefaultMap<Graph, UndirEdge, _Value> > Parent;
+	DefaultMap<Graph, UEdge, _Value> > Parent;
 
-      UndirEdgeMap(const Graph& _g) 
+      UEdgeMap(const Graph& _g) 
 	: Parent(_g) {}
-      UndirEdgeMap(const Graph& _g, const _Value& _v) 
+      UEdgeMap(const Graph& _g, const _Value& _v) 
 	: Parent(_g, _v) {}
 
-      UndirEdgeMap& operator=(const UndirEdgeMap& cmap) {
-	return operator=<UndirEdgeMap>(cmap);
+      UEdgeMap& operator=(const UEdgeMap& cmap) {
+	return operator=<UEdgeMap>(cmap);
       }
 
       template <typename CMap>
-      UndirEdgeMap& operator=(const CMap& cmap) {
-	checkConcept<concept::ReadMap<UndirEdge, _Value>, CMap>();
+      UEdgeMap& operator=(const CMap& cmap) {
+	checkConcept<concept::ReadMap<UEdge, _Value>, CMap>();
 	const typename Parent::Graph* graph = Parent::getGraph();
-	UndirEdge it;
+	UEdge it;
 	for (graph->first(it); it != INVALID; graph->next(it)) {
 	  Parent::set(it, cmap[it]);
 	}
@@ -352,23 +352,23 @@
 
 
   template <typename _Base>
-  class MappableUndirBipartiteGraphExtender : public _Base {
+  class MappableUBipartiteGraphExtender : public _Base {
   public:
 
     typedef _Base Parent;
-    typedef MappableUndirBipartiteGraphExtender Graph;
+    typedef MappableUBipartiteGraphExtender Graph;
 
     typedef typename Parent::Node Node;
     typedef typename Parent::UpperNode UpperNode;
     typedef typename Parent::LowerNode LowerNode;
     typedef typename Parent::Edge Edge;
-    typedef typename Parent::UndirEdge UndirEdge;
+    typedef typename Parent::UEdge UEdge;
     
     template <typename _Value>
     class UpperNodeMap 
       : public IterableMapExtender<DefaultMap<Graph, UpperNode, _Value> > {
     public:
-      typedef MappableUndirBipartiteGraphExtender Graph;
+      typedef MappableUBipartiteGraphExtender Graph;
       typedef IterableMapExtender<DefaultMap<Graph, UpperNode, _Value> > 
       Parent;
     
@@ -405,7 +405,7 @@
     class LowerNodeMap 
       : public IterableMapExtender<DefaultMap<Graph, LowerNode, _Value> > {
     public:
-      typedef MappableUndirBipartiteGraphExtender Graph;
+      typedef MappableUBipartiteGraphExtender Graph;
       typedef IterableMapExtender<DefaultMap<Graph, LowerNode, _Value> > 
       Parent;
     
@@ -443,7 +443,7 @@
     template <typename _Value>
     class NodeMapBase : public Parent::NodeNotifier::ObserverBase {
     public:
-      typedef MappableUndirBipartiteGraphExtender Graph;
+      typedef MappableUBipartiteGraphExtender Graph;
 
       typedef Node Key;
       typedef _Value Value;
@@ -523,7 +523,7 @@
     class NodeMap 
       : public IterableMapExtender<NodeMapBase<_Value> > {
     public:
-      typedef MappableUndirBipartiteGraphExtender Graph;
+      typedef MappableUBipartiteGraphExtender Graph;
       typedef IterableMapExtender< NodeMapBase<_Value> > Parent;
     
       NodeMap(const Graph& _g) 
@@ -561,7 +561,7 @@
     class EdgeMap 
       : public IterableMapExtender<DefaultMap<Graph, Edge, _Value> > {
     public:
-      typedef MappableUndirBipartiteGraphExtender Graph;
+      typedef MappableUBipartiteGraphExtender Graph;
       typedef IterableMapExtender<DefaultMap<Graph, Edge, _Value> > Parent;
     
       EdgeMap(const Graph& _g) 
@@ -586,27 +586,27 @@
     };
 
     template <typename _Value>
-    class UndirEdgeMap 
-      : public IterableMapExtender<DefaultMap<Graph, UndirEdge, _Value> > {
+    class UEdgeMap 
+      : public IterableMapExtender<DefaultMap<Graph, UEdge, _Value> > {
     public:
-      typedef MappableUndirBipartiteGraphExtender Graph;
-      typedef IterableMapExtender<DefaultMap<Graph, UndirEdge, _Value> > 
+      typedef MappableUBipartiteGraphExtender Graph;
+      typedef IterableMapExtender<DefaultMap<Graph, UEdge, _Value> > 
       Parent;
     
-      UndirEdgeMap(const Graph& _g) 
+      UEdgeMap(const Graph& _g) 
 	: Parent(_g) {}
-      UndirEdgeMap(const Graph& _g, const _Value& _v) 
+      UEdgeMap(const Graph& _g, const _Value& _v) 
 	: Parent(_g, _v) {}
     
-      UndirEdgeMap& operator=(const UndirEdgeMap& cmap) {
-	return operator=<UndirEdgeMap>(cmap);
+      UEdgeMap& operator=(const UEdgeMap& cmap) {
+	return operator=<UEdgeMap>(cmap);
       }
     
       template <typename CMap>
-      UndirEdgeMap& operator=(const CMap& cmap) {
-	checkConcept<concept::ReadMap<UndirEdge, _Value>, CMap>();
+      UEdgeMap& operator=(const CMap& cmap) {
+	checkConcept<concept::ReadMap<UEdge, _Value>, CMap>();
 	const typename Parent::Graph* graph = Parent::getGraph();
-	UndirEdge it;
+	UEdge it;
 	for (graph->first(it); it != INVALID; graph->next(it)) {
 	  Parent::set(it, cmap[it]);
 	}