Mercurial > hg > octave-nkf
annotate src/OPERATORS/op-b-sbm.cc @ 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 |
|---|---|
| 5164 | 1 /* |
| 2 | |
| 11523 | 3 Copyright (C) 2004-2011 David Bateman |
| 4 Copyright (C) 1998-2004 Andy Adler | |
| 7016 | 5 |
| 6 This file is part of Octave. | |
| 5164 | 7 |
| 8 Octave is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
| 11 option) any later version. | |
| 5164 | 12 |
| 13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 7016 | 19 along with Octave; see the file COPYING. If not, see |
| 20 <http://www.gnu.org/licenses/>. | |
| 5164 | 21 |
| 22 */ | |
| 23 | |
| 24 #ifdef HAVE_CONFIG_H | |
| 25 #include <config.h> | |
| 26 #endif | |
| 27 | |
| 28 #include "gripes.h" | |
| 29 #include "oct-obj.h" | |
| 30 #include "ov.h" | |
| 31 #include "ov-typeinfo.h" | |
| 32 #include "ov-bool.h" | |
| 7289 | 33 #include "ov-bool-mat.h" |
| 5164 | 34 #include "ov-scalar.h" |
| 35 #include "ops.h" | |
| 36 | |
| 37 #include "ov-re-sparse.h" | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7289
diff
changeset
|
38 #include "ov-bool-sparse.h" |
| 5164 | 39 |
| 40 // bool by sparse bool matrix ops. | |
| 41 | |
| 42 DEFBINOP_FN (ne, bool, sparse_bool_matrix, mx_el_ne) | |
| 43 DEFBINOP_FN (eq, bool, sparse_bool_matrix, mx_el_eq) | |
| 44 | |
| 45 DEFBINOP_FN (el_and, bool, sparse_bool_matrix, mx_el_and) | |
| 46 DEFBINOP_FN (el_or, bool, sparse_bool_matrix, mx_el_or) | |
| 47 | |
| 48 DEFCATOP (b_sbm, bool, sparse_bool_matrix) | |
| 49 { | |
| 50 CAST_BINOP_ARGS (octave_bool&, const octave_sparse_bool_matrix&); | |
| 51 SparseBoolMatrix tmp (1, 1, v1.bool_value ()); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
52 return octave_value (tmp. concat (v2.sparse_bool_matrix_value (), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
53 ra_idx)); |
| 5164 | 54 } |
| 55 | |
| 56 DEFCATOP (b_sm, bool, sparse_matrix) | |
| 57 { | |
| 58 CAST_BINOP_ARGS (octave_bool&, const octave_sparse_matrix&); | |
| 59 SparseMatrix tmp (1, 1, v1.scalar_value ()); | |
| 60 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); | |
| 61 } | |
| 62 | |
| 63 DEFCATOP (s_sbm, scalar, sparse_bool_matrix) | |
| 64 { | |
| 65 CAST_BINOP_ARGS (octave_scalar&, const octave_sparse_bool_matrix&); | |
| 66 SparseMatrix tmp (1, 1, v1.scalar_value ()); | |
| 67 return octave_value(tmp. concat (v2.sparse_matrix_value (), ra_idx)); | |
| 68 } | |
| 69 | |
| 70 DEFCONV (sparse_bool_matrix_conv, bool, sparse_bool_matrix) | |
| 71 { | |
| 72 CAST_CONV_ARG (const octave_bool&); | |
| 73 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
74 return new octave_sparse_bool_matrix |
| 5164 | 75 (SparseBoolMatrix (1, 1, v.bool_value ())); |
| 76 } | |
| 77 | |
| 78 void | |
| 79 install_b_sbm_ops (void) | |
| 80 { | |
| 81 INSTALL_BINOP (op_eq, octave_bool, octave_sparse_bool_matrix, eq); | |
| 82 INSTALL_BINOP (op_ne, octave_bool, octave_sparse_bool_matrix, ne); | |
| 83 | |
| 84 INSTALL_BINOP (op_el_and, octave_bool, octave_sparse_bool_matrix, el_and); | |
| 85 INSTALL_BINOP (op_el_or, octave_bool, octave_sparse_bool_matrix, el_or); | |
| 86 | |
| 87 INSTALL_CATOP (octave_bool, octave_sparse_bool_matrix, b_sbm); | |
| 88 INSTALL_CATOP (octave_bool, octave_sparse_matrix, b_sm); | |
| 89 INSTALL_CATOP (octave_scalar, octave_sparse_bool_matrix, s_sbm); | |
| 90 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
91 INSTALL_ASSIGNCONV (octave_bool, octave_sparse_bool_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
92 octave_bool_matrix); |
| 5164 | 93 |
| 94 INSTALL_WIDENOP (octave_bool, octave_sparse_bool_matrix, sparse_bool_matrix_conv); | |
| 95 } |