Changes in lemon/bits/map_extender.h [867:994c7df296c9:865:e9c203fb003d] in lemon

File:

• lemon/bits/map_extender.h (modified) (12 diffs)

lemon/bits/map_extender.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2008
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -37 +37 @@
   template <typename _Map>
   class MapExtender : public _Map {
+  public:
+
     typedef _Map Parent;
-    typedef typename Parent::GraphType GraphType;
-
-  public:
-
     typedef MapExtender Map;
+
+
+    typedef typename Parent::Graph Graph;
     typedef typename Parent::Key Item;
 
     typedef typename Parent::Key Key;
     typedef typename Parent::Value Value;
-    typedef typename Parent::Reference Reference;
-    typedef typename Parent::ConstReference ConstReference;
-
-    typedef typename Parent::ReferenceMapTag ReferenceMapTag;
 
     class MapIt;
@@ -60 +57 @@
   public:
 
-    MapExtender(const GraphType& graph)
+    MapExtender(const Graph& graph)
       : Parent(graph) {}
 
-    MapExtender(const GraphType& graph, const Value& value)
+    MapExtender(const Graph& graph, const Value& value)
       : Parent(graph, value) {}
 
@@ -79 +76 @@
   public:
     class MapIt : public Item {
-      typedef Item Parent;
-
-    public:
-
+    public:
+
+      typedef Item Parent;
       typedef typename Map::Value Value;
 
@@ -119 +115 @@
 
     class ConstMapIt : public Item {
-      typedef Item Parent;
-
-    public:
+    public:
+
+      typedef Item Parent;
 
       typedef typename Map::Value Value;
@@ -150 +146 @@
 
     class ItemIt : public Item {
-      typedef Item Parent;
-
-    public:
+    public:
+
+      typedef Item Parent;
+
       ItemIt() : map(NULL) {}
-
 
       ItemIt(Invalid i) : Parent(i), map(NULL) {}
@@ -181 +177 @@
   template <typename _Graph, typename _Map>
   class SubMapExtender : public _Map {
+  public:
+
     typedef _Map Parent;
-    typedef _Graph GraphType;
-
-  public:
-
     typedef SubMapExtender Map;
+
+    typedef _Graph Graph;
+
     typedef typename Parent::Key Item;
 
     typedef typename Parent::Key Key;
     typedef typename Parent::Value Value;
-    typedef typename Parent::Reference Reference;
-    typedef typename Parent::ConstReference ConstReference;
-
-    typedef typename Parent::ReferenceMapTag ReferenceMapTag;
 
     class MapIt;
@@ -204 +197 @@
   public:
 
-    SubMapExtender(const GraphType& _graph)
+    SubMapExtender(const Graph& _graph)
       : Parent(_graph), graph(_graph) {}
 
-    SubMapExtender(const GraphType& _graph, const Value& _value)
+    SubMapExtender(const Graph& _graph, const Value& _value)
       : Parent(_graph, _value), graph(_graph) {}
 
@@ -227 +220 @@
   public:
     class MapIt : public Item {
-      typedef Item Parent;
-
-    public:
+    public:
+
+      typedef Item Parent;
       typedef typename Map::Value Value;
 
@@ -266 +259 @@
 
     class ConstMapIt : public Item {
-      typedef Item Parent;
-
-    public:
+    public:
+
+      typedef Item Parent;
 
       typedef typename Map::Value Value;
@@ -297 +290 @@
 
     class ItemIt : public Item {
-      typedef Item Parent;
-
-    public:
+    public:
+
+      typedef Item Parent;
+
       ItemIt() : map(NULL) {}
-
 
       ItemIt(Invalid i) : Parent(i), map(NULL) { }
@@ -324 +317 @@
   private:
 
-    const GraphType& graph;
+    const Graph& graph;
 
   };