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

Timestamp:

03/02/07 19:04:28 (17 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/nagamochi_ibaraki.h (modified) (10 diffs)

lemon/nagamochi_ibaraki.h

@@ -439 +439 @@
     /// automatically allocated map, of course.
     /// \return <tt> (*this) </tt>
-    MaxCardinalitySearch &heap(Heap& heap, HeapCrossRef &crossRef) {
+    MaxCardinalitySearch &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;
     }
@@ -1169 +1169 @@
     /// automatically allocated heap and cross reference, of course.
     /// \return <tt> (*this) </tt>
-    NagamochiIbaraki &heap(Heap& heap, HeapCrossRef &crossRef)
+    NagamochiIbaraki &heap(Heap& hp, HeapCrossRef &cr)
     {
       if (local_heap_cross_ref) {
@@ -1175 +1175 @@
         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;
     }
@@ -1319 +1319 @@
       }
 
-      if ((int)nodes.size() < _node_num) {
+      if (int(nodes.size()) < _node_num) {
         _aux_graph->clear();
         _node_num = 1;
         _cut.clear();
-        for (int i = 0; i < (int)nodes.size(); ++i) {
+        for (int i = 0; i < int(nodes.size()); ++i) {
           typename Graph::Node n = (*_first)[nodes[i]];
           while (n != INVALID) {
@@ -1361 +1361 @@
       }
 
-      if (ufe.size((typename Ufe::ClassIt)(ufe)) == _node_num) {
+      typedef typename Ufe::ClassIt UfeCIt;
+      if (ufe.size(UfeCIt(ufe)) == _node_num) {
         _aux_graph->clear();
         _node_num = 1;
@@ -1373 +1374 @@
         if (ufe.size(c) == 1) continue;
         for (typename Ufe::ItemIt r(ufe, c); r != INVALID; ++r) {
-          if ((Node)r == (Node)c) continue;
+          if (static_cast<Node>(r) == static_cast<Node>(c)) continue;
           _next->set((*_last)[c], (*_first)[r]);
           _last->set(c, (*_last)[r]);
@@ -1408 +1409 @@
       }
 
-      for (int i = 0; i < (int)remedges.size(); ++i) {
+      for (int i = 0; i < int(remedges.size()); ++i) {
         _aux_graph->erase(remedges[i]);
       }
@@ -1416 +1417 @@
       {
         int i = 0;
-        while (i < (int)addedges.size()) {
+        while (i < int(addedges.size())) {
           Node sn = addedges[i].source;
           Node tn = addedges[i].target;
           Value ec = addedges[i].capacity;
           ++i;
-          while (i < (int)addedges.size() && 
+          while (i < int(addedges.size()) && 
                  sn == addedges[i].source && tn == addedges[i].target) {
             ec += addedges[i].capacity;
@@ -1443 +1444 @@
       }
 
-      for (int i = 0; i < (int)remnodes.size(); ++i) {
+      for (int i = 0; i < int(remnodes.size()); ++i) {
         _aux_graph->erase(remnodes[i]);
       }
@@ -1501 +1502 @@
     template <typename NodeMap>
     Value quickMinCut(NodeMap& nodeMap) const { 
-      for (int i = 0; i < (int)_cut.size(); ++i) {
+      for (int i = 0; i < int(_cut.size()); ++i) {
         nodeMap.set(_cut[i], true);
       }