Mercurial > hg > octave-nkf
diff libinterp/octave-value/ov-bool-mat.h @ 19507:25f535b90e52
Change boolMatrix to subclass boolNDArray rather than be another Array<bool>.
* boolMatrix.h: both boolMatrix and boolNDArray are Array<bool>, the first
being simply 2 dimensional. We change this so that boolMatrix inherits from
boolNDArray instead.
* boolNDArray.cc, boolNDArray.h (boolNDArray::matrix_value): remove method
since boolMatrix can be constructed from its parent.
(boolNDArray::boolNDArray): remove constructor from boolMatrix
* pr-output.cc, octave-value/ov-bool-mat.cc, octave-value/ov-bool-mat.h:
replace calls to boolNDArray::matrix_value () with the boolMatrix constructor.
| author | Carnë Draug <carandraug@octave.org> |
|---|---|
| date | Mon, 20 Oct 2014 01:34:52 +0100 |
| parents | 6113e0c6920b |
| children | 76478d2da117 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-bool-mat.h +++ b/libinterp/octave-value/ov-bool-mat.h @@ -135,10 +135,10 @@ { return double_value (frc_str_conv); } Matrix matrix_value (bool = false) const - { return Matrix (matrix.matrix_value ()); } + { return Matrix (boolMatrix (matrix)); } FloatMatrix float_matrix_value (bool = false) const - { return FloatMatrix (matrix.matrix_value ()); } + { return FloatMatrix (boolMatrix (matrix)); } NDArray array_value (bool = false) const { return NDArray (matrix); } @@ -151,10 +151,10 @@ FloatComplex float_complex_value (bool = false) const; ComplexMatrix complex_matrix_value (bool = false) const - { return ComplexMatrix (matrix.matrix_value ()); } + { return ComplexMatrix (boolMatrix (matrix)); } FloatComplexMatrix float_complex_matrix_value (bool = false) const - { return FloatComplexMatrix (matrix.matrix_value ()); } + { return FloatComplexMatrix (boolMatrix (matrix)); } ComplexNDArray complex_array_value (bool = false) const { return ComplexNDArray (matrix); } @@ -176,19 +176,19 @@ } boolMatrix bool_matrix_value (bool = false) const - { return matrix.matrix_value (); } + { return boolMatrix (matrix); } boolNDArray bool_array_value (bool = false) const { return matrix; } SparseMatrix sparse_matrix_value (bool = false) const - { return SparseMatrix (Matrix (matrix.matrix_value ())); } + { return SparseMatrix (Matrix (boolMatrix (matrix))); } SparseComplexMatrix sparse_complex_matrix_value (bool = false) const - { return SparseComplexMatrix (ComplexMatrix (matrix.matrix_value ())); } + { return SparseComplexMatrix (ComplexMatrix (boolMatrix (matrix))); } SparseBoolMatrix sparse_bool_matrix_value (bool = false) const - { return SparseBoolMatrix (matrix.matrix_value ()); } + { return SparseBoolMatrix (boolMatrix (matrix)); } octave_value convert_to_str_internal (bool pad, bool force, char type) const;