Mercurial > octave
annotate libinterp/operators/op-struct.cc @ 29989:b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
* xdiv.h, xdiv.cc (elem_xdiv): Rename from x_el_div.
(elem_xdiv, xdiv): Move inside octave namespace. Change all uses.
Provide deprecated wrapper functions to preserve old names.
* xnorm.h, xnorm.cc (xnorm, xcolnorms, xrownorms, xfrobnorm): Move
inside octave namespace. Change all uses. Provide deprecated wrapper
functions to preserve old names.
* xpow.h, xpow.cc (elem_xpow, xpow): Move inside octave namespace.
Change all uses. Provide deprecated wrapper functions to preserve old
names.
* ov-base.cc (install_base_type_conversions): Move inside octave
namespace.
* ops.h: Don't declare install_ops function here.
* ov-typeinfo.cc: Declare install_ops in source file instead of
including ops.h.
* mk-ops.sh: Move generated code inside octave namespace.
* 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-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.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-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-m-cm.cc, op-m-cs.cc,
op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-mi.cc, op-pm-pm.cc,
op-pm-scm.cc, op-pm-sm.cc, op-pm-template.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:
Move operator functions inside octave namespace.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 16 Aug 2021 21:38:22 -0400 |
parents | 7854d5752dd2 |
children | 796f54d4ddbf |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 //////////////////////////////////////////////////////////////////////// |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 // |
29358
0a5b15007766
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
3 // Copyright (C) 1996-2021 The Octave Project Developers |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 // See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 // distribution or <https://octave.org/copyright/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 // This file is part of Octave. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
9 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
10 // Octave is free software: you can redistribute it and/or modify it |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
11 // under the terms of the GNU General Public License as published by |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
12 // the Free Software Foundation, either version 3 of the License, or |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
13 // (at your option) any later version. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
14 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
15 // Octave is distributed in the hope that it will be useful, but |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
16 // WITHOUT ANY WARRANTY; without even the implied warranty of |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
18 // GNU General Public License for more details. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
19 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
20 // You should have received a copy of the GNU General Public License |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
21 // along with Octave; see the file COPYING. If not, see |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
22 // <https://www.gnu.org/licenses/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 //////////////////////////////////////////////////////////////////////// |
4939 | 25 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21647
diff
changeset
|
26 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
27 # include "config.h" |
4939 | 28 #endif |
29 | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
21014
diff
changeset
|
30 #include "errwarn.h" |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20833
diff
changeset
|
31 #include "ovl.h" |
4939 | 32 #include "ov.h" |
7959
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
33 #include "ov-re-mat.h" |
4939 | 34 #include "ov-struct.h" |
35 #include "ov-typeinfo.h" | |
36 #include "ops.h" | |
37 | |
29989
b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
38 OCTAVE_NAMESPACE_BEGIN |
b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
39 |
4939 | 40 // struct ops. |
41 | |
12646
eaba9d671fb7
Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
42 DEFUNOP (transpose, struct) |
5571 | 43 { |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
44 const octave_struct& v = dynamic_cast<const octave_struct&> (a); |
5571 | 45 |
46 if (v.ndims () > 2) | |
21014
b9d4c3615e89
maint: Capitalize D for dimension in messages and comments.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
47 error ("transpose not defined for N-D objects"); |
20833
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
48 |
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
49 return octave_value (v.map_value ().transpose ()); |
5571 | 50 } |
51 | |
12646
eaba9d671fb7
Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
52 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
|
53 { |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
54 const octave_scalar_struct& v = dynamic_cast<const octave_scalar_struct&> (a); |
12646
eaba9d671fb7
Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
55 |
eaba9d671fb7
Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
56 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
|
57 } |
eaba9d671fb7
Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
58 |
12760
e8fe03bfc051
allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents:
12646
diff
changeset
|
59 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
|
60 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
|
61 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
|
62 DEFNDCATOP_FN (ss_ss_concat, scalar_struct, scalar_struct, map, map, concat) |
4939 | 63 |
7959
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
64 static octave_value |
28630
35f974bab4c8
fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
65 oct_catop_struct_matrix (const octave_base_value& a1, |
35f974bab4c8
fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
66 const octave_base_value& a2, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
67 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
|
68 { |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
69 const octave_struct& v1 = dynamic_cast<const octave_struct&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
70 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
20833
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
71 |
7959
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
72 NDArray tmp = v2.array_value (); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
73 dim_vector dv = tmp.dims (); |
20833
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
74 |
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
75 if (! dv.all_zero ()) |
7959
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
76 error ("invalid concatenation of structure with matrix"); |
20833
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
77 |
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
78 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
|
79 } |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
80 |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
81 static octave_value |
28630
35f974bab4c8
fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
82 oct_catop_matrix_struct (const octave_base_value& a1, |
35f974bab4c8
fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
83 const octave_base_value& a2, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
84 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
|
85 { |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
86 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
87 const octave_struct& v2 = dynamic_cast<const octave_struct&> (a2); |
20833
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
88 |
7959
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
89 NDArray tmp = v1.array_value (); |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
90 dim_vector dv = tmp.dims (); |
20833
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
91 |
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
92 if (! dv.all_zero ()) |
7959
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
93 error ("invalid concatenation of structure with matrix"); |
20833
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
94 |
9c4c87679985
restructure calls to error
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
95 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
|
96 } |
a73b80cd1f10
allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
97 |
4939 | 98 void |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
99 install_struct_ops (octave::type_info& ti) |
4939 | 100 { |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
101 INSTALL_UNOP_TI (ti, op_transpose, octave_struct, transpose); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
102 INSTALL_UNOP_TI (ti, op_hermitian, octave_struct, transpose); |
5571 | 103 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
104 INSTALL_UNOP_TI (ti, op_transpose, octave_scalar_struct, scalar_transpose); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
105 INSTALL_UNOP_TI (ti, op_hermitian, octave_scalar_struct, scalar_transpose); |
12646
eaba9d671fb7
Allow transpose to work for scalar structs (bug #33218)
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
106 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
107 INSTALL_CATOP_TI (ti, octave_struct, octave_struct, s_s_concat); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
108 INSTALL_CATOP_TI (ti, octave_struct, octave_scalar_struct, s_ss_concat) |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
109 INSTALL_CATOP_TI (ti, octave_scalar_struct, octave_struct, ss_s_concat) |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
110 INSTALL_CATOP_TI (ti, octave_scalar_struct, octave_scalar_struct, ss_ss_concat) |
12760
e8fe03bfc051
allow concatenation of scalar structures with []
John W. Eaton <jwe@octave.org>
parents:
12646
diff
changeset
|
111 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
112 INSTALL_CATOP_TI (ti, octave_struct, octave_matrix, struct_matrix); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
113 INSTALL_CATOP_TI (ti, octave_matrix, octave_struct, matrix_struct); |
4939 | 114 } |
29989
b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
115 |
b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
116 OCTAVE_NAMESPACE_END |