Mercurial > octave
diff libinterp/octave-value/ov-flt-re-mat.cc @ 19320:d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
* liboctave/array/CMatrix.cc, liboctave/array/CMatrix.h,
liboctave/array/CNDArray.cc, liboctave/array/CNDArray.h,
liboctave/array/dMatrix.cc, liboctave/array/dMatrix.h,
liboctave/array/dNDArray.cc, liboctave/array/dNDArray.h,
liboctave/array/fCMatrix.cc, liboctave/array/fCMatrix.h,
liboctave/array/fCNDArray.cc, liboctave/array/fCNDArray.h,
liboctave/array/fMatrix.cc, liboctave/array/fMatrix.h,
liboctave/array/fNDArray.cc, liboctave/array/fNDArray.h: change base class of
Matrix, FloatMatrix, ComplexMatrix, and FloatComplexMatrix to NDArray,
FloatNDArray, ComplexNDArray, and FloatComplexNDArray respectively. This will
allow to reduce duplicated code since the Matrix classes will be able to
inherit many of their methods from their NDArray counterparts. Also remove
the matrix_value () method since a constructor now suffices.
* liboctave/array/CSparse.h: include CMatrix
* libinterp/corefcn/pr-output.cc, libinterp/octave-value/ov-cx-mat.cc,
libinterp/octave-value/ov-flt-cx-mat.cc,
libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-re-mat.cc:
replace calls to matrix_value () with constructor with respective Matrix
subclass.
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Fri, 07 Nov 2014 08:15:55 +0000 |
parents | b7d3e1f762e1 |
children | 76478d2da117 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-flt-re-mat.cc Mon Nov 03 22:18:29 2014 +0000 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Fri Nov 07 08:15:55 2014 +0000 @@ -127,13 +127,13 @@ Matrix octave_float_matrix::matrix_value (bool) const { - return Matrix (matrix.matrix_value ()); + return Matrix (FloatMatrix (matrix)); } FloatMatrix octave_float_matrix::float_matrix_value (bool) const { - return matrix.matrix_value (); + return FloatMatrix (matrix); } Complex @@ -181,13 +181,13 @@ ComplexMatrix octave_float_matrix::complex_matrix_value (bool) const { - return ComplexMatrix (matrix.matrix_value ()); + return ComplexMatrix (FloatMatrix (matrix)); } FloatComplexMatrix octave_float_matrix::float_complex_matrix_value (bool) const { - return FloatComplexMatrix (matrix.matrix_value ()); + return FloatComplexMatrix (FloatMatrix (matrix)); } ComplexNDArray @@ -268,7 +268,7 @@ if (matrix.ndims () == 2 && (matrix.rows () == 1 || matrix.columns () == 1)) { - FloatMatrix mat = matrix.matrix_value (); + FloatMatrix mat (matrix); retval = mat.diag (m, n); }