Changeset 876:7f6e2bd76654 in lemon-1.2 for lemon

Timestamp:

03/17/10 12:35:52 (15 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

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

Location:

lemon

Files:

• fractional_matching.h (modified) (2 diffs)
• matching.h (modified) (6 diffs)

lemon/fractional_matching.h

@@ -1167 +1167 @@
       }
 
+      _delta1->clear();
+      _delta2->clear();
+      _delta3->clear();
+      _tree_set->clear();
+
       for (NodeIt n(_graph); n != INVALID; ++n) {
         Value max = 0;
@@ -1906 +1911 @@
       }
 
+      _delta2->clear();
+      _delta3->clear();
+      _tree_set->clear();
+
       for (NodeIt n(_graph); n != INVALID; ++n) {
         Value max = - std::numeric_limits<Value>::max();

lemon/matching.h

@@ -1676 +1676 @@
     void fractionalInit() {
       createStructures();
+
+      _blossom_node_list.clear();
+      _blossom_potential.clear();
       
       if (_fractional == 0) {
@@ -1697 +1700 @@
 
       _unmatched = 0;
+
+      _delta1->clear();
+      _delta2->clear();
+      _delta3->clear();
+      _delta4->clear();
+      _blossom_set->clear();
+      _tree_set->clear();
 
       int index = 0;
@@ -1703 +1713 @@
         (*_node_index)[n] = index;
         (*_node_data)[index].pot = pot;
+        (*_node_data)[index].heap_index.clear();
+        (*_node_data)[index].heap.clear();
         int blossom =
           _blossom_set->insert(n, std::numeric_limits<Value>::max());
@@ -3081 +3093 @@
     void fractionalInit() {
       createStructures();
+
+      _blossom_node_list.clear();
+      _blossom_potential.clear();
       
       if (_fractional == 0) {
@@ -3102 +3117 @@
 
       _unmatched = 0;
+
+      _delta2->clear();
+      _delta3->clear();
+      _delta4->clear();
+      _blossom_set->clear();
+      _tree_set->clear();
 
       int index = 0;
@@ -3108 +3129 @@
         (*_node_index)[n] = index;
         (*_node_data)[index].pot = pot;
+        (*_node_data)[index].heap_index.clear();
+        (*_node_data)[index].heap.clear();
         int blossom =
           _blossom_set->insert(n, std::numeric_limits<Value>::max());