Mercurial > octave

annotate libinterp/operators/op-struct.cc @ 20940:48b2ad5ee801

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity. * libinterp/corefcn/oct-obj.h: Replaced. Contains a #warning issued if used in compilation and includes "ovl.h" instead. Original file renamed to libinterp/octave-value/ovl.h * libinterp/corefcn/oct-obj.cc: Renamed to libinterp/octave-value/ovl.cc. * oct-obj.cc (ovl ()): Added new function to return empty octave_value_list. * libinterp/corefcn/module.mk: Remove oct-obj.cc from build system. * libinterp/octave-value/module.mk: Add ovl.h and ovl.cc to build system. * mk-opts.pl, annotation-dialog.h, Cell.cc, __contourc__.cc, __dsearchn__.cc, __lin_interpn__.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc, betainc.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc, defun.cc, det.cc, dirfns.cc, dlmread.cc, eig.cc, error.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, graphics.cc, gripes.cc, help.cc, hess.cc, hex2num.cc, hook-fcn.h, input.cc, input.h, inv.cc, kron.cc, load-save.cc, lookup.cc, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lsode.cc, lu.cc, luinc.cc, max.cc, mex.cc, oct-hist.cc, oct-lvalue.cc, oct-lvalue.h, oct-map.h, oct-stream.cc, oct.h, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sparse-xpow.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.h, syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc, xpow.cc, __delaunayn__.cc, __glpk__.cc, __voronoi__.cc, audiodevinfo.cc, audioread.cc, chol.cc, convhulln.cc, dmperm.cc, qr.cc, symbfact.cc, mkbuiltins, ov-base-diag.h, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-bool-mat.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-colon.cc, ov-complex.cc, ov-cs-list.h, ov-cx-mat.cc, ov-dld-fcn.cc, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.h, ov-mex-fcn.cc, ov-perm.h, ov-range.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, octave.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-double-conv.cc, op-fcdm-fcdm.cc, op-fcdm-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int-conv.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, parse.h, pt-arg-list.cc, pt-assign.cc, pt-binop.cc, pt-cbinop.cc, pt-cell.cc, pt-colon.cc, pt-const.cc, pt-eval.h, pt-fcn-handle.cc, pt-funcall.h, pt-id.cc, pt-idx.cc, pt-jump.cc, pt-mat.cc, pt-select.cc, pt-unop.cc, token.cc, Array-sym.cc: replace '#include "oct-obj.h"' with '#include "ovl.h"'.
author Rik <rik@octave.org>
date Fri, 18 Dec 2015 16:04:56 -0800
parents 9c4c87679985
children b9d4c3615e89
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4939
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
1 /*
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
2
19697
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 17744
diff changeset
3 Copyright (C) 1996-2015 John W. Eaton
4939
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
4
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
6
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5571
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5571
diff changeset
10 option) any later version.
4939
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
11
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
15 for more details.
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
16
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5571
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5571
diff changeset
19 <http://www.gnu.org/licenses/>.
4939
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
20
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
21 */
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
22
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
23 #ifdef HAVE_CONFIG_H
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
24 #include <config.h>
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
25 #endif
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
26
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
27 #include "gripes.h"
20940
48b2ad5ee801 maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents: 20833
diff changeset
28 #include "ovl.h"
4939
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
29 #include "ov.h"
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
30 #include "ov-re-mat.h"
4939
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
31 #include "ov-struct.h"
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
32 #include "ov-typeinfo.h"
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
33 #include "ops.h"
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
34
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
35 // struct ops.
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
36
12646
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
37 DEFUNOP (transpose, struct)
5571
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5307
diff changeset
38 {
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5307
diff changeset
39 CAST_UNOP_ARG (const octave_struct&);
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5307
diff changeset
40
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5307
diff changeset
41 if (v.ndims () > 2)
20833
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
42 error ("transpose not defined for N-d objects");
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
43
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
44 return octave_value (v.map_value ().transpose ());
5571
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5307
diff changeset
45 }
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5307
diff changeset
46
12646
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
47 DEFUNOP (scalar_transpose, scalar_struct)
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
48 {
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
49 CAST_UNOP_ARG (const octave_scalar_struct&);
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
50
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
51 return octave_value (v.scalar_map_value ());
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
52 }
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
53
12760
e8fe03bfc051 allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents: 12646
diff changeset
54 DEFNDCATOP_FN (s_s_concat, struct, struct, map, map, concat)
e8fe03bfc051 allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents: 12646
diff changeset
55 DEFNDCATOP_FN (s_ss_concat, struct, scalar_struct, map, map, concat)
e8fe03bfc051 allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents: 12646
diff changeset
56 DEFNDCATOP_FN (ss_s_concat, scalar_struct, struct, map, map, concat)
e8fe03bfc051 allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents: 12646
diff changeset
57 DEFNDCATOP_FN (ss_ss_concat, scalar_struct, scalar_struct, map, map, concat)
4939
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
58
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
59 static octave_value
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
60 oct_catop_struct_matrix (octave_base_value& a1, const octave_base_value& a2,
9931
fb6b6fcafa62 untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
61 const Array<octave_idx_type>&)
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
62 {
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
63 CAST_BINOP_ARGS (const octave_struct&, const octave_matrix&);
20833
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
64
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
65 NDArray tmp = v2.array_value ();
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
66 dim_vector dv = tmp.dims ();
20833
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
67
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
68 if (! dv.all_zero ())
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
69 error ("invalid concatenation of structure with matrix");
20833
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
70
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
71 return octave_value (v1.map_value ());
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
72 }
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
73
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
74 static octave_value
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
75 oct_catop_matrix_struct (octave_base_value& a1, const octave_base_value& a2,
9931
fb6b6fcafa62 untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
76 const Array<octave_idx_type>&)
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
77 {
8318
cc29ef9a2d84 Correct cast of matrix by cell or struct concatenation
David Bateman <dbateman@free.fr>
parents: 7959
diff changeset
78 CAST_BINOP_ARGS (const octave_matrix&, const octave_struct&);
20833
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
79
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
80 NDArray tmp = v1.array_value ();
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
81 dim_vector dv = tmp.dims ();
20833
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
82
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
83 if (! dv.all_zero ())
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
84 error ("invalid concatenation of structure with matrix");
20833
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
85
9c4c87679985 restructure calls to error
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
86 return octave_value (v2.map_value ());
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
87 }
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
88
4939
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
89 void
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
90 install_struct_ops (void)
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
91 {
5571
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5307
diff changeset
92 INSTALL_UNOP (op_transpose, octave_struct, transpose);
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5307
diff changeset
93 INSTALL_UNOP (op_hermitian, octave_struct, transpose);
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5307
diff changeset
94
12646
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
95 INSTALL_UNOP (op_transpose, octave_scalar_struct, scalar_transpose);
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
96 INSTALL_UNOP (op_hermitian, octave_scalar_struct, scalar_transpose);
eaba9d671fb7 Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
97
12760
e8fe03bfc051 allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents: 12646
diff changeset
98 INSTALL_CATOP (octave_struct, octave_struct, s_s_concat);
e8fe03bfc051 allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents: 12646
diff changeset
99 INSTALL_CATOP (octave_struct, octave_scalar_struct, s_ss_concat)
e8fe03bfc051 allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents: 12646
diff changeset
100 INSTALL_CATOP (octave_scalar_struct, octave_struct, ss_s_concat)
e8fe03bfc051 allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents: 12646
diff changeset
101 INSTALL_CATOP (octave_scalar_struct, octave_scalar_struct, ss_ss_concat)
e8fe03bfc051 allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents: 12646
diff changeset
102
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
103 INSTALL_CATOP (octave_struct, octave_matrix, struct_matrix);
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7017
diff changeset
104 INSTALL_CATOP (octave_matrix, octave_struct, matrix_struct);
4939
22388c7625a0 [project @ 2004-08-10 04:33:51 by jwe]
jwe
parents:
diff changeset
105 }