Mercurial > hg > octave-lyh

diff liboctave/CMatrix.h @ 7789:82be108cc558

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
First attempt at single precision tyeps * * * corrections to qrupdate single precision routines * * * prefer demotion to single over promotion to double * * * Add single precision support to log2 function * * * Trivial PROJECT file update * * * Cache optimized hermitian/transpose methods * * * Add tests for tranpose/hermitian and ChangeLog entry for new transpose code
author David Bateman <dbateman@free.fr>
date Sun, 27 Apr 2008 22:34:17 +0200
parents 45f5faba05a2
children 5861b95e9879
line wrap: on
line diff
--- a/liboctave/CMatrix.h
+++ b/liboctave/CMatrix.h
@@ -54,7 +54,11 @@
 
   ComplexMatrix (const ComplexMatrix& a) : MArray2<Complex> (a) { }
 
-  ComplexMatrix (const MArray2<Complex>& a) : MArray2<Complex> (a) { }
+  template <class U>
+  ComplexMatrix (const MArray2<U>& a) : MArray2<Complex> (a) { }
+
+  template <class U>
+  ComplexMatrix (const Array2<U>& a) : MArray2<Complex> (a) { }
 
   explicit ComplexMatrix (const Matrix& a);
 
@@ -122,7 +126,8 @@
   ComplexMatrix stack (const ComplexColumnVector& a) const;
   ComplexMatrix stack (const ComplexDiagMatrix& a) const;
 
-  ComplexMatrix hermitian (void) const;  // complex conjugate transpose
+  ComplexMatrix hermitian (void) const
+    { return MArray2<Complex>::hermitian (std::conj); }
   ComplexMatrix transpose (void) const
     { return MArray2<Complex>::transpose (); }