Changeset 1092:dceba191c00d in lemon-main for lemon/nagamochi_ibaraki.h

Timestamp:

08/09/13 11:28:17 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

1093:fb1c7da561ce, 1165:e0ccc1f0268f

Phase:

public

Message:

Apply unify-sources.sh to the source tree

File:

• lemon/nagamochi_ibaraki.h (modified) (13 diffs)

lemon/nagamochi_ibaraki.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2010
+ * Copyright (C) 2003-2013
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -304 +304 @@
     //This is here to avoid a gcc-3.3 compilation error.
     //It should never be called.
-    NagamochiIbaraki() {} 
-    
+    NagamochiIbaraki() {}
+
   public:
 
@@ -415 +415 @@
         for (typename Graph::OutArcIt a(_graph, n); a != INVALID; ++a) {
           typename Graph::Node m = _graph.target(a);
-          
+
           if (!(n < m)) continue;
 
           (*_nodes)[n].sum += (*_capacity)[a];
           (*_nodes)[m].sum += (*_capacity)[a];
-          
+
           int c = (*_nodes)[m].curr_arc;
           if (c != -1 && _arcs[c ^ 1].target == n) {
@@ -426 +426 @@
           } else {
             _edges[index].capacity = (*_capacity)[a];
-            
+
             _arcs[index << 1].prev = -1;
             if ((*_nodes)[n].first_arc != -1) {
@@ -436 +436 @@
 
             (*_nodes)[m].curr_arc = (index << 1);
-            
+
             _arcs[(index << 1) | 1].prev = -1;
             if ((*_nodes)[m].first_arc != -1) {
@@ -444 +444 @@
             (*_nodes)[m].first_arc = ((index << 1) | 1);
             _arcs[(index << 1) | 1].target = n;
-            
+
             ++index;
           }
@@ -453 +453 @@
       _min_cut = std::numeric_limits<Value>::max();
 
-      for (typename Graph::Node n = _first_node; 
+      for (typename Graph::Node n = _first_node;
            n != INVALID; n = (*_nodes)[n].next) {
         if ((*_nodes)[n].sum < _min_cut) {
@@ -478 +478 @@
 
       _heap->clear();
-      for (typename Graph::Node n = _first_node; 
+      for (typename Graph::Node n = _first_node;
            n != INVALID; n = (*_nodes)[n].next) {
         (*_heap_cross_ref)[n] = Heap::PRE_HEAP;
@@ -498 +498 @@
         for (int a = (*_nodes)[n].first_arc; a != -1; a = _arcs[a].next) {
           switch (_heap->state(_arcs[a].target)) {
-          case Heap::PRE_HEAP: 
+          case Heap::PRE_HEAP:
             {
               Value nv = _edges[a >> 1].capacity;
@@ -564 +564 @@
             if (!merged) {
               for (int b = (*_nodes)[n].first_arc; b != -1; b = _arcs[b].next) {
-                (*_nodes)[_arcs[b].target].curr_arc = b;          
+                (*_nodes)[_arcs[b].target].curr_arc = b;
               }
               merged = true;
@@ -574 +574 @@
               if ((b ^ a) == 1) continue;
               typename Graph::Node o = _arcs[b].target;
-              int c = (*_nodes)[o].curr_arc; 
+              int c = (*_nodes)[o].curr_arc;
               if (c != -1 && _arcs[c ^ 1].target == n) {
                 _edges[c >> 1].capacity += _edges[b >> 1].capacity;
@@ -607 +607 @@
             } else {
               (*_nodes)[n].first_arc = _arcs[a].next;
-            }            
+            }
             if (_arcs[a].next != -1) {
               _arcs[_arcs[a].next].prev = _arcs[a].prev;
@@ -615 +615 @@
             (*_next_rep)[(*_nodes)[n].last_rep] = m;
             (*_nodes)[n].last_rep = (*_nodes)[m].last_rep;
-            
+
             if ((*_nodes)[m].prev != INVALID) {
               (*_nodes)[(*_nodes)[m].prev].next = (*_nodes)[m].next;