COIN-OR::LEMON - Graph Library

Changeset 2617:5222a3c470ed in lemon-0.x


Ignore:
Timestamp:
07/22/08 13:29:57 (11 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3502
Message:

Backport bug fix for Id handling from hg changeset [e67acd83a9ca]

Location:
lemon
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • lemon/bpugraph_adaptor.h

    r2553 r2617  
    157157    int id(const UEdge& e) const { return graph->id(e); }
    158158
    159     Node fromNodeId(int ix) const { return graph->fromNodeId(ix); }
     159    Node nodeFromId(int ix) const { return graph->nodeFromId(ix); }
    160160    ANode nodeFromANodeId(int ix) const { return graph->nodeFromANodeId(ix); }
    161161    BNode nodeFromBNodeId(int ix) const { return graph->nodeFromBNodeId(ix); }
    162     Edge fromEdgeId(int ix) const { return graph->fromEdgeId(ix); }
    163     UEdge fromUEdgeId(int ix) const { return graph->fromUEdgeId(ix); }
     162    Edge edgeFromId(int ix) const { return graph->edgeFromId(ix); }
     163    UEdge uEdgeFromId(int ix) const { return graph->uEdgeFromId(ix); }
    164164
    165165    int maxNodeId() const { return graph->maxNodeId(); }
  • lemon/graph_adaptor.h

    r2553 r2617  
    114114    int id(const Edge& e) const { return graph->id(e); }
    115115
    116     Node fromNodeId(int ix) const {
    117       return graph->fromNodeId(ix);
    118     }
    119 
    120     Edge fromEdgeId(int ix) const {
    121       return graph->fromEdgeId(ix);
     116    Node nodeFromId(int ix) const {
     117      return graph->nodeFromId(ix);
     118    }
     119
     120    Edge edgeFromId(int ix) const {
     121      return graph->edgeFromId(ix);
    122122    }
    123123
  • lemon/ugraph_adaptor.h

    r2553 r2617  
    126126    int id(const UEdge& e) const { return graph->id(e); }
    127127
    128     Node fromNodeId(int ix) const {
    129       return graph->fromNodeId(ix);
    130     }
    131 
    132     Edge fromEdgeId(int ix) const {
    133       return graph->fromEdgeId(ix);
    134     }
    135 
    136     UEdge fromUEdgeId(int ix) const {
    137       return graph->fromUEdgeId(ix);
     128    Node nodeFromId(int ix) const {
     129      return graph->nodeFromId(ix);
     130    }
     131
     132    Edge edgeFromId(int ix) const {
     133      return graph->edgeFromId(ix);
     134    }
     135
     136    UEdge uEdgeFromId(int ix) const {
     137      return graph->uEdgeFromId(ix);
    138138    }
    139139
Note: See TracChangeset for help on using the changeset viewer.