Mercurial > hg > octave-jordi
changeset 21013:b9d4c3615e89
maint: Capitalize D for dimension in messages and comments.
"N-d" => "N-D", "1-d" => "1-D", "2-d" => "2-D"
* data.cc, ls-oct-text.cc, xdiv.cc, xpow.cc, ov-str-mat.cc, op-bm-bm.cc,
op-cell.cc, op-cm-cm.cc, op-fcm-fcm.cc, op-fm-fm.cc, op-int.h, op-m-m.cc,
op-str-str.cc, op-struct.cc, Array.cc, Sparse.cc, mx-base.h, mx-op-decl.h,
mx-op-defs.h: Capitalize D for dimension in messages and comments.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 29 Dec 2015 12:41:03 -0800 |
parents | 7f4c6d594e3d |
children | b009c65ec062 |
files | libinterp/corefcn/data.cc libinterp/corefcn/ls-oct-text.cc libinterp/corefcn/xdiv.cc libinterp/corefcn/xpow.cc libinterp/octave-value/ov-str-mat.cc libinterp/operators/op-bm-bm.cc libinterp/operators/op-cell.cc libinterp/operators/op-cm-cm.cc libinterp/operators/op-fcm-fcm.cc libinterp/operators/op-fm-fm.cc libinterp/operators/op-int.h libinterp/operators/op-m-m.cc libinterp/operators/op-str-str.cc libinterp/operators/op-struct.cc liboctave/array/Array.cc liboctave/array/Sparse.cc liboctave/operators/mx-base.h liboctave/operators/mx-op-decl.h liboctave/operators/mx-op-defs.h |
diffstat | 19 files changed, 38 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/data.cc +++ b/libinterp/corefcn/data.cc @@ -6691,7 +6691,7 @@ error ("__sort_rows_idx__: sparse matrices not yet supported"); if (arg.ndims () != 2) - error ("__sort_rows_idx__: needs a 2-dimensional object"); + error ("__sort_rows_idx__: needs a 2-D object"); Array<octave_idx_type> idx = arg.sort_rows_idx (smode); @@ -6773,7 +6773,7 @@ error ("issorted: sparse matrices not yet supported"); if (arg.ndims () != 2) - error ("issorted: A must be a 2-dimensional object"); + error ("issorted: A must be a 2-D object"); retval = arg.is_sorted_rows (smode) != UNSORTED; } @@ -6830,7 +6830,7 @@ %!error <second argument must be a string> issorted (1, 2) %!error <second argument must be a string> issorted (1, {"rows"}) %!error <sparse matrices not yet supported> issorted (sparse ([1 2 3]), "rows") -%!error <A must be a 2-dimensional object> issorted (rand (2,2,2), "rows") +%!error <A must be a 2-D object> issorted (rand (2,2,2), "rows") %!error <needs a vector> issorted (ones (2,2)) */
--- a/libinterp/corefcn/ls-oct-text.cc +++ b/libinterp/corefcn/ls-oct-text.cc @@ -342,8 +342,8 @@ // Maybe this should be a static function in tree-plot.cc? // If TC is matrix, save it on stream OS in a format useful for -// making a 3-dimensional plot with gnuplot. If PARAMETRIC is -// TRUE, assume a parametric 3-dimensional plot will be generated. +// making a 3-D plot with gnuplot. If PARAMETRIC is TRUE, +// assume a parametric 3-D plot will be generated. bool save_three_d (std::ostream& os, const octave_value& tc, bool parametric)
--- a/libinterp/corefcn/xdiv.cc +++ b/libinterp/corefcn/xdiv.cc @@ -279,9 +279,9 @@ // // op2 \ op1: s cs // +-- +---+----+ -// N-d array | 1 | 3 | +// N-D array | 1 | 3 | // +---+----+ -// complex N-d array | 2 | 4 | +// complex N-D array | 2 | 4 | // +---+----+ NDArray @@ -580,9 +580,9 @@ // // op2 \ op1: s cs // +-- +---+----+ -// N-d array | 1 | 3 | +// N-D array | 1 | 3 | // +---+----+ -// complex N-d array | 2 | 4 | +// complex N-D array | 2 | 4 | // +---+----+ FloatNDArray
--- a/libinterp/corefcn/xpow.cc +++ b/libinterp/corefcn/xpow.cc @@ -1105,7 +1105,7 @@ return result; } -// Safer pow functions that work elementwise for N-d arrays. +// Safer pow functions that work elementwise for N-D arrays. // // op2 \ op1: s nd cs cnd // +-- +---+---+----+----+ @@ -2471,7 +2471,7 @@ return result; } -// Safer pow functions that work elementwise for N-d arrays. +// Safer pow functions that work elementwise for N-D arrays. // // op2 \ op1: s nd cs cnd // +-- +---+---+----+----+
--- a/libinterp/octave-value/ov-str-mat.cc +++ b/libinterp/octave-value/ov-str-mat.cc @@ -203,13 +203,13 @@ NDArray octave_char_matrix_str::array_value (bool force_string_conv) const { - CHAR_MATRIX_CONV (NDArray, , "real N-d array", array_value); + CHAR_MATRIX_CONV (NDArray, , "real N-D array", array_value); } ComplexNDArray octave_char_matrix_str::complex_array_value (bool force_string_conv) const { - CHAR_MATRIX_CONV (ComplexNDArray, , "complex N-d array", + CHAR_MATRIX_CONV (ComplexNDArray, , "complex N-D array", complex_array_value); }
--- a/libinterp/operators/op-bm-bm.cc +++ b/libinterp/operators/op-bm-bm.cc @@ -61,7 +61,7 @@ CAST_UNOP_ARG (const octave_bool_matrix&); if (v.ndims () > 2) - error ("transpose not defined for N-d objects"); + error ("transpose not defined for N-D objects"); return octave_value (v.bool_matrix_value ().transpose ()); }
--- a/libinterp/operators/op-cell.cc +++ b/libinterp/operators/op-cell.cc @@ -41,7 +41,7 @@ CAST_UNOP_ARG (const octave_cell&); if (v.ndims () > 2) - error ("transpose not defined for N-d objects"); + error ("transpose not defined for N-D objects"); return octave_value (Cell (v.cell_value ().transpose ())); }
--- a/libinterp/operators/op-cm-cm.cc +++ b/libinterp/operators/op-cm-cm.cc @@ -46,7 +46,7 @@ CAST_UNOP_ARG (const octave_complex_matrix&); if (v.ndims () > 2) - error ("transpose not defined for N-d objects"); + error ("transpose not defined for N-D objects"); return octave_value (v.complex_matrix_value ().transpose ()); } @@ -56,7 +56,7 @@ CAST_UNOP_ARG (const octave_complex_matrix&); if (v.ndims () > 2) - error ("complex-conjugate transpose not defined for N-d objects"); + error ("complex-conjugate transpose not defined for N-D objects"); return octave_value (v.complex_matrix_value ().hermitian ()); }
--- a/libinterp/operators/op-fcm-fcm.cc +++ b/libinterp/operators/op-fcm-fcm.cc @@ -46,7 +46,7 @@ CAST_UNOP_ARG (const octave_float_complex_matrix&); if (v.ndims () > 2) - error ("transpose not defined for N-d objects"); + error ("transpose not defined for N-D objects"); return octave_value (v.float_complex_matrix_value ().transpose ()); } @@ -56,7 +56,7 @@ CAST_UNOP_ARG (const octave_float_complex_matrix&); if (v.ndims () > 2) - error ("complex-conjugate transpose not defined for N-d objects"); + error ("complex-conjugate transpose not defined for N-D objects"); return octave_value (v.float_complex_matrix_value ().hermitian ()); }
--- a/libinterp/operators/op-fm-fm.cc +++ b/libinterp/operators/op-fm-fm.cc @@ -46,7 +46,7 @@ CAST_UNOP_ARG (const octave_float_matrix&); if (v.ndims () > 2) - error ("transpose not defined for N-d objects"); + error ("transpose not defined for N-D objects"); return octave_value (v.float_matrix_value ().transpose ()); }
--- a/libinterp/operators/op-int.h +++ b/libinterp/operators/op-int.h @@ -628,7 +628,7 @@ CAST_UNOP_ARG (const octave_ ## TYPE ## _matrix&); \ \ if (v.ndims () > 2) \ - error ("transpose not defined for N-d objects"); \ + error ("transpose not defined for N-D objects"); \ else \ return octave_value (v.TYPE ## _array_value ().transpose ()); \ } \
--- a/libinterp/operators/op-m-m.cc +++ b/libinterp/operators/op-m-m.cc @@ -46,7 +46,7 @@ CAST_UNOP_ARG (const octave_matrix&); if (v.ndims () > 2) - error ("transpose not defined for N-d objects"); + error ("transpose not defined for N-D objects"); return octave_value (v.matrix_value ().transpose ()); }
--- a/libinterp/operators/op-str-str.cc +++ b/libinterp/operators/op-str-str.cc @@ -39,7 +39,7 @@ CAST_UNOP_ARG (const octave_char_matrix_str&); if (v.ndims () > 2) - error ("transpose not defined for N-d objects"); + error ("transpose not defined for N-D objects"); return octave_value (v.char_matrix_value ().transpose (), a.is_sq_string () ? '\'' : '"');
--- a/libinterp/operators/op-struct.cc +++ b/libinterp/operators/op-struct.cc @@ -39,7 +39,7 @@ CAST_UNOP_ARG (const octave_struct&); if (v.ndims () > 2) - error ("transpose not defined for N-d objects"); + error ("transpose not defined for N-D objects"); return octave_value (v.map_value ().transpose ()); }
--- a/liboctave/array/Array.cc +++ b/liboctave/array/Array.cc @@ -389,7 +389,7 @@ private: - // Recursive N-d generalized transpose + // Recursive N-D generalized transpose template <class T> T *do_permute (const T *src, T *dest, int lev) const { @@ -564,7 +564,7 @@ private: - // Recursive N-d indexing + // Recursive N-D indexing template <class T> T *do_index (const T *src, T *dest, int lev) const { @@ -581,7 +581,7 @@ return dest; } - // Recursive N-d indexed assignment + // Recursive N-D indexed assignment template <class T> const T *do_assign (const T *src, T *dest, int lev) const { @@ -598,7 +598,7 @@ return src; } - // Recursive N-d indexed assignment + // Recursive N-D indexed assignment template <class T> void do_fill (const T& val, T *dest, int lev) const {
--- a/liboctave/array/Sparse.cc +++ b/liboctave/array/Sparse.cc @@ -821,7 +821,7 @@ { (*current_liboctave_warning_with_id_handler) ("Octave:reshape-smashes-dims", - "reshape: sparse reshape to N-d array smashes dims"); + "reshape: sparse reshape to N-D array smashes dims"); for (octave_idx_type i = 2; i < dims2.length (); i++) dims2(1) *= dims2(i);
--- a/liboctave/operators/mx-base.h +++ b/liboctave/operators/mx-base.h @@ -66,7 +66,7 @@ #include "dSparse.h" #include "CSparse.h" -// N-d Array classes. +// N-D Array classes. #include "boolNDArray.h" #include "chNDArray.h"
--- a/liboctave/operators/mx-op-decl.h +++ b/liboctave/operators/mx-op-decl.h @@ -151,7 +151,7 @@ MM_CMP_OP_DECLS (M1, M2, API) \ MM_BOOL_OP_DECLS (M1, M2, API) -// N-d matrix by scalar operations. +// N-D matrix by scalar operations. #define NDS_BIN_OP_DECLS(R, ND, S, API) \ BIN_OP_DECL (R, operator +, ND, S, API); \ @@ -178,7 +178,7 @@ NDS_CMP_OP_DECLS (ND, S, API) \ NDS_BOOL_OP_DECLS (ND, S, API) -// scalar by N-d matrix operations. +// scalar by N-D matrix operations. #define SND_BIN_OP_DECLS(R, S, ND, API) \ BIN_OP_DECL (R, operator +, S, ND, API); \ @@ -205,7 +205,7 @@ SND_CMP_OP_DECLS (S, ND, API) \ SND_BOOL_OP_DECLS (S, ND, API) -// N-d matrix by N-d matrix operations. +// N-D matrix by N-D matrix operations. #define NDND_BIN_OP_DECLS(R, ND1, ND2, API) \ BIN_OP_DECL (R, operator +, ND1, ND2, API); \ @@ -281,7 +281,7 @@ #define DMDM_OP_DECLS(R, DM1, DM2, API) \ DMDM_BIN_OP_DECLS (R, DM1, DM2, API) -// scalar by N-d array min/max ops +// scalar by N-D array min/max ops #define MINMAX_DECLS(T, S, API) \ extern API T min (S d, const T& m); \
--- a/liboctave/operators/mx-op-defs.h +++ b/liboctave/operators/mx-op-defs.h @@ -211,7 +211,7 @@ MM_BOOL_OP (mx_el_and, mx_inline_and, M1, M2) \ MM_BOOL_OP (mx_el_or, mx_inline_or, M1, M2) -// N-d matrix by scalar operations. +// N-D matrix by scalar operations. #define NDS_BIN_OP(R, OP, ND, S, F) \ R \ @@ -258,7 +258,7 @@ NDS_BOOL_OP (mx_el_and_not, mx_inline_and_not, ND, S) \ NDS_BOOL_OP (mx_el_or_not, mx_inline_or_not, ND, S) -// scalar by N-d matrix operations. +// scalar by N-D matrix operations. #define SND_BIN_OP(R, OP, S, ND, F) \ R \ @@ -305,7 +305,7 @@ SND_BOOL_OP (mx_el_and_not, mx_inline_and_not, S, ND) \ SND_BOOL_OP (mx_el_or_not, mx_inline_or_not, S, ND) -// N-d matrix by N-d matrix operations. +// N-D matrix by N-D matrix operations. #define NDND_BIN_OP(R, OP, ND1, ND2, F) \ R \ @@ -564,7 +564,7 @@ DMDM_BIN_OP (R, operator -, DM1, DM2, mx_inline_sub) \ DMDM_BIN_OP (R, product, DM1, DM2, mx_inline_mul) -// scalar by N-d array min/max ops +// scalar by N-D array min/max ops #define SND_MINMAX_FCN(FCN, OP, T, S) \ T \