Mercurial > octave

comparison liboctave/operators/Sparse-op-defs.h @ 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 1473547f50f5
children 47c76e56a1de
comparison
equal deleted inserted replaced
21561:4abcc0969ebd 21562:6c2fd62db1f7
378 \ 378 \
379 octave_idx_type jx = 0; \ 379 octave_idx_type jx = 0; \
380 r.cidx (0) = 0; \ 380 r.cidx (0) = 0; \
381 for (octave_idx_type i = 0 ; i < m1_nc ; i++) \ 381 for (octave_idx_type i = 0 ; i < m1_nc ; i++) \
382 { \ 382 { \
383 octave_idx_type ja = m1.cidx (i); \ 383 octave_idx_type ja = m1.cidx (i); \
384 octave_idx_type ja_max = m1.cidx (i+1); \ 384 octave_idx_type ja_max = m1.cidx (i+1); \
385 bool ja_lt_max= ja < ja_max; \ 385 bool ja_lt_max = ja < ja_max; \
386 \ 386 \
387 octave_idx_type jb = m2.cidx (i); \ 387 octave_idx_type jb = m2.cidx (i); \
388 octave_idx_type jb_max = m2.cidx (i+1); \ 388 octave_idx_type jb_max = m2.cidx (i+1); \
389 bool jb_lt_max = jb < jb_max; \ 389 bool jb_lt_max = jb < jb_max; \
390 \ 390 \
391 while (ja_lt_max || jb_lt_max) \ 391 while (ja_lt_max || jb_lt_max) \
392 { \ 392 { \
393 octave_quit (); \ 393 octave_quit (); \
486 \ 486 \
487 octave_idx_type jx = 0; \ 487 octave_idx_type jx = 0; \
488 r.cidx (0) = 0; \ 488 r.cidx (0) = 0; \
489 for (octave_idx_type i = 0 ; i < m1_nc ; i++) \ 489 for (octave_idx_type i = 0 ; i < m1_nc ; i++) \
490 { \ 490 { \
491 octave_idx_type ja = m1.cidx (i); \ 491 octave_idx_type ja = m1.cidx (i); \
492 octave_idx_type ja_max = m1.cidx (i+1); \ 492 octave_idx_type ja_max = m1.cidx (i+1); \
493 bool ja_lt_max= ja < ja_max; \ 493 bool ja_lt_max = ja < ja_max; \
494 \ 494 \
495 octave_idx_type jb = m2.cidx (i); \ 495 octave_idx_type jb = m2.cidx (i); \
496 octave_idx_type jb_max = m2.cidx (i+1); \ 496 octave_idx_type jb_max = m2.cidx (i+1); \
497 bool jb_lt_max = jb < jb_max; \ 497 bool jb_lt_max = jb < jb_max; \
498 \ 498 \
499 while (ja_lt_max || jb_lt_max) \ 499 while (ja_lt_max || jb_lt_max) \
500 { \ 500 { \
501 octave_quit (); \ 501 octave_quit (); \
602 /* FIXME: Kludge... Always double/Complex, so Complex () */ \ 602 /* FIXME: Kludge... Always double/Complex, so Complex () */ \
603 r = R (m1_nr, m1_nc, (Complex () OP Complex ())); \ 603 r = R (m1_nr, m1_nc, (Complex () OP Complex ())); \
604 \ 604 \
605 for (octave_idx_type i = 0 ; i < m1_nc ; i++) \ 605 for (octave_idx_type i = 0 ; i < m1_nc ; i++) \
606 { \ 606 { \
607 octave_idx_type ja = m1.cidx (i); \ 607 octave_idx_type ja = m1.cidx (i); \
608 octave_idx_type ja_max = m1.cidx (i+1); \ 608 octave_idx_type ja_max = m1.cidx (i+1); \
609 bool ja_lt_max= ja < ja_max; \ 609 bool ja_lt_max = ja < ja_max; \
610 \ 610 \
611 octave_idx_type jb = m2.cidx (i); \ 611 octave_idx_type jb = m2.cidx (i); \
612 octave_idx_type jb_max = m2.cidx (i+1); \ 612 octave_idx_type jb_max = m2.cidx (i+1); \
613 bool jb_lt_max = jb < jb_max; \ 613 bool jb_lt_max = jb < jb_max; \
614 \ 614 \
615 while (ja_lt_max || jb_lt_max) \ 615 while (ja_lt_max || jb_lt_max) \
616 { \ 616 { \
617 octave_quit (); \ 617 octave_quit (); \
1756 \ 1756 \
1757 for (octave_idx_type i = 0; i < a_nc; i++) \ 1757 for (octave_idx_type i = 0; i < a_nc; i++) \
1758 { \ 1758 { \
1759 for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \ 1759 for (octave_idx_type j = a.cidx (i); j < a.cidx (i+1); j++) \
1760 { \ 1760 { \
1761 octave_idx_type col = a.ridx (j); \ 1761 octave_idx_type col = a.ridx (j); \
1762 for (octave_idx_type k = m.cidx (col) ; k < m.cidx (col+1); k++) \ 1762 for (octave_idx_type k = m.cidx (col) ; k < m.cidx (col+1); k++) \
1763 { \ 1763 { \
1764 if (w[m.ridx (k)] < i + 1) \ 1764 if (w[m.ridx (k)] < i + 1) \
1765 { \ 1765 { \
1766 w[m.ridx (k)] = i + 1; \ 1766 w[m.ridx (k)] = i + 1; \