Mercurial > octave

comparison liboctave/array/MSparse.cc @ 21562:6c2fd62db1f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Eliminate accidental double spaces in code. * make_int.cc, file-editor-tab.h, file-editor.cc, shortcut-manager.h, __contourc__.cc, cellfun.cc, debug.cc, errwarn.h, graphics.in.h, jit-ir.h, oct-stream.cc, quadcc.cc, qz.cc, sparse-xdiv.cc, symtab.cc, __init_fltk__.cc, ov-class.cc, ov-float.h, ov-scalar.h, op-int.h, CNDArray.cc, CSparse.cc, MSparse.cc, Sparse.cc, boolNDArray.cc, chNDArray.cc, dNDArray.cc, dSparse.cc, fCNDArray.cc, fNDArray.cc, int16NDArray.cc, int32NDArray.cc, int64NDArray.cc, int8NDArray.cc, intNDArray.cc, uint16NDArray.cc, uint32NDArray.cc, uint64NDArray.cc, uint8NDArray.cc, randgamma.h, randmtzig.h, randpoisson.c, randpoisson.h, Sparse-op-defs.h, oct-time.cc, kpse.cc, lo-array-errwarn.h, lo-ieee.h, del2.m, num2str.m, __isequal__.m, lookfor.m, hsv2rgb.m, colorspace_conversion_revert.m, fminbnd.m, create_pkgadddel.m, shading.m, struct2hdl.m, gallery.m, discrete_cdf.m, kolmogorov_smirnov_test.m, assert.m, datestr.m, classes.tst, jit.tst: Eliminate accidental double spaces in code.
author Rik <rik@octave.org>
date Wed, 30 Mar 2016 15:19:12 -0700
parents 538b57866b90
children 278fc29b69ca
comparison
equal deleted inserted replaced
21561:4abcc0969ebd 21562:6c2fd62db1f7
43 r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ())); 43 r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ()));
44 44
45 octave_idx_type jx = 0; 45 octave_idx_type jx = 0;
46 for (octave_idx_type i = 0 ; i < a_nc ; i++) 46 for (octave_idx_type i = 0 ; i < a_nc ; i++)
47 { 47 {
48 octave_idx_type ja = a.cidx (i); 48 octave_idx_type ja = a.cidx (i);
49 octave_idx_type ja_max = a.cidx (i+1); 49 octave_idx_type ja_max = a.cidx (i+1);
50 bool ja_lt_max= ja < ja_max; 50 bool ja_lt_max = ja < ja_max;
51 51
52 octave_idx_type jb = b.cidx (i); 52 octave_idx_type jb = b.cidx (i);
53 octave_idx_type jb_max = b.cidx (i+1); 53 octave_idx_type jb_max = b.cidx (i+1);
54 bool jb_lt_max = jb < jb_max; 54 bool jb_lt_max = jb < jb_max;
55 55
56 while (ja_lt_max || jb_lt_max) 56 while (ja_lt_max || jb_lt_max)
57 { 57 {
58 octave_quit (); 58 octave_quit ();
313 313
314 octave_idx_type jx = 0; 314 octave_idx_type jx = 0;
315 r.cidx (0) = 0; 315 r.cidx (0) = 0;
316 for (octave_idx_type i = 0 ; i < a_nc ; i++) 316 for (octave_idx_type i = 0 ; i < a_nc ; i++)
317 { 317 {
318 octave_idx_type ja = a.cidx (i); 318 octave_idx_type ja = a.cidx (i);
319 octave_idx_type ja_max = a.cidx (i+1); 319 octave_idx_type ja_max = a.cidx (i+1);
320 bool ja_lt_max= ja < ja_max; 320 bool ja_lt_max = ja < ja_max;
321 321
322 octave_idx_type jb = b.cidx (i); 322 octave_idx_type jb = b.cidx (i);
323 octave_idx_type jb_max = b.cidx (i+1); 323 octave_idx_type jb_max = b.cidx (i+1);
324 bool jb_lt_max = jb < jb_max; 324 bool jb_lt_max = jb < jb_max;
325 325
326 while (ja_lt_max || jb_lt_max) 326 while (ja_lt_max || jb_lt_max)
327 { 327 {
328 octave_quit (); 328 octave_quit ();
434 434
435 octave_idx_type jx = 0; 435 octave_idx_type jx = 0;
436 r.cidx (0) = 0; 436 r.cidx (0) = 0;
437 for (octave_idx_type i = 0 ; i < a_nc ; i++) 437 for (octave_idx_type i = 0 ; i < a_nc ; i++)
438 { 438 {
439 octave_idx_type ja = a.cidx (i); 439 octave_idx_type ja = a.cidx (i);
440 octave_idx_type ja_max = a.cidx (i+1); 440 octave_idx_type ja_max = a.cidx (i+1);
441 bool ja_lt_max= ja < ja_max; 441 bool ja_lt_max = ja < ja_max;
442 442
443 octave_idx_type jb = b.cidx (i); 443 octave_idx_type jb = b.cidx (i);
444 octave_idx_type jb_max = b.cidx (i+1); 444 octave_idx_type jb_max = b.cidx (i+1);
445 bool jb_lt_max = jb < jb_max; 445 bool jb_lt_max = jb < jb_max;
446 446
447 while (ja_lt_max || jb_lt_max) 447 while (ja_lt_max || jb_lt_max)
448 { 448 {
449 octave_quit (); 449 octave_quit ();
552 { 552 {
553 r = MSparse<T> (a_nr, a_nc, (Zero / Zero)); 553 r = MSparse<T> (a_nr, a_nc, (Zero / Zero));
554 554
555 for (octave_idx_type i = 0 ; i < a_nc ; i++) 555 for (octave_idx_type i = 0 ; i < a_nc ; i++)
556 { 556 {
557 octave_idx_type ja = a.cidx (i); 557 octave_idx_type ja = a.cidx (i);
558 octave_idx_type ja_max = a.cidx (i+1); 558 octave_idx_type ja_max = a.cidx (i+1);
559 bool ja_lt_max= ja < ja_max; 559 bool ja_lt_max = ja < ja_max;
560 560
561 octave_idx_type jb = b.cidx (i); 561 octave_idx_type jb = b.cidx (i);
562 octave_idx_type jb_max = b.cidx (i+1); 562 octave_idx_type jb_max = b.cidx (i+1);
563 bool jb_lt_max = jb < jb_max; 563 bool jb_lt_max = jb < jb_max;
564 564
565 while (ja_lt_max || jb_lt_max) 565 while (ja_lt_max || jb_lt_max)
566 { 566 {
567 octave_quit (); 567 octave_quit ();