Mercurial > hg > octave-nkf
diff src/OPERATORS/op-m-m.cc @ 7789:82be108cc558
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 | a1dbe9d80eee |
| children | 5861b95e9879 |
line wrap: on
line diff
--- a/src/OPERATORS/op-m-m.cc +++ b/src/OPERATORS/op-m-m.cc @@ -29,6 +29,7 @@ #include "oct-obj.h" #include "ov.h" #include "ov-re-mat.h" +#include "ov-flt-re-mat.h" #include "ov-typeinfo.h" #include "ops.h" #include "xdiv.h" @@ -115,6 +116,14 @@ DEFNDCATOP_FN (m_m, matrix, matrix, array, array, concat) DEFNDASSIGNOP_FN (assign, matrix, matrix, array, assign) +DEFNDASSIGNOP_FN (sgl_assign, float_matrix, matrix, float_array, assign) + +CONVDECL (matrix_to_float_matrix) +{ + CAST_CONV_ARG (const octave_matrix&); + + return new octave_float_matrix (FloatNDArray (v.array_value ())); +} void install_m_m_ops (void) @@ -150,6 +159,9 @@ INSTALL_CATOP (octave_matrix, octave_matrix, m_m); INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_matrix, assign); + INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_matrix, sgl_assign); + + INSTALL_CONVOP (octave_matrix, octave_float_matrix, matrix_to_float_matrix); } /*