Mercurial > octave
diff libinterp/octave-value/ov.cc @ 28126:4c21f99b4ad5
handle interleaved complex data and new typed data access functions for mex
* mexproto.h, mex.cc, mxarray.h (mxMakeArrayReal, mxMakeArrayComplex,
mxGetDoubles, mxGetSingles, mxGetInt8s, mxGetInt16s, mxGetInt32s,
mxGetInt64s, mxGetUint8s, mxGetUint16s, mxGetUint32s, mxGetUint64s,
mxGetComplexDoubles, mxGetComplexSingles, mxSetDoubles, mxSetSingles,
mxSetInt8s, mxSetInt16s, mxSetInt32s, mxSetInt64s, mxSetUint8s,
mxSetUint16s, mxSetUint32s, mxSetUint64s, mxSetComplexDoubles,
mxSetComplexSingles): New functions. Provide corresponding member
functions in mxArray class hierarchy to handle the actual operations.
(mxGetComplexInt8s, mxGetComplexInt16s, mxGetComplexInt32s,
mxGetComplexInt64s, mxGetComplexUint8s, mxGetComplexUint16s,
mxGetComplexUint32s, mxGetComplexUint64s, mxSetComplexInt8s,
mxSetComplexInt16s, mxSetComplexInt32s, mxSetComplexInt64s,
mxSetComplexUint8s, mxSetComplexUint16s, mxSetComplexUint32s,
mxSetComplexUint64s): Add prototypes and functions, but leave
commented out since we don't have complex integer data.
(class mxArray_number, class mxArray_sparse):
Handle interleaved complex data. In mxArray_octave_value and
mxArray_matlab constructors, handle interleaved flag in constructor to
determine data layout to use when creating mxArray_number or
mxArray_sparse objects.
(mex::make_value): Check flag in mex function to determine whether to
create arrays with interleaved complex.
* ov.h, ov.cc, ov-base.h, ov-base.cc, ov-base-diag.h, ov-base-diag.cc,
ov-bool-mat.h, ov-bool-mat.cc, ov-bool-sparse.h, ov-bool-sparse.cc,
ov-bool.h, ov-bool.cc, ov-cell.h, ov-cell.cc, ov-ch-mat.h,
ov-ch-mat.cc, ov-class.h, ov-class.cc, ov-complex.h, ov-complex.cc,
ov-cx-mat.h, ov-cx-mat.cc, ov-cx-sparse.h, ov-cx-sparse.cc,
ov-float.h, ov-float.cc, ov-flt-complex.h, ov-flt-complex.cc,
ov-flt-cx-mat.h, ov-flt-cx-mat.cc, ov-flt-re-mat.h, ov-flt-re-mat.cc,
ov-intx.h, ov-lazy-idx.h, ov-perm.h, ov-perm.cc, ov-range.h,
ov-range.cc, ov-re-mat.h, ov-re-mat.cc, ov-re-sparse.h,
ov-re-sparse.cc, ov-scalar.h, ov-scalar.cc, ov-struct.h, ov-struct.cc:
In all as_mxArray methods, handle new interleaved input to optionally
create objects that will use interleaved complex data.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 18 Feb 2020 13:16:41 -0500 |
parents | bd51beb6205e |
children | b743a63e2dab |
line wrap: on
line diff
--- a/libinterp/octave-value/ov.cc Tue Feb 18 12:50:18 2020 -0500 +++ b/libinterp/octave-value/ov.cc Tue Feb 18 13:16:41 2020 -0500 @@ -2626,6 +2626,75 @@ rep->print_info (os, prefix + ' '); } +void * +octave_value::mex_get_data (mxClassID class_id, mxComplexity complexity) const +{ + // If class_id is set to mxUNKNOWN_CLASS, return data for any type. + // Otherwise, require that REP matches the requested type and + // complexity. + + if (class_id != mxUNKNOWN_CLASS) + { + bool type_ok = false; + + switch (class_id) + { + case mxDOUBLE_CLASS: + type_ok = is_double_type (); + break; + + case mxSINGLE_CLASS: + type_ok = is_single_type (); + break; + + case mxINT8_CLASS: + type_ok = is_int8_type (); + break; + + case mxINT16_CLASS: + type_ok = is_int16_type (); + break; + + case mxINT32_CLASS: + type_ok = is_int32_type (); + break; + + case mxINT64_CLASS: + type_ok = is_int64_type (); + break; + + case mxUINT8_CLASS: + type_ok = is_uint8_type (); + break; + + case mxUINT16_CLASS: + type_ok = is_uint16_type (); + break; + + case mxUINT32_CLASS: + type_ok = is_uint32_type (); + break; + + case mxUINT64_CLASS: + type_ok = is_uint64_type (); + break; + + default: + // We only expect to see numeric types explicitly requested. + error ("mex_get_data: unexpected type requested"); + break; + } + + if (! type_ok) + error ("mex_get_data: type mismatch"); + + if (complexity == mxCOMPLEX && ! iscomplex ()) + error ("mex_get_data: objectis not complex as requested"); + } + + return rep->mex_get_data (); +} + OCTAVE_NORETURN static void err_unary_op (const std::string& on, const std::string& tn) {