COIN-OR::LEMON - Graph Library

About

Downloads

Documentation

Development

Issue Tracker

Browse Tickets

Custom Query

Roadmap

Browse Source

Local Info

Mailing Lists

Search

Ticket #353: 353-195511e0b806.patch

File 353-195511e0b806.patch, 2.2 KB (added by Peter Kovacs, 15 years ago)

  • lemon/network_simplex.h 

    # HG changeset patch
# User Peter Kovacs <kpeter@inf.elte.hu>
# Date 1267689112 -3600
# Node ID 195511e0b8064180593e36496c957cc43e6a0d3c
# Parent  ab21ca0937458102b5a722069cf2bec2f82d3433
Separate two types in NetworkSimplex (#353)

This patch undos the misleading effects of the renamings
in [f3bc4e9b5f3a].

diff --git a/lemon/network_simplex.h b/lemon/network_simplex.h
    a b  
    166166    typedef std::vector<int> IntVector;
    167167    typedef std::vector<Value> ValueVector;
    168168    typedef std::vector<Cost> CostVector;
     169    typedef std::vector<char> CharVector;
    169170    typedef std::vector<char> BoolVector;
    170171    // Note: vector<char> is used instead of vector<bool> for efficiency reasons
    171172
    … …  
    215216    IntVector _last_succ;
    216217    IntVector _dirty_revs;
    217218    BoolVector _forward;
    218     BoolVector _state;
     219    CharVector _state;
    219220    int _root;
    220221
    221222    // Temporary data used in the current pivot iteration
    … …  
    246247      const IntVector  &_source;
    247248      const IntVector  &_target;
    248249      const CostVector &_cost;
    249       const BoolVector &_state;
     250      const CharVector &_state;
    250251      const CostVector &_pi;
    251252      int &_in_arc;
    252253      int _search_arc_num;
    … …  
    298299      const IntVector  &_source;
    299300      const IntVector  &_target;
    300301      const CostVector &_cost;
    301       const BoolVector &_state;
     302      const CharVector &_state;
    302303      const CostVector &_pi;
    303304      int &_in_arc;
    304305      int _search_arc_num;
    … …  
    337338      const IntVector  &_source;
    338339      const IntVector  &_target;
    339340      const CostVector &_cost;
    340       const BoolVector &_state;
     341      const CharVector &_state;
    341342      const CostVector &_pi;
    342343      int &_in_arc;
    343344      int _search_arc_num;
    … …  
    410411      const IntVector  &_source;
    411412      const IntVector  &_target;
    412413      const CostVector &_cost;
    413       const BoolVector &_state;
     414      const CharVector &_state;
    414415      const CostVector &_pi;
    415416      int &_in_arc;
    416417      int _search_arc_num;
    … …  
    513514      const IntVector  &_source;
    514515      const IntVector  &_target;
    515516      const CostVector &_cost;
    516       const BoolVector &_state;
     517      const CharVector &_state;
    517518      const CostVector &_pi;
    518519      int &_in_arc;
    519520      int _search_arc_num;