Mercurial > hg > octave-nkf
diff liboctave/CDiagMatrix.h @ 10363:a0728e81ed25
improve diag matrix interface & implementation
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 26 Feb 2010 11:44:38 +0100 |
| parents | 4c0cdbe0acca |
| children | 96ed7c629bbd |
line wrap: on
line diff
--- a/liboctave/CDiagMatrix.h +++ b/liboctave/CDiagMatrix.h @@ -47,17 +47,14 @@ ComplexDiagMatrix (octave_idx_type r, octave_idx_type c, const Complex& val) : MDiagArray2<Complex> (r, c, val) { } - explicit ComplexDiagMatrix (const RowVector& a) - : MDiagArray2<Complex> (ComplexRowVector (a)) { } - - explicit ComplexDiagMatrix (const ComplexRowVector& a) + explicit ComplexDiagMatrix (const Array<Complex>& a) : MDiagArray2<Complex> (a) { } - explicit ComplexDiagMatrix (const ColumnVector& a) - : MDiagArray2<Complex> (ComplexColumnVector (a)) { } + explicit ComplexDiagMatrix (const Array<double>& a) + : MDiagArray2<Complex> (Array<Complex> (a)) { } - explicit ComplexDiagMatrix (const ComplexColumnVector& a) - : MDiagArray2<Complex> (a) { } + ComplexDiagMatrix (const Array<Complex>& a, octave_idx_type r, octave_idx_type c) + : MDiagArray2<Complex> (a, r, c) { } explicit ComplexDiagMatrix (const DiagMatrix& a);