Changeset 381:d72470496fbe in lemon-0.x

Timestamp:

04/23/04 10:32:18 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

misc

File:

• src/work/marci/graph_wrapper.h (modified) (9 diffs)

src/work/marci/graph_wrapper.h

@@ -908 +908 @@
         _G.s_false_t_true_map->first(n, _class); 
       }
+      //FIXME needed in new concept, important here
+      ClassNodeIt(const Node& _n) : n(_n) { }
       operator Node() const { return n; }
     };
@@ -1012 +1014 @@
 
     bool inSClass(const Node& n) const {
-      return !(this->s_false_t_true_map[n]);
+      return !(*(this->s_false_t_true_map))[n];
     }
     bool inTClass(const Node& n) const {
-      return (this->s_false_t_true_map[n]);
+      return (*(this->s_false_t_true_map))[n];
     }
   };
@@ -1027 +1029 @@
   public:
     class Node; 
+    friend class Node;
 //GN, int
 //0 normalis, 1 s, 2, true, ez az iteralasi sorrend, 
 //es a vege a false azaz (invalid, 3)    
     class NodeIt;
+    friend class NodeIt;
 //GNI, int
     class Edge;
+    friend class Edge;
 //GE, int, GN
 //0 normalis, 1 s->vmi, 2 vmi->t, ez a sorrend,
 //invalid: (invalid, 3, invalid)
     class OutEdgeIt;
+    friend class OutEdgeIt;
 //GO, int, GNI
 //normalis pontbol (first, 0, invalid), ..., (invalid, 2, vmi), ... (invalid, 3, invalid)
@@ -1042 +1048 @@
 //t-bol (invalid, 3, invalid)
     class InEdgeIt;
+    friend class InEdgeIt;
 //GI, int, GNI
 //normalis pontbol (first, 0, invalid), ..., (invalid, 1, vmi), ... (invalid, 3, invalid)
@@ -1047 +1054 @@
 //t-be (invalid, 2, first), ... (invalid, 3, invalid)
     class EdgeIt;
+    friend class EdgeIt;
 //(first, 0, invalid) ...
 //(invalid, 1, vmi)
@@ -1104 +1112 @@
         n(_n), spec(_spec) { }
       NodeIt(const Invalid& i) : n(i), spec(3) { }
-      NodeIt(const GraphWrapper<Graph>& _G) : n(*(_G.graph)), spec(0) { 
+      NodeIt(const stGraphWrapper<Graph>& _G) : n(*(_G.graph)), spec(0) { 
         if (!_G->valid(n)) spec=1;
       }
@@ -1149 +1157 @@
       }
       OutEdgeIt(const Invalid& i) : e(i), spec(3), n(i) { }
-      OutEdgeIt(const GraphWrapper<Graph>& _G, const Node& _n) {
+      OutEdgeIt(const stGraphWrapper<Graph>& _G, const Node& _n) {
         switch (_n.spec) {
           case 0 : 
-            if (_G.graph->inSClass) { //S, van normalis kiel 
+            if (_G.graph->inSClass(_n)) { //S, van normalis kiel 
               e=typename Graph::OutEdgeIt(*(_G.graph), 
                                           typename Graph::Node(_n)); 
@@ -1192 +1200 @@
       }
       InEdgeIt(const Invalid& i) : e(i), spec(3), n(i) { }
-      InEdgeIt(const GraphWrapper<Graph>& _G, const Node& _n) {
+      InEdgeIt(const stGraphWrapper<Graph>& _G, const Node& _n) {
         switch (_n.spec) {
           case 0 : 
-            if (_G.graph->inTClass) { //T, van normalis beel 
+            if (_G.graph->inTClass(_n)) { //T, van normalis beel 
               e=typename Graph::InEdgeIt(*(_G.graph), 
                                          typename Graph::Node(_n)); 
@@ -1233 +1241 @@
         e(_e), spec(_spec), n(_n) { }
       EdgeIt(const Invalid& i) : e(i), spec(3), n(i) { }
-      EdgeIt(const GraphWrapper<Graph>& _G) : 
+      EdgeIt(const stGraphWrapper<Graph>& _G) : 
         e(*(_G.graph)), spec(0), n(INVALID) { 
         if (!_G.graph->valid(e)) {