Changeset 2121:09a07a851506 in lemon-0.x for lemon/concept/ugraph.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/ugraph.h (modified) (7 diffs)

lemon/concept/ugraph.h

@@ -490 +490 @@
       /// \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 >
@@ -504 +503 @@
         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; 
+        }
       };
 
@@ -514 +516 @@
       /// \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>
@@ -527 +528 @@
         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; 
+        }
       };
 
@@ -537 +541 @@
       /// \warning Making maps that can handle bool type (UEdgeMap<bool>)
       /// needs some extra attention!
-      /// \todo Wrong documentation
       template<class T> 
       class UEdgeMap : public ReadWriteMap<UEdge,T>
@@ -550 +553 @@
         UEdgeMap(const UEdgeMap& em) : ReadWriteMap<UEdge,T>(em) {}
         ///Assignment operator
-        UEdgeMap &operator=(const UEdgeMap&) { return *this; }
-        // \todo fix this concept    
+        template <typename CMap>
+        UEdgeMap& operator=(const CMap&) { 
+          checkConcept<ReadMap<UEdge, T>, CMap>();
+          return *this; 
+        }
       };
 
@@ -673 +679 @@
       struct Constraints {
         void constraints() {
-          checkConcept<BaseIterableUGraphConcept, Graph>();
-          checkConcept<IterableUGraphConcept, Graph>();
-          checkConcept<MappableUGraphConcept, Graph>();
+          checkConcept<BaseIterableUGraphComponent<>, Graph>();
+          checkConcept<IterableUGraphComponent<>, Graph>();
+          checkConcept<MappableUGraphComponent<>, Graph>();
         }
       };