COIN-OR::LEMON - Graph Library

Changeset 2417:113d381c9160 in lemon-0.x


Ignore:
Timestamp:
04/07/07 00:50:27 (13 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3249
Message:

Parameter reordering

Patch from Kovacs Peter

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/dimacs.h

    r2413 r2417  
    5555  ///
    5656  /// \author Marton Makai and Peter Kovacs
    57   template <typename Graph, typename SupplyMap,
    58     typename CapacityMap, typename CostMap>
     57  template <typename Graph, typename LowerMap,
     58    typename CapacityMap, typename CostMap,
     59    typename SupplyMap>
    5960  void readDimacs( std::istream& is,
    6061                   Graph &g,
    61                    SupplyMap& supply,
    62                    CapacityMap& lower,
     62                   LowerMap& lower,
    6363                   CapacityMap& capacity,
    64                    CostMap& cost )
     64                   CostMap& cost,
     65                   SupplyMap& supply )
    6566  {
    6667    g.clear();
  • tools/dim_to_lgf.cc

    r2413 r2417  
    117117  if (mincostflow) {
    118118    Graph graph;
     119    DoubleEdgeMap lower(graph), capacity(graph), cost(graph);
    119120    DoubleNodeMap supply(graph);
    120     DoubleEdgeMap lower(graph), capacity(graph), cost(graph);
    121     readDimacs(is, graph, supply, lower, capacity, cost);
     121    readDimacs(is, graph, lower, capacity, cost, supply);
    122122    GraphWriter<Graph>(os, graph).
    123123      writeNodeMap("supply", supply).
Note: See TracChangeset for help on using the changeset viewer.