Changeset 877:141f9c0db4a3 in lemon-1.2 for lemon/matching.h

Timestamp:

03/06/10 15:35:12 (14 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

878:f802439d2b58, 880:38213abd2911, 909:f112c18bc304

Phase:

public

Message:

Unify the sources (#339)

File:

• lemon/matching.h (modified) (11 diffs)

lemon/matching.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2010
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -1624 +1624 @@
         (*_delta4_index)[i] = _delta4->PRE_HEAP;
       }
-      
+
       _unmatched = _node_num;
 
@@ -1679 +1679 @@
       _blossom_node_list.clear();
       _blossom_potential.clear();
-      
+
       if (_fractional == 0) {
         _fractional = new FractionalMatching(_graph, _weight, false);
@@ -1751 +1751 @@
             subblossoms[--num] = _blossom_set->find(v);
             _delta1->push(v, _fractional->nodeValue(v));
-            v = _graph.target(_fractional->matching(v));            
+            v = _graph.target(_fractional->matching(v));
           }
-          
-          int surface = 
+
+          int surface =
             _blossom_set->join(subblossoms.begin(), subblossoms.end());
           (*_blossom_data)[surface].status = EVEN;
@@ -1761 +1761 @@
           (*_blossom_data)[surface].pot = 0;
           (*_blossom_data)[surface].offset = 0;
-          
+
           _tree_set->insert(surface);
           ++_unmatched;
@@ -1811 +1811 @@
           }
         }
-            
+
         if (!(*_node_data)[ni].heap.empty()) {
           _blossom_set->decrease(n, (*_node_data)[ni].heap.prio());
@@ -2270 +2270 @@
     int _unmatched;
 
-    typedef MaxWeightedPerfectFractionalMatching<Graph, WeightMap> 
+    typedef MaxWeightedPerfectFractionalMatching<Graph, WeightMap>
     FractionalMatching;
     FractionalMatching *_fractional;
@@ -3096 +3096 @@
       _blossom_node_list.clear();
       _blossom_potential.clear();
-      
+
       if (_fractional == 0) {
         _fractional = new FractionalMatching(_graph, _weight, false);
@@ -3162 +3162 @@
           while (n != v) {
             subblossoms[--num] = _blossom_set->find(v);
-            v = _graph.target(_fractional->matching(v));            
+            v = _graph.target(_fractional->matching(v));
           }
-          
-          int surface = 
+
+          int surface =
             _blossom_set->join(subblossoms.begin(), subblossoms.end());
           (*_blossom_data)[surface].status = EVEN;
@@ -3172 +3172 @@
           (*_blossom_data)[surface].pot = 0;
           (*_blossom_data)[surface].offset = 0;
-          
+
           _tree_set->insert(surface);
           ++_unmatched;
@@ -3222 +3222 @@
           }
         }
-            
+
         if (!(*_node_data)[ni].heap.empty()) {
           _blossom_set->decrease(n, (*_node_data)[ni].heap.prio());