Changeset 443:178fb74b22d1 in lemon-0.x for src/work/list_graph.h

Timestamp:

04/27/04 15:44:14 (20 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

• list_graph.h:
  • node_item and edge_item are structs and not classes
  • operator<< is inline

File:

• src/work/list_graph.h (modified) (5 diffs)

src/work/list_graph.h

@@ -18 +18 @@
 
   class ListGraph {
-    class node_item;
-    class edge_item;
+    struct node_item;
+    struct edge_item;
   public:
     class Node;
@@ -85 +85 @@
     node_item* _last_node;
 
-    class node_item {
-      friend class ListGraph;
-      template <typename T> friend class NodeMap;
-      
-      friend class Node;
-      friend class NodeIt;
-      friend class Edge;
-      friend class EdgeIt;
-      friend class OutEdgeIt;
-      friend class InEdgeIt;
-      friend class SymEdgeIt;
-      friend std::ostream& operator<<(std::ostream& os, const Node& i);
-      friend std::ostream& operator<<(std::ostream& os, const Edge& i);
-      //ListGraph* G;
+    struct node_item {
       int id;
       edge_item* _first_out_edge;
@@ -106 +93 @@
       node_item* _next_node;
       node_item* _prev_node;
-    public:
-      node_item() { }
-    };
-
-    class edge_item {
-      friend class ListGraph;
-      template <typename T> friend class EdgeMap;
-
-      friend class Node;
-      friend class NodeIt;
-      friend class Edge;
-      friend class EdgeIt;
-      friend class OutEdgeIt;
-      friend class InEdgeIt;
-      friend class SymEdgeIt;
-      friend std::ostream& operator<<(std::ostream& os, const Edge& i);
-      //ListGraph* G;
+    };
+
+    struct edge_item {
       int id;
       node_item* _tail;
@@ -130 +103 @@
       edge_item* _next_in;
       edge_item* _prev_in;
-    public:
-      edge_item() { }
     };
 
@@ -547 +518 @@
   };
 
+  inline
   std::ostream& operator<<(std::ostream& os, const ListGraph::Node& i) { 
     if (i.valid())
-      os << i.node->id; 
+      os << i.node->id;
     else
       os << "invalid";
     return os; 
   }
+
+  inline
   std::ostream& operator<<(std::ostream& os, const ListGraph::Edge& i) { 
     if (i.valid()) 
-      os << "(" << i.edge->_tail->id << "--" << i.edge->id << "->" << i.edge->_head->id << ")"; 
+      os << "(" << i.tailNode() << "--" << i.edge->id << "->" 
+         << i.headNode() << ")"; 
     else 
       os << "invalid";