Changeset 961:289d80c33f04 in lemon-0.x for src/lemon/concept/graph.h

Timestamp:

11/04/04 23:04:51 (19 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

• Somewhat less redundant and a bit more correct graph concepts.
• graph_wrapper_test does not compile

File:

• src/lemon/concept/graph.h (modified) (6 diffs)

src/lemon/concept/graph.h

@@ -766 +766 @@
 
 
-    /// \bug The nodes and edges are not allowed to inherit from the
-    /// same baseclass.
-
-    class BaseGraphItem {
-    public:
-      BaseGraphItem() {}
-      BaseGraphItem(Invalid) {}
-
-      // We explicitely list these:
-      BaseGraphItem(BaseGraphItem const&) {}
-      BaseGraphItem& operator=(BaseGraphItem const&) { return *this; }
-
-      bool operator==(BaseGraphItem) const { return false; }
-      bool operator!=(BaseGraphItem) const { return false; }
-
-      // Technical requirement. Do we really need this?
-      bool operator<(BaseGraphItem) const { return false; }
-    };
-
-
     /// A minimal GraphBase concept
 
@@ -795 +775 @@
       GraphBase() {}
 
-
-      /// \bug Nodes and Edges are comparable each other
-      
-      class Node : public BaseGraphItem {};
-      class Edge : public BaseGraphItem {};
+      /// \bug Should we demand that Node and Edge be subclasses of the
+      /// Graph class???
+
+      typedef GraphItem<'n'> Node;
+      typedef GraphItem<'e'> Edge;
+
+//       class Node : public BaseGraphItem<'n'> {};
+//       class Edge : public BaseGraphItem<'e'> {};
 
       // Graph operation
@@ -841 +824 @@
 
 
-    /**************** Concept checking classes ****************/
-
-    template<typename BGI>
-    struct BaseGraphItemConcept {
-      void constraints() {
-        BGI i1;
-        BGI i2 = i1;
-        BGI i3 = INVALID;
-        
-        i1 = i3;
-        if( i1 == i3 ) {
-          if ( i2 != i3 && i3 < i2 )
-            return;
-        }
-      }
-    };
-
-    
+
+    /**************** The full-featured graph concepts ****************/
+
     
     class StaticGraph 
-      :  virtual public BaseGraphComponent, public IterableGraphComponent, public MappableGraphComponent {
+      :  virtual public BaseGraphComponent,
+         public IterableGraphComponent, public MappableGraphComponent {
     public:
       typedef BaseGraphComponent::Node Node;
@@ -870 +839 @@
     struct StaticGraphConcept {
       void constraints() {
-        function_requires<BaseGraphComponentConcept<Graph> >();
         function_requires<IterableGraphComponentConcept<Graph> >();
         function_requires<MappableGraphComponentConcept<Graph> >();
       }
-      Graph& graph;
     };
 
     class ExtendableGraph 
-      :  virtual public BaseGraphComponent, public StaticGraph, public ExtendableGraphComponent, public ClearableGraphComponent {
+      :  virtual public BaseGraphComponent, public StaticGraph,
+         public ExtendableGraphComponent, public ClearableGraphComponent {
     public:
       typedef BaseGraphComponent::Node Node;
@@ -891 +859 @@
         function_requires<ClearableGraphComponentConcept<Graph> >();
       }
-      Graph& graph;
     };
 
     class ErasableGraph 
-      :  virtual public BaseGraphComponent, public ExtendableGraph, public ErasableGraphComponent {
+      :  virtual public BaseGraphComponent, public ExtendableGraph,
+         public ErasableGraphComponent {
     public:
       typedef BaseGraphComponent::Node Node;
@@ -907 +875 @@
         function_requires<ErasableGraphComponentConcept<Graph> >();
       }
-      Graph& graph;
     };