COIN-OR::LEMON - Graph Library

Changeset 1791:62e7d237e1fb in lemon-0.x for lemon/full_graph.h


Ignore:
Timestamp:
11/14/05 19:38:41 (14 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2332
Message:

Modification on the base graph concept
The extended interface does not changed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/full_graph.h

    r1726 r1791  
    2424#include <lemon/bits/alteration_notifier.h>
    2525#include <lemon/bits/static_map.h>
    26 
    27 #include <lemon/bits/undir_graph_extender.h>
     26#include <lemon/bits/graph_extender.h>
    2827
    2928#include <lemon/invalid.h>
     
    7170    /// Maximum node ID.
    7271    ///\sa id(Node)
    73     int maxId(Node = INVALID) const { return _nodeNum-1; }
     72    int maxNodeId() const { return _nodeNum-1; }
    7473    /// Maximum edge ID.
    7574   
    7675    /// Maximum edge ID.
    7776    ///\sa id(Edge)
    78     int maxId(Edge = INVALID) const { return _edgeNum-1; }
     77    int maxEdgeId() const { return _edgeNum-1; }
    7978
    8079    Node source(Edge e) const { return e.id % _nodeNum; }
     
    102101    static int id(Edge e) { return e.id; }
    103102
    104     static Node fromId(int id, Node) { return Node(id);}
    105    
    106     static Edge fromId(int id, Edge) { return Edge(id);}
     103    static Node nodeFromId(int id) { return Node(id);}
     104   
     105    static Edge edgeFromId(int id) { return Edge(id);}
    107106
    108107    typedef True FindEdgeTag;
     
    191190  };
    192191
    193 
    194   typedef AlterableGraphExtender<FullGraphBase>
    195   AlterableFullGraphBase;
    196   typedef IterableGraphExtender<AlterableFullGraphBase>
    197   IterableFullGraphBase;
    198192  typedef StaticMappableGraphExtender<
    199193    IterableGraphExtender<
    200     AlterableGraphExtender<FullGraphBase> > > ExtendedFullGraphBase;
     194    AlterableGraphExtender<
     195    GraphExtender<FullGraphBase> > > > ExtendedFullGraphBase;
    201196
    202197  /// \ingroup graphs
     
    218213  };
    219214
    220   ///@}
    221215
    222216  class UndirFullGraphBase {
     
    253247    /// Maximum node ID.
    254248    ///\sa id(Node)
    255     int maxId(Node = INVALID) const { return _nodeNum-1; }
     249    int maxNodeId() const { return _nodeNum-1; }
    256250    /// Maximum edge ID.
    257251   
    258252    /// Maximum edge ID.
    259253    ///\sa id(Edge)
    260     int maxId(Edge = INVALID) const { return _edgeNum-1; }
     254    int maxEdgeId() const { return _edgeNum-1; }
    261255
    262256    Node source(Edge e) const {
Note: See TracChangeset for help on using the changeset viewer.