Mercurial > octave

comparison liboctave/array/Sparse.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 cfe11042fbc0
children ae4d7dfea337
comparison
equal deleted inserted replaced
21561:4abcc0969ebd 21562:6c2fd62db1f7
813 octave_idx_type old_nc = cols (); 813 octave_idx_type old_nc = cols ();
814 retval = Sparse<T> (new_nr, new_nc, new_nnz); 814 retval = Sparse<T> (new_nr, new_nc, new_nnz);
815 815
816 octave_idx_type kk = 0; 816 octave_idx_type kk = 0;
817 retval.xcidx (0) = 0; 817 retval.xcidx (0) = 0;
818 // quotient and remainder of i * old_nr divided by new_nr 818 // Quotient and remainder of i * old_nr divided by new_nr.
819 // Track them individually to avoid overflow (bug #42850). 819 // Track them individually to avoid overflow (bug #42850).
820 octave_idx_type i_old_qu = 0; 820 octave_idx_type i_old_qu = 0;
821 octave_idx_type i_old_rm = static_cast<octave_idx_type> (-old_nr); 821 octave_idx_type i_old_rm = static_cast<octave_idx_type> (-old_nr);
822 for (octave_idx_type i = 0; i < old_nc; i++) 822 for (octave_idx_type i = 0; i < old_nc; i++)
823 { 823 {
1778 } 1778 }
1779 1779
1780 } 1780 }
1781 else if (idx_j.is_colon ()) 1781 else if (idx_j.is_colon ())
1782 { 1782 {
1783 // This requires uncompressing columns, which is generally costly, 1783 // This requires uncompressing columns, which is generally costly,
1784 // so we rely on the efficient transpose to handle this. 1784 // so we rely on the efficient transpose to handle this.
1785 // It may still make sense to optimize some cases here. 1785 // It may still make sense to optimize some cases here.
1786 retval = transpose (); 1786 retval = transpose ();
1787 retval = retval.index (idx_vector::colon, idx_i); 1787 retval = retval.index (idx_vector::colon, idx_i);
1788 retval = retval.transpose (); 1788 retval = retval.transpose ();