Mercurial > octave
changeset 21602:47c76e56a1de
maint: Remove extra space between end of statement and semicolon.
* bsxfun.cc, data.cc, gl-render.cc, graphics.cc, ls-mat4.h, amd.cc,
audioread.cc, ccolamd.cc, colamd.cc, eigs-base.cc, sparse-chol.cc,
sparse-dmsolve.cc, Sparse-op-defs.h, bicubic.m, sprandsym.m:
maint: Remove extra space between end of statement and semicolon.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 10 Apr 2016 20:45:01 -0700 |
| parents | 25fd18a15a6c |
| children | 37cbdf7bffa9 |
| files | libinterp/corefcn/bsxfun.cc libinterp/corefcn/data.cc libinterp/corefcn/gl-render.cc libinterp/corefcn/graphics.cc libinterp/corefcn/ls-mat4.h libinterp/dldfcn/amd.cc libinterp/dldfcn/audioread.cc libinterp/dldfcn/ccolamd.cc libinterp/dldfcn/colamd.cc liboctave/numeric/eigs-base.cc liboctave/numeric/sparse-chol.cc liboctave/numeric/sparse-dmsolve.cc liboctave/operators/Sparse-op-defs.h scripts/deprecated/bicubic.m scripts/sparse/sprandsym.m |
| diffstat | 15 files changed, 65 insertions(+), 66 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/bsxfun.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/libinterp/corefcn/bsxfun.cc Sun Apr 10 20:45:01 2016 -0700 @@ -438,7 +438,7 @@ BSXDEF(uint32NDArray); BSXDEF(uint64NDArray); - octave_value Ac ; + octave_value Ac; octave_value_list idxA; octave_value Bc; octave_value_list idxB;
--- a/libinterp/corefcn/data.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/libinterp/corefcn/data.cc Sun Apr 10 20:45:01 2016 -0700 @@ -5486,7 +5486,7 @@ int nargin = args.length (); if (nargin < 1 || nargin > 2) - print_usage () ; + print_usage (); int dim = 1; if (nargin == 2)
--- a/libinterp/corefcn/gl-render.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/libinterp/corefcn/gl-render.cc Sun Apr 10 20:45:01 2016 -0700 @@ -2934,7 +2934,7 @@ if (im_xmin < xmin) j0 += (xmin - im_xmin)/nor_dx + 1; if (im_xmax > xmax) - j1 -= (im_xmax - xmax)/nor_dx ; + j1 -= (im_xmax - xmax)/nor_dx; if (im_ymin < ymin) i0 += (ymin - im_ymin)/nor_dy + 1;
--- a/libinterp/corefcn/graphics.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/libinterp/corefcn/graphics.cc Sun Apr 10 20:45:01 2016 -0700 @@ -3803,7 +3803,7 @@ if (punits.compare ("inches")) { in2units = 1.0; - mm2units = 1 / 25.4 ; + mm2units = 1 / 25.4; } else if (punits.compare ("centimeters")) { @@ -7147,7 +7147,7 @@ if (xproperties.xlimmode_is ("auto")) { limits = xproperties.get_xlim ().matrix_value (); - FIX_LIMITS ; + FIX_LIMITS; get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'x'); @@ -7165,7 +7165,7 @@ if (xproperties.ylimmode_is ("auto")) { limits = xproperties.get_ylim ().matrix_value (); - FIX_LIMITS ; + FIX_LIMITS; get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'y'); @@ -7183,7 +7183,7 @@ if (xproperties.zlimmode_is ("auto")) { limits = xproperties.get_zlim ().matrix_value (); - FIX_LIMITS ; + FIX_LIMITS; get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'z'); @@ -7201,7 +7201,7 @@ if (xproperties.climmode_is ("auto")) { limits = xproperties.get_clim ().matrix_value (); - FIX_LIMITS ; + FIX_LIMITS; get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'c'); @@ -7232,7 +7232,7 @@ if (xproperties.alimmode_is ("auto")) { limits = xproperties.get_alim ().matrix_value (); - FIX_LIMITS ; + FIX_LIMITS; get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'a');
--- a/libinterp/corefcn/ls-mat4.h Sun Apr 10 20:18:22 2016 -0700 +++ b/libinterp/corefcn/ls-mat4.h Sun Apr 10 20:45:01 2016 -0700 @@ -42,6 +42,6 @@ extern bool save_mat_binary_data (std::ostream& os, const octave_value& tc, - const std::string& name) ; + const std::string& name); #endif
--- a/libinterp/dldfcn/amd.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/libinterp/dldfcn/amd.cc Sun Apr 10 20:45:01 2016 -0700 @@ -132,7 +132,7 @@ err_square_matrix_required ("amd", "S"); OCTAVE_LOCAL_BUFFER (double, Control, AMD_CONTROL); - AMD_NAME (_defaults) (Control) ; + AMD_NAME (_defaults) (Control); if (nargin > 1) { octave_scalar_map arg1 = args(1).xscalar_map_value ("amd: OPTS argument must be a scalar structure");
--- a/libinterp/dldfcn/audioread.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/libinterp/dldfcn/audioread.cc Sun Apr 10 20:45:01 2016 -0700 @@ -308,7 +308,7 @@ SF_INFO info; - memset (&info, 0, sizeof (info)) ; + memset (&info, 0, sizeof (info)); sf_count_t chunk_size = 0; @@ -361,7 +361,6 @@ else if (args(i).string_value () == "BitRate") ; // Quality is currently unused? - // // else if (args(i).string_value () == "Quality") // quality = args(i + 1).int_value () * 0.01; else if (args(i).string_value () == "Title")
--- a/libinterp/dldfcn/ccolamd.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/libinterp/dldfcn/ccolamd.cc Sun Apr 10 20:45:01 2016 -0700 @@ -285,7 +285,7 @@ // Order the columns (destroys A) if (! CCOLAMD_NAME () (n_row, n_col, Alen, A, p, knobs, stats, cmember)) { - CCOLAMD_NAME (_report) (stats) ; + CCOLAMD_NAME (_report) (stats); error ("ccolamd: internal error!"); } @@ -295,7 +295,7 @@ // Order the columns (destroys A) if (! CCOLAMD_NAME () (n_row, n_col, Alen, A, p, knobs, stats, 0)) { - CCOLAMD_NAME (_report) (stats) ; + CCOLAMD_NAME (_report) (stats); error ("ccolamd: internal error!"); } @@ -308,23 +308,23 @@ retval(0) = out_perm; - // print stats if spumoni > 0 + // print stats if spumoni > 0 if (spumoni > 0) - CCOLAMD_NAME (_report) (stats) ; + CCOLAMD_NAME (_report) (stats); // Return the stats vector if (nargout == 2) { NDArray out_stats (dim_vector (1, CCOLAMD_STATS)); for (octave_idx_type i = 0 ; i < CCOLAMD_STATS ; i++) - out_stats(i) = stats[i] ; + out_stats(i) = stats[i]; retval(1) = out_stats; // fix stats (5) and (6), for 1-based information on // jumbled matrix. note that this correction doesn't // occur if symamd returns FALSE - out_stats (CCOLAMD_INFO1) ++ ; - out_stats (CCOLAMD_INFO2) ++ ; + out_stats(CCOLAMD_INFO1)++; + out_stats(CCOLAMD_INFO2)++; } return retval; @@ -516,9 +516,9 @@ if (! CSYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats, &calloc, &free, cmember, -1)) { - CSYMAMD_NAME (_report) (stats) ; + CSYMAMD_NAME (_report)(stats); - error ("csymamd: internal error!") ; + error ("csymamd: internal error!"); } } else @@ -526,9 +526,9 @@ if (! CSYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats, &calloc, &free, 0, -1)) { - CSYMAMD_NAME (_report) (stats) ; + CSYMAMD_NAME (_report)(stats); - error ("csymamd: internal error!") ; + error ("csymamd: internal error!"); } } @@ -541,21 +541,21 @@ // print stats if spumoni > 0 if (spumoni > 0) - CSYMAMD_NAME (_report) (stats) ; + CSYMAMD_NAME (_report)(stats); // Return the stats vector if (nargout == 2) { NDArray out_stats (dim_vector (1, CCOLAMD_STATS)); for (octave_idx_type i = 0 ; i < CCOLAMD_STATS ; i++) - out_stats(i) = stats[i] ; + out_stats(i) = stats[i]; retval(1) = out_stats; // fix stats (5) and (6), for 1-based information on // jumbled matrix. note that this correction doesn't // occur if symamd returns FALSE - out_stats (CCOLAMD_INFO1) ++ ; - out_stats (CCOLAMD_INFO2) ++ ; + out_stats(CCOLAMD_INFO1)++; + out_stats(CCOLAMD_INFO2)++; } return retval;
--- a/libinterp/dldfcn/colamd.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/libinterp/dldfcn/colamd.cc Sun Apr 10 20:45:01 2016 -0700 @@ -64,7 +64,7 @@ if (P) // If P is present then compute Pinv, the inverse of P for (octave_idx_type k = 0 ; k < n ; k++) - Pinv[P[k]] = k ; + Pinv[P[k]] = k; for (octave_idx_type k = 0 ; k < n ; k++) { @@ -72,12 +72,12 @@ Parent[k] = n ; // parent of k is not yet known Flag[k] = k ; // mark node k as visited octave_idx_type kk = (P) ? P[k] // kth original, or permuted, column - : (k) ; - octave_idx_type p2 = cidx[kk+1] ; + : (k); + octave_idx_type p2 = cidx[kk+1]; for (octave_idx_type p = cidx[kk] ; p < p2 ; p++) { // A (i,k) is nonzero (original or permuted A) - octave_idx_type i = (Pinv) ? (Pinv[ridx[p]]) : (ridx[p]) ; + octave_idx_type i = (Pinv) ? (Pinv[ridx[p]]) : (ridx[p]); if (i < k) { // follow path from i to root of etree, stop at flagged node @@ -85,7 +85,7 @@ { // find parent of i if not yet determined if (Parent[i] == n) - Parent[i] = k ; + Parent[i] = k; Flag[i] = k ; // mark i as visited } } @@ -300,7 +300,7 @@ if (nel_User_knobs > 0) knobs[COLAMD_DENSE_ROW] = User_knobs(0); if (nel_User_knobs > 1) - knobs[COLAMD_DENSE_COL] = User_knobs(1) ; + knobs[COLAMD_DENSE_COL] = User_knobs(1); if (nel_User_knobs > 2) spumoni = static_cast<int> (User_knobs(2)); @@ -391,7 +391,7 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, stats, COLAMD_STATS); if (! COLAMD_NAME () (n_row, n_col, Alen, A, p, knobs, stats)) { - COLAMD_NAME (_report) (stats) ; + COLAMD_NAME (_report)(stats); error ("colamd: internal error!"); } @@ -421,21 +421,21 @@ // print stats if spumoni > 0 if (spumoni > 0) - COLAMD_NAME (_report) (stats) ; + COLAMD_NAME (_report)(stats); // Return the stats vector if (nargout == 2) { NDArray out_stats (dim_vector (1, COLAMD_STATS)); for (octave_idx_type i = 0 ; i < COLAMD_STATS ; i++) - out_stats(i) = stats[i] ; + out_stats(i) = stats[i]; retval(1) = out_stats; // fix stats (5) and (6), for 1-based information on // jumbled matrix. note that this correction doesn't // occur if symamd returns FALSE - out_stats (COLAMD_INFO1) ++ ; - out_stats (COLAMD_INFO2) ++ ; + out_stats(COLAMD_INFO1)++; + out_stats(COLAMD_INFO2)++; } return retval; @@ -587,9 +587,9 @@ if (! SYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats, &calloc, &free)) { - SYMAMD_NAME (_report) (stats) ; + SYMAMD_NAME (_report)(stats); - error ("symamd: internal error!") ; + error ("symamd: internal error!"); } // column elimination tree post-ordering @@ -609,21 +609,21 @@ // print stats if spumoni > 0 if (spumoni > 0) - SYMAMD_NAME (_report) (stats) ; + SYMAMD_NAME (_report)(stats); // Return the stats vector if (nargout == 2) { NDArray out_stats (dim_vector (1, COLAMD_STATS)); for (octave_idx_type i = 0 ; i < COLAMD_STATS ; i++) - out_stats(i) = stats[i] ; + out_stats(i) = stats[i]; retval(1) = out_stats; // fix stats (5) and (6), for 1-based information on // jumbled matrix. note that this correction doesn't // occur if symamd returns FALSE - out_stats (COLAMD_INFO1) ++ ; - out_stats (COLAMD_INFO2) ++ ; + out_stats(COLAMD_INFO1)++; + out_stats(COLAMD_INFO2)++; } return retval;
--- a/liboctave/numeric/eigs-base.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/liboctave/numeric/eigs-base.cc Sun Apr 10 20:45:01 2016 -0700 @@ -746,7 +746,7 @@ p = 20; if (p > n - 1) - p = n - 1 ; + p = n - 1; } if (k < 1 || k > n - 2) @@ -1024,7 +1024,7 @@ p = 20; if (p > n - 1) - p = n - 1 ; + p = n - 1; } if (p <= k || p >= n) @@ -1294,7 +1294,7 @@ p = 20; if (p > n - 1) - p = n - 1 ; + p = n - 1; } if (k <= 0 || k >= n - 1) @@ -1541,7 +1541,7 @@ p = 20; if (p > n - 1) - p = n - 1 ; + p = n - 1; } if (k <= 0 || k >= n - 1) @@ -1863,7 +1863,7 @@ p = 20; if (p > n - 1) - p = n - 1 ; + p = n - 1; } if (k <= 0 || k >= n - 1) @@ -2192,7 +2192,7 @@ p = 20; if (p > n - 1) - p = n - 1 ; + p = n - 1; } if (k <= 0 || k >= n - 1) @@ -2490,7 +2490,7 @@ p = 20; if (p > n - 1) - p = n - 1 ; + p = n - 1; } if (k <= 0 || k >= n - 1) @@ -2766,7 +2766,7 @@ p = 20; if (p > n - 1) - p = n - 1 ; + p = n - 1; } if (k <= 0 || k >= n - 1) @@ -3053,7 +3053,7 @@ p = 20; if (p > n - 1) - p = n - 1 ; + p = n - 1; } if (k <= 0 || k >= n - 1)
--- a/liboctave/numeric/sparse-chol.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/liboctave/numeric/sparse-chol.cc Sun Apr 10 20:45:01 2016 -0700 @@ -272,9 +272,9 @@ // use natural ordering if no q output parameter if (natural) { - cm->nmethods = 1 ; - cm->method[0].ordering = CHOLMOD_NATURAL ; - cm->postorder = false ; + cm->nmethods = 1; + cm->method[0].ordering = CHOLMOD_NATURAL; + cm->postorder = false; } cholmod_factor *Lfactor;
--- a/liboctave/numeric/sparse-dmsolve.cc Sun Apr 10 20:18:22 2016 -0700 +++ b/liboctave/numeric/sparse-dmsolve.cc Sun Apr 10 20:45:01 2016 -0700 @@ -83,12 +83,12 @@ if (r >= rst && r < rend) { B.xdata (nz) = A.data (p); - B.xridx (nz++) = r - rst ; + B.xridx (nz++) = r - rst; } } } - B.xcidx (cend - cst) = nz ; + B.xcidx (cend - cst) = nz; } else { @@ -114,7 +114,7 @@ if (r >= rst && r < rend) { X[r-rst] = A.data (p); - B.xridx (nz++) = r - rst ; + B.xridx (nz++) = r - rst; } } @@ -124,7 +124,7 @@ B.xdata (p) = X[B.xridx (p)]; } - B.xcidx (cend - cst) = nz ; + B.xcidx (cend - cst) = nz; } return B;
--- a/liboctave/operators/Sparse-op-defs.h Sun Apr 10 20:18:22 2016 -0700 +++ b/liboctave/operators/Sparse-op-defs.h Sun Apr 10 20:45:01 2016 -0700 @@ -1552,7 +1552,7 @@ octave_idx_type nel = 0; \ for (octave_idx_type i = 0; i < nr; i++) \ if (tmp[i] != EL_TYPE ()) \ - nel++ ; \ + nel++; \ retval = RET_TYPE (nr, static_cast<octave_idx_type> (1), nel); \ retval.cidx (0) = 0; \ retval.cidx (1) = nel; \ @@ -1579,7 +1579,7 @@ octave_idx_type nel = 0; \ for (octave_idx_type i = 0; i < nc; i++) \ if (tmp[i] != EL_TYPE ()) \ - nel++ ; \ + nel++; \ retval = RET_TYPE (static_cast<octave_idx_type> (1), nc, nel); \ retval.cidx (0) = 0; \ nel = 0; \
--- a/scripts/deprecated/bicubic.m Sun Apr 10 20:18:22 2016 -0700 +++ b/scripts/deprecated/bicubic.m Sun Apr 10 20:45:01 2016 -0700 @@ -88,7 +88,7 @@ z = x; [rz, cz] = size (z); elseif (nargin == 5 || nargin == 6) - [rz, cz] = size (z) ; + [rz, cz] = size (z); if (isvector (x) && isvector (y)) if (rz != length (y) || cz != length (x)) error ("bicubic: length of X and Y must match the size of Z"); @@ -187,7 +187,7 @@ p(:,1) = (6*(1-a))*p(:,2) - 3*p(:,3) + (6*a-2)*p(:,4); p(:,cz+2) = (6*(1-a))*p(:,cz+1) - 3*p(:,cz) + (6*a-2)*p(:,cz-1); - ## Calculte the C1(t) C2(t) C3(t) C4(t) and C1(s) C2(s) C3(s) C4(s). + ## Calculate the C1(t) C2(t) C3(t) C4(t) and C1(s) C2(s) C3(s) C4(s). t2 = t.*t; t3 = t2.*t;
--- a/scripts/sparse/sprandsym.m Sun Apr 10 20:18:22 2016 -0700 +++ b/scripts/sparse/sprandsym.m Sun Apr 10 20:45:01 2016 -0700 @@ -133,7 +133,7 @@ ## Slight modification from discussion above: pivot around the max in ## order to avoid overflow (underflow is fine, just means effectively ## zero probabilities). - [~, midx] = max (cumsum (log (q))) ; + [~, midx] = max (cumsum (log (q))); midx += 1; lc = fliplr (cumprod (1./q(midx-1:-1:1))); rc = cumprod (q(midx:end));