COIN-OR::LEMON - Graph Library

Changeset 710:891f99700ea1 in lemon-0.x


Ignore:
Timestamp:
07/20/04 11:43:12 (15 years ago)
Author:
Alpar Juttner
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@962
Message:

Put some "static"'s.

Location:
src/hugo
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/hugo/full_graph.h

    r606 r710  
    7878      e=InEdgeIt(*this,v); return e; }
    7979
    80     bool valid(Edge e) const { return e.n!=-1; }
    81     bool valid(Node n) const { return n.n!=-1; }
     80    static bool valid(Edge e) const { return e.n!=-1; }
     81    static bool valid(Node n) const { return n.n!=-1; }
    8282   
    8383    template <typename It> It getNext(It it) const
     
    9292    InEdgeIt& next(InEdgeIt& it) const
    9393    { if(!((++it.n)%NodeNum)) it.n=-1; return it; }
    94     EdgeIt& next(EdgeIt& it) const { --it.n; return it; }
    95 
    96     int id(Node v) const { return v.n; }
    97     int id(Edge e) const { return e.n; }
     94    static EdgeIt& next(EdgeIt& it) const { --it.n; return it; }
     95
     96    static int id(Node v) const { return v.n; }
     97    static int id(Edge e) const { return e.n; }
    9898
    9999    class Node {
  • src/hugo/list_graph.h

    r706 r710  
    138138    Node bNode(InEdgeIt e) const { return edges[e.n].tail; }
    139139
    140     NodeIt& first(NodeIt& v) const {
     140    static NodeIt& first(NodeIt& v) const {
    141141      v=NodeIt(*this); return v; }
    142     EdgeIt& first(EdgeIt& e) const {
     142    static EdgeIt& first(EdgeIt& e) const {
    143143      e=EdgeIt(*this); return e; }
    144     OutEdgeIt& first(OutEdgeIt& e, const Node v) const {
     144    static OutEdgeIt& first(OutEdgeIt& e, const Node v) const {
    145145      e=OutEdgeIt(*this,v); return e; }
    146     InEdgeIt& first(InEdgeIt& e, const Node v) const {
     146    static InEdgeIt& first(InEdgeIt& e, const Node v) const {
    147147      e=InEdgeIt(*this,v); return e; }
    148148
     
    153153//     It first(Node v) const { It e; first(e,v); return e; }
    154154
    155     bool valid(Edge e) const { return e.n!=-1; }
    156     bool valid(Node n) const { return n.n!=-1; }
    157    
    158     void setInvalid(Edge &e) { e.n=-1; }
    159     void setInvalid(Node &n) { n.n=-1; }
    160    
    161     template <typename It> It getNext(It it) const
     155    static bool valid(Edge e) const { return e.n!=-1; }
     156    static bool valid(Node n) const { return n.n!=-1; }
     157   
     158    static void setInvalid(Edge &e) { e.n=-1; }
     159    static void setInvalid(Node &n) { n.n=-1; }
     160   
     161    template <typename It> static It getNext(It it) const
    162162    { It tmp(it); return next(tmp); }
    163163
     
    184184    }
    185185
    186     int id(Node v) const { return v.n; }
    187     int id(Edge e) const { return e.n; }
     186    static int id(Node v) const { return v.n; }
     187    static int id(Edge e) const { return e.n; }
    188188
    189189    /// Adds a new node to the graph.
     
    628628    ///Returns the oppositely directed
    629629    ///pair of the edge \c e.
    630     Edge opposite(Edge e) const
     630    static Edge opposite(Edge e) const
    631631    {
    632632      Edge f;
Note: See TracChangeset for help on using the changeset viewer.