Mercurial > octave-nkf
changeset 5944:d20c596b9b10
[project @ 2006-08-18 21:34:00 by jwe]
| author | jwe |
|---|---|
| date | Fri, 18 Aug 2006 21:34:00 +0000 |
| parents | c038c2947ee1 |
| children | 76cfea89e4e7 |
| files | src/ChangeLog src/ov-bool-mat.h src/ov-bool-sparse.cc src/ov-bool-sparse.h src/ov-bool.h |
| diffstat | 5 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Aug 18 21:27:04 2006 +0000 +++ b/src/ChangeLog Fri Aug 18 21:34:00 2006 +0000 @@ -19,6 +19,14 @@ * OPERATORS/op-bm-b.cc (oct_assignop_conv_and_assign): Ask for warning from bool_array_value. * OPERATORS/op-bm-bm.cc (oct_assignop_conv_and_assign): Likewise. + * ov-bool.h (octave_bool::bool_value, + octave_bool::bool_matrix_value, octave_bool::bool_array_value): + Likewise. + * ov-bool-mat.h (octave_bool_matrix::bool_matrix_value, + octave_bool_matrix::bool_array_value): Likewise. + * ov-bool-sparse.cc, ov-bool-sparse.h + (octave_sparse_bool_matrix::bool_matrix_value, + octave_sparse_bool_matrix::bool_array_value): Likewise. 2006-08-18 Benjamin Lindner <lindnerben@gmx.net>
--- a/src/ov-bool-mat.h Fri Aug 18 21:27:04 2006 +0000 +++ b/src/ov-bool-mat.h Fri Aug 18 21:34:00 2006 +0000 @@ -145,10 +145,10 @@ return retval; } - boolMatrix bool_matrix_value (void) const + boolMatrix bool_matrix_value (bool = false) const { return matrix.matrix_value (); } - boolNDArray bool_array_value (void) const + boolNDArray bool_array_value (bool = false) const { return matrix; } SparseMatrix sparse_matrix_value (bool = false) const
--- a/src/ov-bool-sparse.cc Fri Aug 18 21:27:04 2006 +0000 +++ b/src/ov-bool-sparse.cc Fri Aug 18 21:34:00 2006 +0000 @@ -166,13 +166,13 @@ } boolMatrix -octave_sparse_bool_matrix::bool_matrix_value (void) const +octave_sparse_bool_matrix::bool_matrix_value (bool) const { return matrix.matrix_value (); } boolNDArray -octave_sparse_bool_matrix::bool_array_value (void) const +octave_sparse_bool_matrix::bool_array_value (bool) const { return boolNDArray (matrix.matrix_value ()); }
--- a/src/ov-bool-sparse.h Fri Aug 18 21:27:04 2006 +0000 +++ b/src/ov-bool-sparse.h Fri Aug 18 21:34:00 2006 +0000 @@ -110,9 +110,9 @@ ComplexNDArray complex_array_value (bool = false) const; - boolMatrix bool_matrix_value (void) const; + boolMatrix bool_matrix_value (bool = false) const; - boolNDArray bool_array_value (void) const; + boolNDArray bool_array_value (bool = false) const; SparseMatrix sparse_matrix_value (bool = false) const;
--- a/src/ov-bool.h Fri Aug 18 21:27:04 2006 +0000 +++ b/src/ov-bool.h Fri Aug 18 21:34:00 2006 +0000 @@ -144,12 +144,12 @@ return retval; } - bool bool_value (void) const { return scalar; } + bool bool_value (bool = false) const { return scalar; } - boolMatrix bool_matrix_value (void) const + boolMatrix bool_matrix_value (bool = false) const { return boolMatrix (1, 1, scalar); } - boolNDArray bool_array_value (void) const + boolNDArray bool_array_value (bool = false) const { return boolNDArray (dim_vector (1, 1), scalar); } octave_value resize (const dim_vector& dv, bool fill = false) const;