Changeset 2121:09a07a851506 in lemon-0.x for lemon/concept/graph.h

Timestamp:

07/10/06 21:04:17 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Modifications in the Graph Component concepts

File:

• lemon/concept/graph.h (modified) (5 diffs)

lemon/concept/graph.h

@@ -33 +33 @@
   namespace concept {
 
-    
-    /**************** The full-featured graph concepts ****************/
-
-
-    // \brief Modular static graph class.
-    //     
-    // It should be the same as the \c Graph class.
-    class _Graph 
-      :  virtual public BaseGraphComponent,
-         public IterableGraphComponent, public MappableGraphComponent {
-    public:
-
-      typedef BaseGraphComponent::Node Node;
-      typedef BaseGraphComponent::Edge Edge;
-
-      template <typename _Graph>
-      struct Constraints {
-        void constraints() {
-          checkConcept<IterableGraphComponent, _Graph>();
-          checkConcept<MappableGraphComponent, _Graph>();
-        }
-      };
-    };
-
     /// \addtogroup graph_concepts
     /// @{
@@ -411 +387 @@
       /// \warning Making maps that can handle bool type (NodeMap<bool>)
       /// needs some extra attention!
-      /// \todo Wrong documentation
       template<class T> 
-      class NodeMap : public ReadWriteMap< Node, T >
-      {
+      class NodeMap : public ReadWriteMap< Node, T > {
       public:
 
@@ -425 +399 @@
         NodeMap(const NodeMap& nm) : ReadWriteMap< Node, T >(nm) { }
         ///Assignment operator
-        NodeMap& operator=(const NodeMap&) { return *this; }
-        // \todo fix this concept
+        template <typename CMap>
+        NodeMap& operator=(const CMap&) { 
+          checkConcept<ReadMap<Node, T>, CMap>();
+          return *this; 
+        }
       };
 
@@ -435 +412 @@
       /// \warning Making maps that can handle bool type (EdgeMap<bool>)
       /// needs some extra attention!
-      /// \todo Wrong documentation
       template<class T> 
-      class EdgeMap : public ReadWriteMap<Edge,T>
-      {
+      class EdgeMap : public ReadWriteMap<Edge,T> {
       public:
 
@@ -448 +423 @@
         EdgeMap(const EdgeMap& em) : ReadWriteMap<Edge,T>(em) { }
         ///Assignment operator
-        EdgeMap& operator=(const EdgeMap&) { return *this; }
-        // \todo fix this concept    
+        template <typename CMap>
+        EdgeMap& operator=(const CMap&) { 
+          checkConcept<ReadMap<Edge, T>, CMap>();
+          return *this; 
+        }
       };
 
       template <typename RGraph>
-      struct Constraints : public _Graph::Constraints<RGraph> {};
+      struct Constraints {
+        void constraints() {
+          checkConcept<BaseIterableGraphComponent<>, Graph>();
+          checkConcept<IterableGraphComponent<>, Graph>();
+          checkConcept<MappableGraphComponent<>, Graph>();
+        }
+      };
 
     };