Index: src/DLD-FUNCTIONS/symrcm.cc =================================================================== RCS file: /cvs/octave/src/DLD-FUNCTIONS/symrcm.cc,v retrieving revision 1.2 diff -c -p -c -r1.2 symrcm.cc *** src/DLD-FUNCTIONS/symrcm.cc 9 May 2007 02:28:40 -0000 1.2 --- src/DLD-FUNCTIONS/symrcm.cc 25 May 2007 09:58:34 -0000 *************** Mathematics, ISBN 0-13-165274-5, 1981.\n *** 280,286 **** { // locate an unvisited starting node of the graph for (i = 0; i < N; i++) ! if (not visit[i]) break; // locate a probably better starting node --- 280,286 ---- { // locate an unvisited starting node of the graph for (i = 0; i < N; i++) ! if (! visit[i]) break; // locate a probably better starting node *************** Mathematics, ISBN 0-13-165274-5, 1981.\n *** 303,309 **** // the root is the first/only node on level 0 level_N = 1; ! while (not Q_empty (Q, N, qh, qt)) { v = Q_deq (Q, N, qh, qt); i = v.id; --- 303,309 ---- // the root is the first/only node on level 0 level_N = 1; ! while (! Q_empty (Q, N, qh, qt)) { v = Q_deq (Q, N, qh, qt); i = v.id; *************** Mathematics, ISBN 0-13-165274-5, 1981.\n *** 330,336 **** if (j1 == cidx[i+1]) { octave_idx_type r2 = ridx2[j2++]; ! if (not visit[r2]) { // the distance of node j is dist(i)+1 w.id = r2; --- 330,336 ---- if (j1 == cidx[i+1]) { octave_idx_type r2 = ridx2[j2++]; ! if (! visit[r2]) { // the distance of node j is dist(i)+1 w.id = r2; *************** Mathematics, ISBN 0-13-165274-5, 1981.\n *** 343,349 **** else if (j2 == cidx2[i+1]) { octave_idx_type r1 = ridx[j1++]; ! if (not visit[r1]) { w.id = r1; w.deg = D[r1]; --- 343,349 ---- else if (j2 == cidx2[i+1]) { octave_idx_type r1 = ridx[j1++]; ! if (! visit[r1]) { w.id = r1; w.deg = D[r1]; *************** Mathematics, ISBN 0-13-165274-5, 1981.\n *** 358,364 **** octave_idx_type r2 = ridx2[j2]; if (r1 <= r2) { ! if (not visit[r1]) { w.id = r1; w.deg = D[r1]; --- 358,364 ---- octave_idx_type r2 = ridx2[j2]; if (r1 <= r2) { ! if (! visit[r1]) { w.id = r1; w.deg = D[r1]; *************** Mathematics, ISBN 0-13-165274-5, 1981.\n *** 372,378 **** } else { ! if (not visit[r2]) { w.id = r2; w.deg = D[r2]; --- 372,378 ---- } else { ! if (! visit[r2]) { w.id = r2; w.deg = D[r2]; *************** Mathematics, ISBN 0-13-165274-5, 1981.\n *** 386,392 **** } // add the neighbors to the queue (sorted by node degree) ! while (not H_empty(S, s)) { OCTAVE_QUIT; --- 386,392 ---- } // add the neighbors to the queue (sorted by node degree) ! while (! H_empty(S, s)) { OCTAVE_QUIT; *************** find_starting_node(octave_idx_type N, co *** 564,570 **** for (;;) { ! while (not Q_empty(Q, N, qh, qt)) { v = Q_deq(Q, N, qh, qt); --- 564,570 ---- for (;;) { ! while (! Q_empty(Q, N, qh, qt)) { v = Q_deq(Q, N, qh, qt); *************** find_starting_node(octave_idx_type N, co *** 583,589 **** if (j1 == cidx[i+1]) { octave_idx_type r2 = ridx2[j2++]; ! if (not visit[r2]) { // the distance of node j is dist(i)+1 w.id = r2; --- 583,589 ---- if (j1 == cidx[i+1]) { octave_idx_type r2 = ridx2[j2++]; ! if (! visit[r2]) { // the distance of node j is dist(i)+1 w.id = r2; *************** find_starting_node(octave_idx_type N, co *** 599,605 **** else if (j2 == cidx2[i+1]) { octave_idx_type r1 = ridx[j1++]; ! if (not visit[r1]) { // the distance of node j is dist(i)+1 w.id = r1; --- 599,605 ---- else if (j2 == cidx2[i+1]) { octave_idx_type r1 = ridx[j1++]; ! if (! visit[r1]) { // the distance of node j is dist(i)+1 w.id = r1; *************** find_starting_node(octave_idx_type N, co *** 618,624 **** octave_idx_type r2 = ridx2[j2]; if (r1 <= r2) { ! if (not visit[r1]) { w.id = r1; w.deg = D[r1]; --- 618,624 ---- octave_idx_type r2 = ridx2[j2]; if (r1 <= r2) { ! if (! visit[r1]) { w.id = r1; w.deg = D[r1]; *************** find_starting_node(octave_idx_type N, co *** 635,641 **** } else { ! if (not visit[r2]) { w.id = r2; w.deg = D[r2]; --- 635,641 ---- } else { ! if (! visit[r2]) { w.id = r2; w.deg = D[r2];