Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/bipartite_matching.h

Timestamp:

03/02/07 19:04:28 (16 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3217

Message:

Hard Warning checking

• based on the remark of the ZIB user
• we do not use -Winline

File:

• lemon/bipartite_matching.h (modified) (18 diffs)

lemon/bipartite_matching.h

@@ -116 +116 @@
     /// It initalizes the data structures with an initial matching.
     template <typename MatchingMap>
-    void matchingInit(const MatchingMap& matching) {
+    void matchingInit(const MatchingMap& mm) {
       for (ANodeIt it(*graph); it != INVALID; ++it) {
         anode_matching[it] = INVALID;
@@ -125 +125 @@
       matching_size = 0;
       for (UEdgeIt it(*graph); it != INVALID; ++it) {
-        if (matching[it]) {
+        if (mm[it]) {
           ++matching_size;
           anode_matching[graph->aNode(it)] = it;
@@ -138 +138 @@
     /// \return %True when the given map contains really a matching.
     template <typename MatchingMap>
-    void checkedMatchingInit(const MatchingMap& matching) {
+    void checkedMatchingInit(const MatchingMap& mm) {
       for (ANodeIt it(*graph); it != INVALID; ++it) {
         anode_matching[it] = INVALID;
@@ -147 +147 @@
       matching_size = 0;
       for (UEdgeIt it(*graph); it != INVALID; ++it) {
-        if (matching[it]) {
+        if (mm[it]) {
           ++matching_size;
           if (anode_matching[graph->aNode(it)] != INVALID) {
@@ -188 +188 @@
       while (!success && !queue.empty()) {
         std::vector<Node> newqueue;
-        for (int i = 0; i < (int)queue.size(); ++i) {
+        for (int i = 0; i < int(queue.size()); ++i) {
           Node anode = queue[i];
           for (IncEdgeIt jt(*graph, anode); jt != INVALID; ++jt) {
@@ -214 +214 @@
         typename Graph::template ANodeMap<bool> aused(*graph, false);
         
-        for (int i = 0; i < (int)bqueue.size(); ++i) {
+        for (int i = 0; i < int(bqueue.size()); ++i) {
           Node bnode = bqueue[i];
 
@@ -280 +280 @@
       while (!queue.empty()) {
         std::vector<Node> newqueue;
-        for (int i = 0; i < (int)queue.size(); ++i) {
+        for (int i = 0; i < int(queue.size()); ++i) {
           Node anode = queue[i];
           for (IncEdgeIt jt(*graph, anode); jt != INVALID; ++jt) {
@@ -364 +364 @@
       while (!queue.empty()) {
         std::vector<Node> newqueue;
-        for (int i = 0; i < (int)queue.size(); ++i) {
+        for (int i = 0; i < int(queue.size()); ++i) {
           Node anode = queue[i];
           for (IncEdgeIt jt(*graph, anode); jt != INVALID; ++jt) {
@@ -404 +404 @@
     /// \return The number of the matching edges.
     template <typename MatchingMap>
-    int quickMatching(MatchingMap& matching) const {
+    int quickMatching(MatchingMap& mm) const {
       for (ANodeIt it(*graph); it != INVALID; ++it) {
         if (anode_matching[it] != INVALID) {
-          matching[anode_matching[it]] = true;
+          mm[anode_matching[it]] = true;
         }
       }
@@ -418 +418 @@
     /// \return The number of the matching edges.
     template <typename MatchingMap>
-    int matching(MatchingMap& matching) const {
+    int matching(MatchingMap& mm) const {
       for (UEdgeIt it(*graph); it != INVALID; ++it) {
-        matching[it] = it == anode_matching[graph->aNode(it)];
+        mm[it] = it == anode_matching[graph->aNode(it)];
       }
       return matching_size;
@@ -684 +684 @@
     /// automatically allocated map, of course.
     /// \return \c (*this)
-    MaxWeightedBipartiteMatching& heap(Heap& heap, HeapCrossRef &crossRef) {
+    MaxWeightedBipartiteMatching& heap(Heap& hp, HeapCrossRef &cr) {
       if(local_heap_cross_ref) {
         delete _heap_cross_ref;
         local_heap_cross_ref = false;
       }
-      _heap_cross_ref = &crossRef;
+      _heap_cross_ref = &cr;
       if(local_heap) {
         delete _heap;
         local_heap = false;
       }
-      _heap = &heap;
+      _heap = &hp;
       return *this;
     }
@@ -890 +890 @@
     /// for each edges. 
     template <typename PotentialMap>
-    void potential(PotentialMap& potential) const {
-      for (ANodeIt it(*graph); it != INVALID; ++it) {
-        potential[it] = anode_potential[it];
+    void potential(PotentialMap& pt) const {
+      for (ANodeIt it(*graph); it != INVALID; ++it) {
+        pt[it] = anode_potential[it];
       }
       for (BNodeIt it(*graph); it != INVALID; ++it) {
-        potential[it] = bnode_potential[it];
+        pt[it] = bnode_potential[it];
       }
     }
@@ -905 +905 @@
     /// \return The number of the matching edges.
     template <typename MatchingMap>
-    int quickMatching(MatchingMap& matching) const {
+    int quickMatching(MatchingMap& mm) const {
       for (ANodeIt it(*graph); it != INVALID; ++it) {
         if (anode_matching[it] != INVALID) {
-          matching[anode_matching[it]] = true;
+          mm[anode_matching[it]] = true;
         }
       }
@@ -919 +919 @@
     /// \return The number of the matching edges.
     template <typename MatchingMap>
-    int matching(MatchingMap& matching) const {
+    int matching(MatchingMap& mm) const {
       for (UEdgeIt it(*graph); it != INVALID; ++it) {
-        matching[it] = it == anode_matching[graph->aNode(it)];
+        mm[it] = it == anode_matching[graph->aNode(it)];
       }
       return matching_size;
@@ -1255 +1255 @@
     /// automatically allocated map, of course.
     /// \return \c (*this)
-    MinCostMaxBipartiteMatching& heap(Heap& heap, HeapCrossRef &crossRef) {
+    MinCostMaxBipartiteMatching& heap(Heap& hp, HeapCrossRef &cr) {
       if(local_heap_cross_ref) {
         delete _heap_cross_ref;
         local_heap_cross_ref = false;
       }
-      _heap_cross_ref = &crossRef;
+      _heap_cross_ref = &cr;
       if(local_heap) {
         delete _heap;
         local_heap = false;
       }
-      _heap = &heap;
+      _heap = &hp;
       return *this;
     }
@@ -1443 +1443 @@
     /// for each edges.
     template <typename PotentialMap>
-    void potential(PotentialMap& potential) const {
-      for (ANodeIt it(*graph); it != INVALID; ++it) {
-        potential[it] = anode_potential[it];
+    void potential(PotentialMap& pt) const {
+      for (ANodeIt it(*graph); it != INVALID; ++it) {
+        pt[it] = anode_potential[it];
       }
       for (BNodeIt it(*graph); it != INVALID; ++it) {
-        potential[it] = bnode_potential[it];
+        pt[it] = bnode_potential[it];
       }
     }
@@ -1458 +1458 @@
     /// \return The number of the matching edges.
     template <typename MatchingMap>
-    int quickMatching(MatchingMap& matching) const {
+    int quickMatching(MatchingMap& mm) const {
       for (ANodeIt it(*graph); it != INVALID; ++it) {
         if (anode_matching[it] != INVALID) {
-          matching[anode_matching[it]] = true;
+          mm[anode_matching[it]] = true;
         }
       }
@@ -1472 +1472 @@
     /// \return The number of the matching edges.
     template <typename MatchingMap>
-    int matching(MatchingMap& matching) const {
+    int matching(MatchingMap& mm) const {
       for (UEdgeIt it(*graph); it != INVALID; ++it) {
-        matching[it] = it == anode_matching[graph->aNode(it)];
+        mm[it] = it == anode_matching[graph->aNode(it)];
       }
       return matching_size;