Mercurial > hg > octave-nkf

comparison liboctave/Sparse-perm-op-defs.h @ 10142:829e69ec3110

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make OCTAVE_QUIT a function
author Jaroslav Hajek <highegg@gmail.com>
date Wed, 20 Jan 2010 10:38:00 +0100
parents 91d53dc37f79
children cbc402e64d83
comparison
equal deleted inserted replaced
10141:e409546ac0a8 10142:829e69ec3110
34 const octave_idx_type nent = a.nnz (); 34 const octave_idx_type nent = a.nnz ();
35 SM r (nr, nc, nent); 35 SM r (nr, nc, nent);
36 36
37 for (octave_idx_type k = 0; k < nent; ++k) 37 for (octave_idx_type k = 0; k < nent; ++k)
38 { 38 {
39 OCTAVE_QUIT; 39 octave_quit ();
40 r.xridx (k) = pcol[a.ridx (k)]; 40 r.xridx (k) = pcol[a.ridx (k)];
41 r.xdata (k) = a.data (k); 41 r.xdata (k) = a.data (k);
42 } 42 }
43 for (octave_idx_type j = 0; j <= nc; ++j) 43 for (octave_idx_type j = 0; j <= nc; ++j)
44 r.xcidx (j) = a.cidx (j); 44 r.xcidx (j) = a.cidx (j);
92 r.xcidx (nc) = nent; 92 r.xcidx (nc) = nent;
93 93
94 octave_idx_type k_src = 0; 94 octave_idx_type k_src = 0;
95 for (octave_idx_type j_src = 0; j_src < nc; ++j_src) 95 for (octave_idx_type j_src = 0; j_src < nc; ++j_src)
96 { 96 {
97 OCTAVE_QUIT; 97 octave_quit ();
98 const octave_idx_type j = prow[j_src]; 98 const octave_idx_type j = prow[j_src];
99 const octave_idx_type kend_src = a.cidx (j_src + 1); 99 const octave_idx_type kend_src = a.cidx (j_src + 1);
100 for (k = r.xcidx (j); k_src < kend_src; ++k, ++k_src) 100 for (k = r.xcidx (j); k_src < kend_src; ++k, ++k_src)
101 { 101 {
102 r.xridx (k) = a.ridx (k_src); 102 r.xridx (k) = a.ridx (k_src);
127 assert (r.xcidx (nc) == nent); 127 assert (r.xcidx (nc) == nent);
128 128
129 octave_idx_type k = 0; 129 octave_idx_type k = 0;
130 for (octave_idx_type j = 0; j < nc; ++j) 130 for (octave_idx_type j = 0; j < nc; ++j)
131 { 131 {
132 OCTAVE_QUIT; 132 octave_quit ();
133 const octave_idx_type j_src = pcol[j]; 133 const octave_idx_type j_src = pcol[j];
134 octave_idx_type k_src; 134 octave_idx_type k_src;
135 const octave_idx_type kend_src = a.cidx (j_src + 1); 135 const octave_idx_type kend_src = a.cidx (j_src + 1);
136 for (k_src = a.cidx (j_src); k_src < kend_src; ++k_src, ++k) 136 for (k_src = a.cidx (j_src); k_src < kend_src; ++k_src, ++k)
137 { 137 {