Changeset 318:7bec4e8fb7dd in lemon-0.x

Timestamp:

04/14/04 13:26:12 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

gw

File:

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

src/work/marci/graph_wrapper.h

@@ -39 +39 @@
       operator Node() const { return Node(typename Graph::Node(n)); }
     };
-//     class Node : public Graph::Node {
-//     public:
-//       Node() { }
-//       Node(const typename Graph::Node& n) : Graph::Node(n) { }
-//       Node(const Invalid& i) : Graph::Node(i) { }
-//     };
-//     class NodeIt : public Graph::NodeIt { 
-//       typedef typename Graph::NodeIt GraphNodeIt;
-//     public:
-//       NodeIt() { }
-//       NodeIt(const typename Graph::NodeIt& n) : Graph::NodeIt(n) { }
-//       NodeIt(const Invalid& i) : Graph::NodeIt(i) { }
-//       NodeIt(const GraphWrapper<Graph>& _G) : 
-//      Graph::NodeIt(*(_G.graph)) { }
-//       operator Node() const {
-//      return Node(typename Graph::Node(
-//                    static_cast<typename Graph::NodeIt>(*this)
-//                    ));
-//       }
-//     };
 //    typedef typename Graph::Edge Edge;
     class Edge : public Graph::Edge {
@@ -125 +105 @@
 //     }
     
-//    template<typename I> I getNext(const I& i) const { 
-//      return gw.getNext(i); }
-
     NodeIt& next(NodeIt& i) const { graph->next(i.n); return i; }
     OutEdgeIt& next(OutEdgeIt& i) const { graph->next(i.e); return i; }
@@ -143 +120 @@
     Node tail(const Edge& e) const { 
       return Node(graph->tail(static_cast<typename Graph::Edge>(e))); }
-//    Node tail(const OutEdgeIt& e) const { return graph->tail(Edge(e)); }
 
     bool valid(const Node& n) const { 
@@ -183 +159 @@
       NodeMap(const GraphWrapper<Graph>& _G, T a) : 
         Graph::NodeMap<T>(*(_G.graph), a) { }
-//       T operator[](const Node& n) const { 
-//      return Graph::NodeMap<T>::operator[](n); 
-//       }
     };
 
@@ -226 +199 @@
 //       return graph->first(i, p); }
 
-//     template<typename I> I getNext(const I& i) const { 
-//       return graph->getNext(i); }
 //     template<typename I> I& next(I &i) const { return graph->next(i); }    
 
@@ -498 +469 @@
     Node bNode(const InEdgeIt& e) const { return Node(graph->bNode(e.e)); }
     
-    //template<typename I> I getNext(const I& i) const { 
-    //  return gw.getNext(i); 
-    //}
 //     template<typename I> I& next(I &i) const { 
 //       graph->next(i); 
@@ -639 +607 @@
 //     }
 
-//     //template<typename I> I getNext(const I& i) const { 
-//     //  return gw.getNext(i); 
-//     //}
 // //     template<typename I> I& next(I &i) const { 
 // //       graph->next(i); 
@@ -655 +620 @@
 //       It e; this->first(e, v); return e; }
 //   };
-
-//   template<typename GraphWrapper>
-//   class UndirGraphWrapper {
-//   protected:
-//     //Graph* graph;
-//     GraphWrapper gw;
-
-//   public:
-//     typedef GraphWrapper ParentGraph;
-
-//     typedef typename GraphWrapper::Node Node;
-//     typedef typename GraphWrapper::NodeIt NodeIt;
-
-//     //typedef typename Graph::Edge Edge;
-//     //typedef typename Graph::OutEdgeIt OutEdgeIt;
-//     //typedef typename Graph::InEdgeIt InEdgeIt;
-//     //typedef typename Graph::SymEdgeIt SymEdgeIt;
-//     //typedef typename Graph::EdgeIt EdgeIt;
-
-//     //private:
-//     typedef typename GraphWrapper::Edge GraphEdge;
-//     typedef typename GraphWrapper::OutEdgeIt GraphOutEdgeIt;
-//     typedef typename GraphWrapper::InEdgeIt GraphInEdgeIt;
-//     //public:
-
-//     //UndirGraphWrapper() : graph(0) { }
-//     UndirGraphWrapper(GraphWrapper _gw) : gw(_gw) { }
-
-//     //void setGraph(Graph& _graph) { graph = &_graph; }
-//     //Graph& getGraph() const { return (*graph); }
-  
-//     class Edge {
-//       friend class UndirGraphWrapper<GraphWrapper>;
-//       bool out_or_in; //true iff out
-//       GraphOutEdgeIt out;
-//       GraphInEdgeIt in;
-//     public:
-//       Edge() : out_or_in(), out(), in() { }
-//       Edge(const Invalid& i) : out_or_in(false), out(), in(i) { }
-//       operator GraphEdge() const {
-//      if (out_or_in) return(out); else return(in);
-//       }
-//       friend bool operator==(const Edge& u, const Edge& v) { 
-//      if (v.out_or_in) 
-//        return (u.out_or_in && u.out==v.out);
-//      else
-//        return (!u.out_or_in && u.in==v.in);
-//       } 
-//       friend bool operator!=(const Edge& u, const Edge& v) { 
-//      if (v.out_or_in) 
-//        return (!u.out_or_in || u.out!=v.out);
-//      else
-//        return (u.out_or_in || u.in!=v.in);
-//       } 
-//     };
-
-//     class OutEdgeIt : public Edge {
-//       friend class UndirGraphWrapper<GraphWrapper>;
-//     public:
-//       OutEdgeIt() : Edge() { }
-//       OutEdgeIt(const Invalid& i) : Edge(i) { }
-//       OutEdgeIt(const UndirGraphWrapper<GraphWrapper>& _G, const Node& n) 
-//      : Edge() { 
-//      out_or_in=true;
-//      _G.gw.first(out, n);
-//      if (!(_G.gw.valid(out))) {
-//        out_or_in=false;
-//        _G.gw.first(in, n);
-//      }
-//       }
-//     };
-
-//     OutEdgeIt& first(OutEdgeIt& e, const Node& n) const {
-//       e.out_or_in=true;
-//       gw.first(e.out, n);
-//       if (!(gw.valid(e.out))) {
-//      e.out_or_in=false;
-//      gw.first(e.in, n);
-//       }
-//       return e;
-//     }
-
-//     OutEdgeIt& next(OutEdgeIt& e) const {
-//       if (e.out_or_in) {
-//      Node n=gw.tail(e.out);
-//      gw.next(e.out);
-//      if (!gw.valid(e.out)) {
-//        e.out_or_in=false;
-//        gw.first(e.in, n);
-//      }
-//       } else {
-//      gw.next(e.in);
-//       }
-//       return e;
-//     }
-
-//     Node aNode(const OutEdgeIt& e) const { 
-//       if (e.out_or_in) return gw.tail(e); else return gw.head(e); }
-//     Node bNode(const OutEdgeIt& e) const { 
-//       if (e.out_or_in) return gw.head(e); else return gw.tail(e); }
-
-//     typedef OutEdgeIt InEdgeIt; 
-
-//     template<typename I> I& first(I& i) const { return gw.first(i); }
-// //     template<typename I, typename P> I& first(I& i, const P& p) const { 
-// //       return graph->first(i, p); }
-    
-//     template<typename I> I getNext(const I& i) const { 
-//       return gw.getNext(i); }
-//     template<typename I> I& next(I &i) const { return gw.next(i); }    
-
-//     template< typename It > It first() const { 
-//       It e; first(e); return e; }
-
-//     template< typename It > It first(const Node& v) const { 
-//       It e; first(e, v); return e; }
-
-//     Node head(const Edge& e) const { return gw.head(e); }
-//     Node tail(const Edge& e) const { return gw.tail(e); }
-
-//     template<typename I> bool valid(const I& i) const 
-//       { return gw.valid(i); }
-  
-//     //template<typename I> void setInvalid(const I &i);
-//     //{ return graph->setInvalid(i); }
-
-//     int nodeNum() const { return gw.nodeNum(); }
-//     int edgeNum() const { return gw.edgeNum(); }
-  
-// //     template<typename I> Node aNode(const I& e) const { 
-// //       return graph->aNode(e); }
-// //     template<typename I> Node bNode(const I& e) const { 
-// //       return graph->bNode(e); }
-  
-//     Node addNode() const { return gw.addNode(); }
-// // FIXME: ez igy nem jo, mert nem
-// //    Edge addEdge(const Node& tail, const Node& head) const { 
-// //      return graph->addEdge(tail, head); }
-  
-//     template<typename I> void erase(const I& i) const { gw.erase(i); }
-  
-//     void clear() const { gw.clear(); }
-    
-//     template<typename T> class NodeMap : public GraphWrapper::NodeMap<T> { 
-//     public:
-//       NodeMap(const UndirGraphWrapper<GraphWrapper>& _G) : 
-//      GraphWrapper::NodeMap<T>(_G.gw) { }
-//       NodeMap(const UndirGraphWrapper<GraphWrapper>& _G, T a) : 
-//      GraphWrapper::NodeMap<T>(_G.gw, a) { }
-//     };
-
-//     template<typename T> class EdgeMap : public GraphWrapper::EdgeMap<T> { 
-//     public:
-//       EdgeMap(const UndirGraphWrapper<GraphWrapper>& _G) : 
-//      GraphWrapper::EdgeMap<T>(_G.gw) { }
-//       EdgeMap(const UndirGraphWrapper<GraphWrapper>& _G, T a) : 
-//      GraphWrapper::EdgeMap<T>(_G.gw, a) { }
-//     };
-//   };
-
 
   template<typename Graph>
@@ -956 +761 @@
 
 //    template<typename I> I& next(I &i) const { graph->next(i); return i; }    
-//    template<typename I> I getNext(const I& i) const { return gw.getNext(i); }
-
     template< typename It > It first() const { 
       It e; this->first(e); return e; }
@@ -1974 +1777 @@
 //     }
     
-    //template<typename I> I getNext(const I& i) const { 
-    //  return gw.getNext(i); 
-    //}
-
-
     NodeIt& next(NodeIt& i) const { graph->next(i.n); return i; }
     OutEdgeIt& next(OutEdgeIt& i) const { graph->next(i.e); return i; }
@@ -2087 +1885 @@
 // //     }
     
-//     //template<typename I> I getNext(const I& i) const { 
-//     //  return gw.getNext(i); 
-//     //}
-
-
 //     NodeIt& next(NodeIt& i) const {
 //       graph->next(i);