Mercurial > hg > octave-nkf
view src/ov-cell.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 | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 1999-2011 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_cell_h) #define octave_cell_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include <memory> #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h" #include "Cell.h" #include "error.h" #include "ov-base-mat.h" #include "ov-typeinfo.h" class octave_value_list; class tree_walker; // Cells. class octave_cell : public octave_base_matrix<Cell> { public: octave_cell (void) : octave_base_matrix<Cell> (), cellstr_cache () { } octave_cell (const Cell& c) : octave_base_matrix<Cell> (c), cellstr_cache () { } octave_cell (const Array<std::string>& str) : octave_base_matrix<Cell> (Cell (str)), cellstr_cache (new Array<std::string> (str)) { } octave_cell (const octave_cell& c) : octave_base_matrix<Cell> (c), cellstr_cache () { } ~octave_cell (void) { } octave_base_value *clone (void) const { return new octave_cell (*this); } octave_base_value *empty_clone (void) const { return new octave_cell (); } #if 0 octave_base_value *try_narrowing_conversion (void); #endif octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx) { octave_value_list tmp = subsref (type, idx, 1); return tmp.length () > 0 ? tmp(0) : octave_value (); } octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int); octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx, bool auto_add); octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs); void assign (const octave_value_list& idx, const Cell& rhs); void assign (const octave_value_list& idx, const octave_value& rhs); void delete_elements (const octave_value_list& idx); size_t byte_size (void) const; octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const; octave_value sort (Array<octave_idx_type> &sidx, octave_idx_type dim = 0, sortmode mode = ASCENDING) const; sortmode is_sorted (sortmode mode = UNSORTED) const; Array<octave_idx_type> sort_rows_idx (sortmode mode = ASCENDING) const; sortmode is_sorted_rows (sortmode mode = UNSORTED) const; bool is_matrix_type (void) const { return false; } bool is_numeric_type (void) const { return false; } bool is_defined (void) const { return true; } bool is_constant (void) const { return true; } bool is_cell (void) const { return true; } builtin_type_t builtin_type (void) const { return btyp_cell; } bool is_cellstr (void) const; bool is_true (void) const; Cell cell_value (void) const { return matrix; } octave_value_list list_value (void) const; octave_value convert_to_str_internal (bool pad, bool, char type) const { return octave_value (all_strings (pad), type); } string_vector all_strings (bool pad = false) const; Array<std::string> cellstr_value (void) const; bool print_as_scalar (void) const; void print (std::ostream& os, bool pr_as_read_syntax = false) const; void print_raw (std::ostream& os, bool pr_as_read_syntax = false) 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); #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 octave_value map (unary_mapper_t umap) const; mxArray *as_mxArray (void) const; // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. void *mex_get_data (void) const; private: void clear_cellstr_cache (void) const { cellstr_cache.reset (); } mutable std::auto_ptr<Array<std::string> > cellstr_cache; DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif