Mercurial > octave-nkf
view libinterp/octave-value/ov-str-mat.h @ 19897:09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
* oct-hdf5-id.cc, oct-hdf5-id.h: New files.
* libinterp/corefcn/module.mk: Update.
* libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Remove
$(HDF5_CPPFLAGS) from the list.
* load-save.h (enum load_save_format_type): Always include LS_HDF5
in the list of values.
* ls-hdf5.cc (read_hdf5_data, save_hdf5_data):
Call check_hdf5_id_type.
* oct-hdf5.h: Also #define HDF5_SAVE_TYPE.
* ov.h, ov-base.h: Include oct-hdf5-id.h instead of oct-hdf5.h.
Always declare load_hdf5 and save_hdf5 functions.
* ov-base-int.cc, ov-base-int.h, ov-base.cc, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc,
ov-bool.h, ov-cell.cc, ov-cell.h, ov-class.cc, ov-class.h,
ov-complex.cc, ov-complex.h, ov-cx-mat.cc, ov-cx-mat.h,
ov-cx-sparse.cc, ov-cx-sparse.h, ov-fcn-handle.cc, ov-fcn-handle.h,
ov-fcn-inline.cc, ov-fcn-inline.h, ov-float.cc, ov-float.h,
ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-mat.cc,
ov-flt-cx-mat.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-lazy-idx.h, ov-oncleanup.cc,
ov-oncleanup.h, ov-range.cc ov-range.h, ov-re-mat.cc, ov-re-mat.h,
ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h,
ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-uint16.cc,
ov-uint32.cc, ov-uint64.cc, ov-uint8.cc: Move #ifdef HAVE_HDF5 inside
load_hdf5 and save_hdf5 functions. Always declare and define
load_hdf5 and save_hdf5 functions.
author | John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> |
---|---|
date | Thu, 26 Feb 2015 10:49:20 -0500 |
parents | 4197fc428c7d |
children | 40ed9b46a800 |
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_str_mat_h) #define octave_ov_str_mat_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "mx-base.h" #include "str-vec.h" #include "error.h" #include "oct-stream.h" #include "ov.h" #include "ov-ch-mat.h" #include "ov-re-mat.h" #include "ov-typeinfo.h" class octave_value_list; class tree_walker; // Character matrix values with special properties for use as // strings. class OCTINTERP_API octave_char_matrix_str : public octave_char_matrix { public: octave_char_matrix_str (void) : octave_char_matrix () { } octave_char_matrix_str (const charMatrix& chm) : octave_char_matrix (chm) { } octave_char_matrix_str (const charNDArray& chm) : octave_char_matrix (chm) { } octave_char_matrix_str (const Array<char>& chm) : octave_char_matrix (chm) { } octave_char_matrix_str (char c) : octave_char_matrix (c) { } octave_char_matrix_str (const char *s) : octave_char_matrix (s) { } octave_char_matrix_str (const std::string& s) : octave_char_matrix (s) { } octave_char_matrix_str (const string_vector& s) : octave_char_matrix (s) { } octave_char_matrix_str (const octave_char_matrix& chm) : octave_char_matrix (chm) { } octave_char_matrix_str (const octave_char_matrix_str& chms) : octave_char_matrix (chms) { } ~octave_char_matrix_str (void) { } octave_base_value *clone (void) const { return new octave_char_matrix_str (*this); } octave_base_value *empty_clone (void) const { return new octave_char_matrix_str (); } type_conv_info numeric_conversion_function (void) const; octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false) { return do_index_op_internal (idx, resize_ok); } octave_value squeeze (void) const { return octave_value (charNDArray (matrix.squeeze ())); } octave_value reshape (const dim_vector& new_dims) const { return octave_value (charNDArray (matrix.reshape (new_dims))); } octave_value permute (const Array<int>& vec, bool inv = false) const { return octave_value (charNDArray (matrix.permute (vec, inv))); } octave_value resize (const dim_vector& dv, bool fill = false) const; octave_value diag (octave_idx_type k = 0) const { return octave_value (matrix.diag (k)); } bool is_string (void) const { return true; } bool is_numeric_type (void) const { return false; } double double_value (bool = false) const; Matrix matrix_value (bool = false) const; NDArray array_value (bool = false) const; Complex complex_value (bool = false) const; ComplexMatrix complex_matrix_value (bool = false) const; ComplexNDArray complex_array_value (bool = false) const; string_vector all_strings (bool pad = false) const; std::string string_value (bool force = false) const; Array<std::string> cellstr_value (void) const; octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const { return octave_value (matrix.sort (dim, mode)); } octave_value sort (Array<octave_idx_type> &sidx, octave_idx_type dim = 0, sortmode mode = ASCENDING) const { return octave_value (matrix.sort (sidx, dim, mode)); } bool print_as_scalar (void) const { return (rows () <= 1); } void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; void short_disp (std::ostream& os) const; bool save_ascii (std::ostream& os); bool load_ascii (std::istream& is); bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats); bool load_hdf5 (octave_hdf5_id loc_id, const char *name); int write (octave_stream& os, int block_size, oct_data_conv::data_type output_type, int skip, oct_mach_info::float_format flt_fmt) const { return os.write (matrix, block_size, output_type, skip, flt_fmt); } protected: octave_value do_index_op_internal (const octave_value_list& idx, bool resize_ok, char type = '"'); private: DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; typedef octave_char_matrix_str octave_char_matrix_dq_str; class octave_char_matrix_sq_str : public octave_char_matrix_str { public: octave_char_matrix_sq_str (void) : octave_char_matrix_str () { } octave_char_matrix_sq_str (const charMatrix& chm) : octave_char_matrix_str (chm) { } octave_char_matrix_sq_str (const charNDArray& chm) : octave_char_matrix_str (chm) { } octave_char_matrix_sq_str (const Array<char>& chm) : octave_char_matrix_str (chm) { } octave_char_matrix_sq_str (char c) : octave_char_matrix_str (c) { } octave_char_matrix_sq_str (const char *s) : octave_char_matrix_str (s) { } octave_char_matrix_sq_str (const std::string& s) : octave_char_matrix_str (s) { } octave_char_matrix_sq_str (const string_vector& s) : octave_char_matrix_str (s) { } octave_char_matrix_sq_str (const octave_char_matrix_str& chm) : octave_char_matrix_str (chm) { } octave_char_matrix_sq_str (const octave_char_matrix_sq_str& chms) : octave_char_matrix_str (chms) { } ~octave_char_matrix_sq_str (void) { } octave_base_value *clone (void) const { return new octave_char_matrix_sq_str (*this); } octave_base_value *empty_clone (void) const { return new octave_char_matrix_sq_str (); } octave_value squeeze (void) const { return octave_value (charNDArray (matrix.squeeze ()), '\''); } octave_value reshape (const dim_vector& new_dims) const { return octave_value (charNDArray (matrix.reshape (new_dims)), '\''); } octave_value permute (const Array<int>& vec, bool inv = false) const { return octave_value (charNDArray (matrix.permute (vec, inv)), '\''); } octave_value resize (const dim_vector& dv, bool = false) const { charNDArray retval (matrix); retval.resize (dv); return octave_value (retval, '\''); } octave_value diag (octave_idx_type k = 0) const { return octave_value (matrix.diag (k), '\''); } bool is_sq_string (void) const { return true; } octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false) { return do_index_op_internal (idx, resize_ok, '\''); } octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const { return octave_value (matrix.sort (dim, mode), '\''); } octave_value sort (Array<octave_idx_type> &sidx, octave_idx_type dim = 0, sortmode mode = ASCENDING) const { return octave_value (matrix.sort (sidx, dim, mode), '\''); } private: DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif