Mercurial > hg > octave-lyh
changeset 17207:9deb214ae9d5
Use 2-D, not 2D, in error messages.
* libinterp/corefcn/cellfun.cc, libinterp/corefcn/ls-oct-ascii.cc,
libinterp/octave-value/ov-bool-sparse.cc,
libinterp/octave-value/ov-cx-sparse.cc, libinterp/octave-value/ov-re-sparse.cc,
scripts/plot/private/__go_draw_axes__.m,
scripts/polynomial/private/__splinefit__.m, scripts/sparse/svds.m,
scripts/special-matrix/gallery.m: Use 2-D, not 2D, in error messages.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 07 Aug 2013 13:42:49 -0700 |
parents | 81f3b09e3e6e |
children | fe7cb5bb4388 |
files | libinterp/corefcn/cellfun.cc libinterp/corefcn/ls-oct-ascii.cc libinterp/octave-value/ov-bool-sparse.cc libinterp/octave-value/ov-cx-sparse.cc libinterp/octave-value/ov-re-sparse.cc scripts/plot/private/__go_draw_axes__.m scripts/polynomial/private/__splinefit__.m scripts/sparse/svds.m scripts/special-matrix/gallery.m |
diffstat | 9 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/cellfun.cc +++ b/libinterp/corefcn/cellfun.cc @@ -2229,7 +2229,7 @@ bool sparse = a.is_sparse_type (); if (sparse && nargin > 3) { - error ("mat2cell: sparse arguments only support 2D indexing"); + error ("mat2cell: sparse arguments only support 2-D indexing"); return retval; }
--- a/libinterp/corefcn/ls-oct-ascii.cc +++ b/libinterp/corefcn/ls-oct-ascii.cc @@ -367,7 +367,7 @@ if (tc.is_real_matrix ()) { - os << "# 3D data...\n" + os << "# 3-D data...\n" << "# type: matrix\n" << "# total rows: " << nr << "\n" << "# total columns: " << nc << "\n"; @@ -408,7 +408,7 @@ } else { - ::error ("for now, I can only save real matrices in 3D format"); + ::error ("for now, I can only save real matrices in 3-D format"); fail = true; }
--- a/libinterp/octave-value/ov-bool-sparse.cc +++ b/libinterp/octave-value/ov-bool-sparse.cc @@ -273,7 +273,7 @@ swap_bytes<4> (&tmp); if (tmp != -2) { - error ("load: only 2D sparse matrices are supported"); + error ("load: only 2-D sparse matrices are supported"); return false; }
--- a/libinterp/octave-value/ov-cx-sparse.cc +++ b/libinterp/octave-value/ov-cx-sparse.cc @@ -305,7 +305,7 @@ swap_bytes<4> (&tmp); if (tmp != -2) { - error ("load: only 2D sparse matrices are supported"); + error ("load: only 2-D sparse matrices are supported"); return false; }
--- a/libinterp/octave-value/ov-re-sparse.cc +++ b/libinterp/octave-value/ov-re-sparse.cc @@ -338,7 +338,7 @@ swap_bytes<4> (&tmp); if (tmp != -2) { - error ("load: only 2D sparse matrices are supported"); + error ("load: only 2-D sparse matrices are supported"); return false; }
--- a/scripts/plot/private/__go_draw_axes__.m +++ b/scripts/plot/private/__go_draw_axes__.m @@ -652,7 +652,7 @@ endif if (nd == 3) if (numel (xcol) > 3) - error ("__go_draw_axes__: gnuplot (as of v4.2) only supports 3D filled triangular patches"); + error ("__go_draw_axes__: gnuplot (as of v4.2) only supports 3-D filled triangular patches"); else if (isnan (data_3d_idx)) data_idx++;
--- a/scripts/polynomial/private/__splinefit__.m +++ b/scripts/polynomial/private/__splinefit__.m @@ -387,7 +387,7 @@ if isempty(cc) cc = ones(size(xc)); elseif numel(size(cc)) ~= 2 - error('arguments:ccsize1','Constraint coefficients cc must be 2D.') + error('arguments:ccsize1','Constraint coefficients cc must be 2-D.') elseif size(cc,2) ~= nx mess = 'Last dimension of cc must equal length of xc.'; error('arguments:ccsize2',mess)
--- a/scripts/sparse/svds.m +++ b/scripts/sparse/svds.m @@ -99,7 +99,7 @@ endif if (ndims (A) > 2) - error ("svds: A must be a 2D matrix"); + error ("svds: A must be a 2-D matrix"); endif if (nargin < 4)
--- a/scripts/special-matrix/gallery.m +++ b/scripts/special-matrix/gallery.m @@ -802,7 +802,7 @@ if (nargin < 1 || nargin > 2) error ("gallery: 1 or 2 arguments are required for compar matrix."); elseif (! isnumeric (A) || ndims (A) != 2) - error ("gallery: A must be a 2D matrix for compar matrix."); + error ("gallery: A must be a 2-D matrix for compar matrix."); elseif (! isnumeric (k) || ! isscalar (k)) error ("gallery: K must be a numeric scalar for compar matrix."); endif @@ -1630,7 +1630,7 @@ if (nargin < 1 || nargin > 3) error ("gallery: 1 to 3 arguments are required for krylov matrix."); elseif (! isnumeric (A) || ! issquare (A) || ndims (A) != 2) - error ("gallery: A must be a square 2D matrix for krylov matrix."); + error ("gallery: A must be a square 2-D matrix for krylov matrix."); endif n = length (A);