Mercurial > octave-nkf

comparison liboctave/MSparse.cc @ 11586:12df7854fa7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip trailing whitespace from source files
author John W. Eaton <jwe@octave.org>
date Thu, 20 Jan 2011 17:24:59 -0500
parents 57632dea2446
children 11c8b60f1b68
comparison
equal deleted inserted replaced
11585:1473d0cf86d2 11586:12df7854fa7c
52 if (a_nr != b_nr || a_nc != b_nc) 52 if (a_nr != b_nr || a_nc != b_nc)
53 gripe_nonconformant ("operator +=" , a_nr, a_nc, b_nr, b_nc); 53 gripe_nonconformant ("operator +=" , a_nr, a_nc, b_nr, b_nc);
54 else 54 else
55 { 55 {
56 r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ())); 56 r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ()));
57 57
58 octave_idx_type jx = 0; 58 octave_idx_type jx = 0;
59 for (octave_idx_type i = 0 ; i < a_nc ; i++) 59 for (octave_idx_type i = 0 ; i < a_nc ; i++)
60 { 60 {
61 octave_idx_type ja = a.cidx(i); 61 octave_idx_type ja = a.cidx(i);
62 octave_idx_type ja_max = a.cidx(i+1); 62 octave_idx_type ja_max = a.cidx(i+1);
63 bool ja_lt_max= ja < ja_max; 63 bool ja_lt_max= ja < ja_max;
64 64
65 octave_idx_type jb = b.cidx(i); 65 octave_idx_type jb = b.cidx(i);
66 octave_idx_type jb_max = b.cidx(i+1); 66 octave_idx_type jb_max = b.cidx(i+1);
67 bool jb_lt_max = jb < jb_max; 67 bool jb_lt_max = jb < jb_max;
68 68
69 while (ja_lt_max || jb_lt_max ) 69 while (ja_lt_max || jb_lt_max )
70 { 70 {
71 octave_quit (); 71 octave_quit ();
72 if ((! jb_lt_max) || 72 if ((! jb_lt_max) ||
73 (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) 73 (ja_lt_max && (a.ridx(ja) < b.ridx(jb))))
101 jb_lt_max= jb < jb_max; 101 jb_lt_max= jb < jb_max;
102 } 102 }
103 } 103 }
104 r.cidx(i+1) = jx; 104 r.cidx(i+1) = jx;
105 } 105 }
106 106
107 a = r.maybe_compress (); 107 a = r.maybe_compress ();
108 } 108 }
109 109
110 return a; 110 return a;
111 } 111 }
125 if (a_nr != b_nr || a_nc != b_nc) 125 if (a_nr != b_nr || a_nc != b_nc)
126 gripe_nonconformant ("operator -=" , a_nr, a_nc, b_nr, b_nc); 126 gripe_nonconformant ("operator -=" , a_nr, a_nc, b_nr, b_nc);
127 else 127 else
128 { 128 {
129 r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ())); 129 r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ()));
130 130
131 octave_idx_type jx = 0; 131 octave_idx_type jx = 0;
132 for (octave_idx_type i = 0 ; i < a_nc ; i++) 132 for (octave_idx_type i = 0 ; i < a_nc ; i++)
133 { 133 {
134 octave_idx_type ja = a.cidx(i); 134 octave_idx_type ja = a.cidx(i);
135 octave_idx_type ja_max = a.cidx(i+1); 135 octave_idx_type ja_max = a.cidx(i+1);
136 bool ja_lt_max= ja < ja_max; 136 bool ja_lt_max= ja < ja_max;
137 137
138 octave_idx_type jb = b.cidx(i); 138 octave_idx_type jb = b.cidx(i);
139 octave_idx_type jb_max = b.cidx(i+1); 139 octave_idx_type jb_max = b.cidx(i+1);
140 bool jb_lt_max = jb < jb_max; 140 bool jb_lt_max = jb < jb_max;
141 141
142 while (ja_lt_max || jb_lt_max ) 142 while (ja_lt_max || jb_lt_max )
143 { 143 {
144 octave_quit (); 144 octave_quit ();
145 if ((! jb_lt_max) || 145 if ((! jb_lt_max) ||
146 (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) 146 (ja_lt_max && (a.ridx(ja) < b.ridx(jb))))
174 jb_lt_max= jb < jb_max; 174 jb_lt_max= jb < jb_max;
175 } 175 }
176 } 176 }
177 r.cidx(i+1) = jx; 177 r.cidx(i+1) = jx;
178 } 178 }
179 179
180 a = r.maybe_compress (); 180 a = r.maybe_compress ();
181 } 181 }
182 182
183 return a; 183 return a;
184 } 184 }