Mercurial > hg > octave-nkf
annotate src/ls-mat4.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 |
| rev | line source |
|---|---|
| 4634 | 1 /* |
| 2 | |
| 11523 | 3 Copyright (C) 2003-2011 John W. Eaton |
| 4634 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 4634 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 4634 | 20 |
| 21 */ | |
| 22 | |
| 23 #if !defined (octave_ls_mat4_h) | |
| 9340 | 24 #define octave_ls_mat4_h 1 |
| 4634 | 25 |
| 26 extern oct_mach_info::float_format | |
| 27 mopt_digit_to_float_format (int mach); | |
| 28 | |
| 29 extern int | |
| 30 float_format_to_mopt_digit (oct_mach_info::float_format flt_fmt); | |
| 31 | |
| 32 extern int | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
33 read_mat_file_header (std::istream& is, bool& swap, int32_t& mopt, |
| 10313 | 34 int32_t& nr, int32_t& nc, int32_t& imag, |
| 35 int32_t& len, int quiet = 0); | |
| 4634 | 36 |
| 37 extern std::string | |
| 38 read_mat_binary_data (std::istream& is, const std::string& filename, | |
| 10313 | 39 octave_value& tc); |
| 4634 | 40 |
| 41 extern bool | |
| 42 save_mat_binary_data (std::ostream& os, const octave_value& tc, | |
| 10313 | 43 const std::string& name) ; |
| 4634 | 44 |
| 45 #endif |