Mercurial > octave
view libinterp/octave-value/ov-ch-mat.h @ 22296:8b18f46f6427
revamp double, single, int type conversions
* ov-type-conv.h: Delete.
* libinterp/octave-value/module.mk: Update.
* op-double-conv.cc, op-float-conv.cc, op-int-conv.cc: Delete.
* libinterp/operators/module.mk: Update.
* ov.h, ov.cc, ov-base.h, ov-base.cc (octave_value::as_double,
octave_value::as_single, octave_value:as_int8, octave_value:as_int16,
octave_value:as_int32, octave_value:as_int64, octave_value:as_uint8,
octave_value:as_uint16, octave_value:as_uint32,
octave_value:as_uint64): New functions.
* ov.cc (Fdouble, Fsingle, Fint8, Fint16, Fint32, Fint64, Fuint8,
Fuint16, Fuint32, Fuint64): Move here. Simply call as_double,
as_single, etc. member functions.
* ov-base-int.cc, ov-base-int.h, ov-base-scalar.cc, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc,
ov-bool.h, ov-ch-mat.cc, ov-ch-mat.h, ov-complex.cc, ov-complex.h,
ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h,
ov-cx-sparse.cc, ov-cx-sparse.h, ov-float.cc, ov-float.h,
ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc,
ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h,
ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc,
ov-flt-re-mat.h, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc,
ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc,
ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc,
ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-uint16.cc, ov-uint32.cc,
ov-uint64.cc, ov-uint8.cc:
Define as_double, as_single, etc. member functions as appropriate.
* ov-typeinfo.h, ov-typeinfo.cc
(octave_value_typeinfo::type_conv_ops): Delete data member. Remove
all uses.
(octave_value_typeinfo::register_type_conv_op): Delete.
(octave_value_typeinfo::do_register_type_conv_op): Delete.
(octave_value_typeinfo::do_lookup_type_conv_op): Delete.
* ops.h (INSTALL_CONVOP, CONVDECLX, DEFCONVFNX, DEFCONVFNX2, DEFDBLCONVFN,
DEFFLTCONVFN, DEFSTRINTCONVFN, DEFSTRDBLCONVFN, DEFSTRFLTCONVFN,
DEFCONVFN, DEFCONVFN2): Delete obsolete macros.
* op-bm-bm.cc, op-cdm-cdm.cc, op-cm-cm.cc, op-cs-cs.cc, op-dm-dm.cc,
op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcs-fcs.cc, op-fdm-fdm.cc,
op-fm-fm.cc, op-fs-fs.cc, op-m-m.cc, op-pm-pm.cc, op-s-s.cc,
op-sbm-sbm.cc: Delete unused type conversion functions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 15 Aug 2016 02:01:29 -0400 |
parents | 1473547f50f5 |
children | bac0d6f07a3e |
line wrap: on
line source
/* Copyright (C) 1996-2015 John W. Eaton Copyright (C) 2009-2010 VZLU Prague This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if ! defined (octave_ov_ch_mat_h) #define octave_ov_ch_mat_h 1 #include "octave-config.h" #include <cstdlib> #include <iosfwd> #include <string> #include "mx-base.h" #include "str-vec.h" #include "error.h" #include "ov.h" #include "ov-base.h" #include "ov-base-mat.h" #include "ov-int64.h" #include "ov-re-mat.h" #include "ov-typeinfo.h" class octave_value_list; class tree_walker; // Character matrix values. class octave_char_matrix : public octave_base_matrix<charNDArray> { protected: octave_char_matrix (void) : octave_base_matrix<charNDArray> () { } octave_char_matrix (const charMatrix& chm) : octave_base_matrix<charNDArray> (chm) { } octave_char_matrix (const charNDArray& chm) : octave_base_matrix<charNDArray> (chm) { } octave_char_matrix (const Array<char>& chm) : octave_base_matrix<charNDArray> (chm) { } octave_char_matrix (char c) : octave_base_matrix<charNDArray> (c) { } octave_char_matrix (const char *s) : octave_base_matrix<charNDArray> (s) { } octave_char_matrix (const std::string& s) : octave_base_matrix<charNDArray> (s) { } octave_char_matrix (const string_vector& s) : octave_base_matrix<charNDArray> (s) { } octave_char_matrix (const octave_char_matrix& chm) : octave_base_matrix<charNDArray> (chm) { } public: ~octave_char_matrix (void) { } octave_base_value *clone (void) const { return new octave_char_matrix (*this); } octave_base_value *empty_clone (void) const { return new octave_char_matrix (); } idx_vector index_vector (bool require_integers = false) const; builtin_type_t builtin_type (void) const { return btyp_char; } bool is_char_matrix (void) const { return true; } bool is_real_matrix (void) const { return true; } bool is_real_type (void) const { return true; } double double_value (bool = false) const; float float_value (bool = false) const; double scalar_value (bool frc_str_conv = false) const { return double_value (frc_str_conv); } float float_scalar_value (bool frc_str_conv = false) const { return float_value (frc_str_conv); } octave_int64 int64_scalar_value () const; octave_uint64 uint64_scalar_value () const; Matrix matrix_value (bool = false) const { return Matrix (charMatrix (matrix)); } FloatMatrix float_matrix_value (bool = false) const { return FloatMatrix (charMatrix (matrix)); } NDArray array_value (bool = false) const { return NDArray (matrix); } FloatNDArray float_array_value (bool = false) const { return FloatNDArray (matrix); } Complex complex_value (bool = false) const; FloatComplex float_complex_value (bool = false) const; ComplexMatrix complex_matrix_value (bool = false) const { return ComplexMatrix (charMatrix (matrix)); } FloatComplexMatrix float_complex_matrix_value (bool = false) const { return FloatComplexMatrix (charMatrix (matrix)); } ComplexNDArray complex_array_value (bool = false) const { return ComplexNDArray (matrix); } FloatComplexNDArray float_complex_array_value (bool = false) const { return FloatComplexNDArray (matrix); } charMatrix char_matrix_value (bool = false) const { return charMatrix (matrix); } charNDArray char_array_value (bool = false) const { return matrix; } octave_value convert_to_str_internal (bool, bool, char type) const { return octave_value (matrix, type); } octave_value as_double (void) const; octave_value as_single (void) const; octave_value as_int8 (void) const; octave_value as_int16 (void) const; octave_value as_int32 (void) const; octave_value as_int64 (void) const; octave_value as_uint8 (void) const; octave_value as_uint16 (void) const; octave_value as_uint32 (void) const; octave_value as_uint64 (void) const; void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. void *mex_get_data (void) const { return matrix.mex_get_data (); } mxArray *as_mxArray (void) const; octave_value map (unary_mapper_t umap) const; }; #endif