lemon-1.2: comparison lemon/concepts/graph.h

equal deleted inserted replaced

-:5580da3bd1d1
+:06cdc101bc32
 /// Assign the iterator to the next inarc of the corresponding node.
 ///
 InArcIt& operator++() { return *this; }
 };
-/// \brief Read write map of the nodes to type \c T.
+/// \brief Reference map of the nodes to type \c T.
 ///
-/// ReadWrite map of the nodes to type \c T.
+/// Reference map of the nodes to type \c T.
-/// \sa Reference
 template<class T>
-class NodeMap : public ReadWriteMap< Node, T >
+class NodeMap : public ReferenceMap<Node, T, T&, const T&>
 {
 public:
 ///\e
 NodeMap(const Graph&) { }
 ///\e
 NodeMap(const Graph&, T) { }
 private:
 ///Copy constructor
-NodeMap(const NodeMap& nm) : ReadWriteMap< Node, T >(nm) { }
+NodeMap(const NodeMap& nm) :
+ReferenceMap<Node, T, T&, const T&>(nm) { }
 ///Assignment operator
 template <typename CMap>
 NodeMap& operator=(const CMap&) {
 checkConcept<ReadMap<Node, T>, CMap>();
 return *this;
 }
 };
-/// \brief Read write map of the directed arcs to type \c T.
+/// \brief Reference map of the arcs to type \c T.
 ///
-/// Reference map of the directed arcs to type \c T.
+/// Reference map of the arcs to type \c T.
-/// \sa Reference
 template<class T>
-class ArcMap : public ReadWriteMap<Arc,T>
+class ArcMap : public ReferenceMap<Arc, T, T&, const T&>
 {
 public:
 ///\e
 ArcMap(const Graph&) { }
 ///\e
 ArcMap(const Graph&, T) { }
 private:
 ///Copy constructor
-ArcMap(const ArcMap& em) : ReadWriteMap<Arc,T>(em) { }
+ArcMap(const ArcMap& em) :
+ReferenceMap<Arc, T, T&, const T&>(em) { }
 ///Assignment operator
 template <typename CMap>
 ArcMap& operator=(const CMap&) {
 checkConcept<ReadMap<Arc, T>, CMap>();
 return *this;
 }
 };
-/// Read write map of the edges to type \c T.
+/// Reference map of the edges to type \c T.
-/// Reference map of the arcs to type \c T.
+/// Reference map of the edges to type \c T.
-/// \sa Reference
 template<class T>
-class EdgeMap : public ReadWriteMap<Edge,T>
+class EdgeMap : public ReferenceMap<Edge, T, T&, const T&>
 {
 public:
 ///\e
 EdgeMap(const Graph&) { }
 ///\e
 EdgeMap(const Graph&, T) { }
 private:
 ///Copy constructor
-EdgeMap(const EdgeMap& em) : ReadWriteMap<Edge,T>(em) {}
+EdgeMap(const EdgeMap& em) :
+ReferenceMap<Edge, T, T&, const T&>(em) {}
 ///Assignment operator
 template <typename CMap>
 EdgeMap& operator=(const CMap&) {
 checkConcept<ReadMap<Edge, T>, CMap>();
 return *this;
 }
 template <typename _Graph>
 struct Constraints {
 void constraints() {
+checkConcept<BaseGraphComponent, _Graph>();
 checkConcept<IterableGraphComponent<>, _Graph>();
 checkConcept<IDableGraphComponent<>, _Graph>();
 checkConcept<MappableGraphComponent<>, _Graph>();
 }
 };

changeset 638	57e6f560fb13
parent 559	c5fd2d996909
child 657	bf7928412136