COIN-OR::LEMON - Graph Library

Changeset 955:7f6e2bd76654 in lemon


Ignore:
Timestamp:
03/17/10 12:35:52 (10 years ago)
Author:
Balazs Dezso <deba@…>
Branch:
default
Phase:
public
Message:

Fix multiple executions in matchings (fract. mathcings) (#356)

Location:
lemon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/fractional_matching.h

    r951 r955  
    11671167      }
    11681168
     1169      _delta1->clear();
     1170      _delta2->clear();
     1171      _delta3->clear();
     1172      _tree_set->clear();
     1173
    11691174      for (NodeIt n(_graph); n != INVALID; ++n) {
    11701175        Value max = 0;
     
    19061911      }
    19071912
     1913      _delta2->clear();
     1914      _delta3->clear();
     1915      _tree_set->clear();
     1916
    19081917      for (NodeIt n(_graph); n != INVALID; ++n) {
    19091918        Value max = - std::numeric_limits<Value>::max();
  • lemon/matching.h

    r954 r955  
    16761676    void fractionalInit() {
    16771677      createStructures();
     1678
     1679      _blossom_node_list.clear();
     1680      _blossom_potential.clear();
    16781681     
    16791682      if (_fractional == 0) {
     
    16971700
    16981701      _unmatched = 0;
     1702
     1703      _delta1->clear();
     1704      _delta2->clear();
     1705      _delta3->clear();
     1706      _delta4->clear();
     1707      _blossom_set->clear();
     1708      _tree_set->clear();
    16991709
    17001710      int index = 0;
     
    17031713        (*_node_index)[n] = index;
    17041714        (*_node_data)[index].pot = pot;
     1715        (*_node_data)[index].heap_index.clear();
     1716        (*_node_data)[index].heap.clear();
    17051717        int blossom =
    17061718          _blossom_set->insert(n, std::numeric_limits<Value>::max());
     
    30813093    void fractionalInit() {
    30823094      createStructures();
     3095
     3096      _blossom_node_list.clear();
     3097      _blossom_potential.clear();
    30833098     
    30843099      if (_fractional == 0) {
     
    31023117
    31033118      _unmatched = 0;
     3119
     3120      _delta2->clear();
     3121      _delta3->clear();
     3122      _delta4->clear();
     3123      _blossom_set->clear();
     3124      _tree_set->clear();
    31043125
    31053126      int index = 0;
     
    31083129        (*_node_index)[n] = index;
    31093130        (*_node_data)[index].pot = pot;
     3131        (*_node_data)[index].heap_index.clear();
     3132        (*_node_data)[index].heap.clear();
    31103133        int blossom =
    31113134          _blossom_set->insert(n, std::numeric_limits<Value>::max());
Note: See TracChangeset for help on using the changeset viewer.