Mercurial > hg > octave-nkf
view src/ov-complex.h @ 13294:7dce7e110511
make concatenation of class objects work
* data.h: New file.
* src/Makefile.am (octinclude_HEADERS): Add it to the list.
* data.cc (attempt_type_conversion): New static function.
(do_class_concat): New function.
(do_cat): Use it if any elements of the list are objects.
Check whether any elements of the list are objects or cells.
Check whether all elements of the list are complex.
Check whether the first element of the list is a struct.
Maybe convert elements of the list to cells.
New tests for horzcat and vertcat.
* data.h (do_class_concat): Provide decl.
* ov-class.h (octave_class::octave_class): Allow optional parent
list.
* ov.h, ov.h (octave_value::octave_value (const Octave_map&,
const std::string&)): Likewise.
* pt-mat.cc (do_class_concat): New static function.
(tree_matrix::rvalue1): Use it to concatenate objects.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 07 Oct 2011 22:16:07 -0400 |
parents | 12df7854fa7c |
children | b5e819930fd5 |
line wrap: on
line source
/* Copyright (C) 1996-2011 John W. Eaton 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_complex_h) #define octave_complex_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "lo-ieee.h" #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h" #include "gripes.h" #include "error.h" #include "ov-base.h" #include "ov-cx-mat.h" #include "ov-base-scalar.h" #include "ov-typeinfo.h" class octave_value_list; class tree_walker; // Complex scalar values. class OCTINTERP_API octave_complex : public octave_base_scalar<Complex> { public: octave_complex (void) : octave_base_scalar<Complex> () { } octave_complex (const Complex& c) : octave_base_scalar<Complex> (c) { } octave_complex (const octave_complex& c) : octave_base_scalar<Complex> (c) { } ~octave_complex (void) { } octave_base_value *clone (void) const { return new octave_complex (*this); } // We return an octave_complex_matrix object here instead of an // octave_complex object so that in expressions like A(2,2,2) = 2 // (for A previously undefined), A will be empty instead of a 1x1 // object. octave_base_value *empty_clone (void) const { return new octave_complex_matrix (); } type_conv_info numeric_demotion_function (void) const; octave_base_value *try_narrowing_conversion (void); octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); octave_value any (int = 0) const { return (scalar != Complex (0, 0) && ! (lo_ieee_isnan (std::real (scalar)) || lo_ieee_isnan (std::imag (scalar)))); } builtin_type_t builtin_type (void) const { return btyp_complex; } bool is_complex_scalar (void) const { return true; } bool is_complex_type (void) const { return true; } bool is_double_type (void) const { return true; } bool is_float_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); } Matrix matrix_value (bool = false) const; FloatMatrix float_matrix_value (bool = false) const; NDArray array_value (bool = false) const; FloatNDArray float_array_value (bool = false) const; SparseMatrix sparse_matrix_value (bool = false) const { return SparseMatrix (matrix_value ()); } SparseComplexMatrix sparse_complex_matrix_value (bool = false) const { return SparseComplexMatrix (complex_matrix_value ()); } octave_value resize (const dim_vector& dv, bool fill = false) const; Complex complex_value (bool = false) const; FloatComplex float_complex_value (bool = false) const; ComplexMatrix complex_matrix_value (bool = false) const; FloatComplexMatrix float_complex_matrix_value (bool = false) const; ComplexNDArray complex_array_value (bool = false) const; FloatComplexNDArray float_complex_array_value (bool = false) const; bool bool_value (bool warn = false) const { if (xisnan (scalar)) gripe_nan_to_logical_conversion (); else if (warn && scalar != 0.0 && scalar != 1.0) gripe_logical_conversion (); return scalar != 0.0; } boolNDArray bool_array_value (bool warn = false) const { if (xisnan (scalar)) gripe_nan_to_logical_conversion (); else if (warn && scalar != 0.0 && scalar != 1.0) gripe_logical_conversion (); return boolNDArray (dim_vector (1, 1), scalar != 0.0); } void increment (void) { scalar += 1.0; } void decrement (void) { scalar -= 1.0; } 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); #if defined (HAVE_HDF5) bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); bool load_hdf5 (hid_t loc_id, const char *name); #endif 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 { // Yes, for compatibility, we drop the imaginary part here. return os.write (array_value (true), block_size, output_type, skip, flt_fmt); } mxArray *as_mxArray (void) const; octave_value map (unary_mapper_t umap) const; private: DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; typedef octave_complex octave_complex_scalar; #endif