Mercurial > octave

comparison liboctave/array/CSparse.h @ 19320:d0c73e23a505

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 65554f5847ac
children 4197fc428c7d
comparison
equal deleted inserted replaced
19319:8b4a24081e47 19320:d0c73e23a505
24 #if !defined (octave_CSparse_h) 24 #if !defined (octave_CSparse_h)
25 #define octave_CSparse_h 1 25 #define octave_CSparse_h 1
26 26
27 #include "dMatrix.h" 27 #include "dMatrix.h"
28 #include "dNDArray.h" 28 #include "dNDArray.h"
29 #include "CMatrix.h"
29 #include "CNDArray.h" 30 #include "CNDArray.h"
30 #include "dColVector.h" 31 #include "dColVector.h"
31 #include "CColVector.h" 32 #include "CColVector.h"
32 #include "oct-cmplx.h" 33 #include "oct-cmplx.h"
33 34