Mercurial > octave
annotate src/OPERATORS/op-cell.cc @ 7959:a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 21 Jul 2008 16:06:57 -0400 |
parents | a1dbe9d80eee |
children | 283989f2da9b cee2f0ae1dba |
rev | line source |
---|---|
3937 | 1 /* |
2 | |
7017 | 3 Copyright (C) 1996, 1997, 2002, 2003, 2004, 2005, 2007 John W. Eaton |
3937 | 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. | |
3937 | 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/>. | |
3937 | 20 |
21 */ | |
22 | |
23 #ifdef HAVE_CONFIG_H | |
24 #include <config.h> | |
25 #endif | |
26 | |
27 #include "gripes.h" | |
4055 | 28 #include "oct-obj.h" |
3937 | 29 #include "ov.h" |
30 #include "ov-cell.h" | |
31 #include "ov-scalar.h" | |
32 #include "ov-re-mat.h" | |
33 #include "ov-typeinfo.h" | |
34 #include "ops.h" | |
35 | |
36 // cell ops. | |
37 | |
4673 | 38 DEFUNOP (transpose, cell) |
39 { | |
40 CAST_UNOP_ARG (const octave_cell&); | |
41 | |
42 if (v.ndims () > 2) | |
43 { | |
44 error ("transpose not defined for N-d objects"); | |
45 return octave_value (); | |
46 } | |
47 else | |
48 return octave_value (Cell (v.cell_value().transpose ())); | |
49 } | |
50 | |
4915 | 51 DEFCATOP_FN (c_c, cell, cell, concat) |
52 | |
7959
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
53 static octave_value |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
54 oct_catop_cell_matrix (octave_base_value& a1, const octave_base_value& a2, |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
55 const Array<octave_idx_type>&) |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
56 { |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
57 octave_value retval; |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
58 CAST_BINOP_ARGS (const octave_cell&, const octave_matrix&); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
59 NDArray tmp = v2.array_value (); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
60 dim_vector dv = tmp.dims (); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
61 if (dv.all_zero ()) |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
62 retval = octave_value (v1.cell_value ()); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
63 else |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
64 error ("invalid concatenation of cell array with matrix"); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
65 return retval; |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
66 } |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
67 |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
68 static octave_value |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
69 oct_catop_matrix_cell (octave_base_value& a1, const octave_base_value& a2, |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
70 const Array<octave_idx_type>&) |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
71 { |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
72 octave_value retval; |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
73 CAST_BINOP_ARGS (const octave_cell&, const octave_matrix&); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
74 NDArray tmp = v1.array_value (); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
75 dim_vector dv = tmp.dims (); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
76 if (dv.all_zero ()) |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
77 retval = octave_value (v2.cell_value ()); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
78 else |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
79 error ("invalid concatenation of cell array with matrix"); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
80 return retval; |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
81 } |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
82 |
3937 | 83 DEFASSIGNANYOP_FN (assign, cell, assign); |
84 | |
85 void | |
86 install_cell_ops (void) | |
87 { | |
4673 | 88 INSTALL_UNOP (op_transpose, octave_cell, transpose); |
89 INSTALL_UNOP (op_hermitian, octave_cell, transpose); | |
90 | |
4915 | 91 INSTALL_CATOP (octave_cell, octave_cell, c_c); |
92 | |
7959
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
93 INSTALL_CATOP (octave_cell, octave_matrix, cell_matrix); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
94 INSTALL_CATOP (octave_matrix, octave_cell, matrix_cell); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
95 |
3937 | 96 INSTALL_ASSIGNANYOP (op_asn_eq, octave_cell, assign); |
97 } | |
98 | |
99 /* | |
100 ;;; Local Variables: *** | |
101 ;;; mode: C++ *** | |
102 ;;; End: *** | |
103 */ |