COIN-OR::LEMON - Graph Library

Changeset 276:b38f4cfa76cf in lemon-0.x


Ignore:
Timestamp:
04/02/04 16:53:05 (20 years ago)
Author:
athos
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@389
Message:

suurballe fordulo es segfaultolo(!) valtozata

Location:
src
Files:
2 added
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • src/include/dijkstra.h

    r258 r276  
    206206        distance.set(v, oldvalue);
    207207       
    208         for(OutEdgeIt e(G,v); G.valid(e); G.next(e)) {
     208        for(OutEdgeIt e = G.template first<OutEdgeIt>(v);
     209            G.valid(e); G.next(e)) {
    209210          Node w=G.head(e);
    210211         
  • src/work/athos/graph_wrapper.h

    r275 r276  
    951951    typedef typename /*GraphWrapperSkeleton<GraphWrapper>*/
    952952    GraphWrapper::InEdgeIt OldInEdgeIt;
     953
     954    typedef typename /*GraphWrapperSkeleton<GraphWrapper>*/
     955    GraphWrapper::Edge OldEdge;
    953956  protected:
    954957    //const Graph* graph;
     
    993996        else
    994997          return (u.out_or_in || u.in!=v.in);
    995       }
     998      }
     999      operator OldEdge() {
     1000        if(out_or_in)
     1001          return out;
     1002        else
     1003          return in;
     1004      }
    9961005    };
    9971006
     
    12091218
    12101219    Number resCap(OldOutEdgeIt out) const {
    1211       return (capacity->get(out)-flow->get(out));
     1220      return ( (*capacity)[out] - (*flow)[out]);
    12121221    }
    12131222   
    12141223    Number resCap(OldInEdgeIt in) const {
    1215       return (flow->get(in));
     1224      return ( (*flow)[in] );
    12161225    }
    12171226
Note: See TracChangeset for help on using the changeset viewer.