COIN-OR::LEMON - Graph Library

Changeset 1990:15fb7a4ea6be in lemon-0.x for lemon/sub_graph.h


Ignore:
Timestamp:
03/01/06 11:17:25 (14 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2592
Message:

Some classes assumed that the GraphMaps? should be inherited
from an ObserverBase?. These classes parents replaced with
DefaultMap? which cause that the graph maps should not be
inherited from the ObserverBase?.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/sub_graph.h

    r1979 r1990  
    2121
    2222#include <lemon/graph_adaptor.h>
     23#include <lemon/bits/graph_adaptor_extender.h>
     24#include <lemon/bits/default_map.h>
    2325
    2426namespace lemon {
     
    243245      Edge firstIn, firstOut;
    244246    };
    245     class NodesImpl : public Graph::template NodeMap<NodeT> {
     247    class NodesImpl : public DefaultMap<Graph, Node, NodeT> {
    246248      friend class SubGraphBase;
    247249    public:
    248       typedef typename Graph::template NodeMap<NodeT> Parent;
     250      typedef DefaultMap<Graph, Node, NodeT> Parent;
    249251
    250252      NodesImpl(SubGraph& _adaptor, const Graph& _graph)
     
    306308      Edge prevIn, nextIn;
    307309    };
    308     class EdgesImpl : public Graph::template EdgeMap<EdgeT> {
     310    class EdgesImpl : public DefaultMap<Graph, Edge, EdgeT> {
    309311      friend class SubGraphBase;
    310312    public:
    311       typedef typename Graph::template EdgeMap<EdgeT> Parent;
     313      typedef DefaultMap<Graph, Edge, EdgeT> Parent;
    312314
    313315      EdgesImpl(SubGraph& _adaptor, const Graph& _graph)
     
    561563      Edge firstIn, firstOut;
    562564    };
    563     class NodesImpl : public Graph::template NodeMap<NodeT> {
     565    class NodesImpl : public DefaultMap<Graph, Node, NodeT> {
    564566      friend class EdgeSubGraphBase;
    565567    public:
    566       typedef typename Graph::template NodeMap<NodeT> Parent;
     568      typedef DefaultMap<Graph, Node, NodeT> Parent;
    567569
    568570      NodesImpl(SubGraph& _adaptor, const Graph& _graph)
     
    604606      Edge prevIn, nextIn;
    605607    };
    606     class EdgesImpl : public Graph::template EdgeMap<EdgeT> {
     608    class EdgesImpl : public DefaultMap<Graph, Edge, EdgeT> {
    607609      friend class EdgeSubGraphBase;
    608610    public:
    609       typedef typename Graph::template EdgeMap<EdgeT> Parent;
     611      typedef DefaultMap<Graph, Edge, EdgeT> Parent;
    610612
    611613      EdgesImpl(SubGraph& _adaptor, const Graph& _graph)
Note: See TracChangeset for help on using the changeset viewer.