Mercurial > octave

annotate liboctave/array/dim-vector.cc @ 33639:65b1cf6aa60a bytecode-interpreter tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge default to bytecode-interpreter
author Arun Giridhar <arungiridhar@gmail.com>
date Mon, 03 Jun 2024 14:38:47 -0400
parents 2e484f9f1f18
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 //
32632
2e484f9f1f18 maint: update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 31771
diff changeset
3 // Copyright (C) 2003-2024 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 // 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 // Copyirght (C) 2009, 2010 VZLU Prague
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 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // 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
13 // 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
14 // 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
15 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // 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
18 // 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
19 // 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
20 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // 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
23 // 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
24 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
25 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
26 ////////////////////////////////////////////////////////////////////////
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
27
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21660
diff changeset
28 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21202
diff changeset
29 # include "config.h"
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
30 #endif
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
31
23443
3f1bf237908b maint: Eliminate <cfloat.h> header from liboctave files.
Rik <rik@octave.org>
parents: 23408
diff changeset
32 #include <limits>
3f1bf237908b maint: Eliminate <cfloat.h> header from liboctave files.
Rik <rik@octave.org>
parents: 23408
diff changeset
33 #include <new>
22213
1723063e65f3 dim-vector: add missing, and remove unecessary, #includes.
Carnë Draug <carandraug@octave.org>
parents: 22212
diff changeset
34 #include <sstream>
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
35
23679
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
36 #include "Array.h"
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
37 #include "dim-vector.h"
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
38
21751
b571fc85953f maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents: 21724
diff changeset
39 // The maximum allowed value for a dimension extent. This will normally be a
17769
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents: 17744
diff changeset
40 // tiny bit off the maximum value of octave_idx_type.
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents: 17744
diff changeset
41 // Currently 1 is subtracted to allow safe conversion of any 2D Array into
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents: 17744
diff changeset
42 // Sparse, but this offset may change in the future.
10830
b4ebfd675321 avoid static initialization disaster in dim_vector
Jaroslav Hajek <highegg@gmail.com>
parents: 10810
diff changeset
43 octave_idx_type
31771
21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations.
Rik <rik@octave.org>
parents: 31706
diff changeset
44 dim_vector::dim_max ()
10830
b4ebfd675321 avoid static initialization disaster in dim_vector
Jaroslav Hajek <highegg@gmail.com>
parents: 10810
diff changeset
45 {
b4ebfd675321 avoid static initialization disaster in dim_vector
Jaroslav Hajek <highegg@gmail.com>
parents: 10810
diff changeset
46 return std::numeric_limits<octave_idx_type>::max () - 1;
b4ebfd675321 avoid static initialization disaster in dim_vector
Jaroslav Hajek <highegg@gmail.com>
parents: 10810
diff changeset
47 }
10810
6683f0c9d742 make the maximum extent externally accessible
Jaroslav Hajek <highegg@gmail.com>
parents: 10715
diff changeset
48
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
49 void
31771
21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations.
Rik <rik@octave.org>
parents: 31706
diff changeset
50 dim_vector::chop_all_singletons ()
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
51 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
52 int j = 0;
23408
0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors.
Rik <rik@octave.org>
parents: 23392
diff changeset
53 int nd = ndims ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
54
23408
0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors.
Rik <rik@octave.org>
parents: 23392
diff changeset
55 for (int i = 0; i < nd; i++)
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
56 {
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
57 if (xelem(i) != 1)
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
58 xelem(j++) = xelem(i);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
59 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
60
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
61 if (j == 1)
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
62 xelem(1) = 1;
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
63
29945
13e9e244284e rename dim_vector data members for clarity
John W. Eaton <jwe@octave.org>
parents: 29944
diff changeset
64 m_num_dims = (j > 2 ? j : 2);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
65 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
66
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
67 std::string
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
68 dim_vector::str (char sep) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
69 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
70 std::ostringstream buf;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
71
21660
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors.
Rik <rik@octave.org>
parents: 21574
diff changeset
72 for (int i = 0; i < ndims (); i++)
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
73 {
23392
77a7f2fecd74 New xelem function for fast access to dim_vector internals.
Rik <rik@octave.org>
parents: 23220
diff changeset
74 buf << xelem (i);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
75
21660
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors.
Rik <rik@octave.org>
parents: 21574
diff changeset
76 if (i < ndims () - 1)
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
77 buf << sep;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
78 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
79
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
80 std::string retval = buf.str ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
81
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
82 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
83 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
84
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
85 int
31771
21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations.
Rik <rik@octave.org>
parents: 31706
diff changeset
86 dim_vector::num_ones () const
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
87 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
88 int retval = 0;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
89
21660
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors.
Rik <rik@octave.org>
parents: 21574
diff changeset
90 for (int i = 0; i < ndims (); i++)
23392
77a7f2fecd74 New xelem function for fast access to dim_vector internals.
Rik <rik@octave.org>
parents: 23220
diff changeset
91 if (xelem (i) == 1)
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
92 retval++;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
93
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
94 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
95 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
96
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
97 octave_idx_type
31771
21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations.
Rik <rik@octave.org>
parents: 31706
diff changeset
98 dim_vector::safe_numel () const
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
99 {
27880
31b95261c7d2 Backed out changeset 2890a931e647 (bug #47469)
Rik <rik@octave.org>
parents: 27627
diff changeset
100 octave_idx_type idx_max = dim_max ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
101 octave_idx_type n = 1;
21660
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors.
Rik <rik@octave.org>
parents: 21574
diff changeset
102 int n_dims = ndims ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
103
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
104 for (int i = 0; i < n_dims; i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
105 {
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
106 n *= xelem(i);
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
107 if (xelem(i) != 0)
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
108 idx_max /= xelem(i);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
109 if (idx_max <= 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
110 throw std::bad_alloc ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
111 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
112
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
113 return n;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
114 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
115
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
116 dim_vector
31771
21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations.
Rik <rik@octave.org>
parents: 31706
diff changeset
117 dim_vector::squeeze () const
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
118 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
119 dim_vector new_dims = *this;
24278
508d27e82ad1 dim-vector.cc: rewrite dim-vector.cc::squeeze using existing functions
Andreas Weber <andy.weber.aw@gmail.com>
parents: 23679
diff changeset
120 new_dims.chop_all_singletons ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
121
24278
508d27e82ad1 dim-vector.cc: rewrite dim-vector.cc::squeeze using existing functions
Andreas Weber <andy.weber.aw@gmail.com>
parents: 23679
diff changeset
122 // preserve orientation if there is only one non-singleton dimension left
508d27e82ad1 dim-vector.cc: rewrite dim-vector.cc::squeeze using existing functions
Andreas Weber <andy.weber.aw@gmail.com>
parents: 23679
diff changeset
123 if (new_dims.ndims () == 2 && xelem(0) == 1 && new_dims.elem(1) == 1)
508d27e82ad1 dim-vector.cc: rewrite dim-vector.cc::squeeze using existing functions
Andreas Weber <andy.weber.aw@gmail.com>
parents: 23679
diff changeset
124 return new_dims.as_row ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
125
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
126 return new_dims;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
127 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
128
21751
b571fc85953f maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents: 21724
diff changeset
129 // This is the rule for cat(). cat (dim, A, B) works if one
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
130 // of the following holds, in this order:
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
131 //
15018
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents: 14846
diff changeset
132 // 1. size (A, k) == size (B, k) for all k != dim.
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
133 // In this case, size (C, dim) = size (A, dim) + size (B, dim) and
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
134 // other sizes remain intact.
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
135 //
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
136 // 2. A is 0x0, in which case B is the result
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
137 // 3. B is 0x0, in which case A is the result
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
138
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
139 bool
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
140 dim_vector::concat (const dim_vector& dvb, int dim)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
141 {
18084
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents: 17769
diff changeset
142 int orig_nd = ndims ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents: 17769
diff changeset
143 int ndb = dvb.ndims ();
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23443
diff changeset
144 int new_nd = (dim < ndb ? ndb : dim + 1);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
145 if (new_nd > orig_nd)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
146 resize (new_nd, 1);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
147 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
148 new_nd = orig_nd;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
149
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
150 bool match = true;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
151
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
152 for (int i = 0; i < ndb; i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
153 {
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
154 if (i != dim && xelem(i) != dvb(i))
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
155 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
156 match = false;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
157 break;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
158 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
159 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
160
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
161 for (int i = ndb; i < new_nd; i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
162 {
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
163 if (i != dim && xelem(i) != 1)
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
164 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
165 match = false;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
166 break;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
167 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
168 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
169
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
170 if (match)
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
171 xelem(dim) += (dim < ndb ? dvb(dim) : 1);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
172 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
173 {
21751
b571fc85953f maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents: 21724
diff changeset
174 // Dimensions don't match. The only allowed fix is to omit 0x0.
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
175 if (ndb == 2 && dvb(0) == 0 && dvb(1) == 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
176 match = true;
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
177 else if (orig_nd == 2 && xelem(0) == 0 && xelem(1) == 0)
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
178 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
179 *this = dvb;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
180 match = true;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
181 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
182 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
183
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
184 chop_trailing_singletons ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
185
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
186 return match;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
187 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
188
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
189 // Rules for horzcat/vertcat are yet looser.
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
190 // two arrays A, B can be concatenated
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
191 // horizontally (dim = 2) or vertically (dim = 1) if one of the
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
192 // following holds, in this order:
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
193 //
15018
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents: 14846
diff changeset
194 // 1. cat (dim, A, B) works
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
195 //
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
196 // 2. A, B are 2D and one of them is an empty vector, in which
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
197 // case the result is the other one except if both of them
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
198 // are empty vectors, in which case the result is 0x0.
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
199
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
200 bool
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
201 dim_vector::hvcat (const dim_vector& dvb, int dim)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
202 {
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
203 if (concat (dvb, dim))
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
204 return true;
21660
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors.
Rik <rik@octave.org>
parents: 21574
diff changeset
205 else if (ndims () == 2 && dvb.ndims () == 2)
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
206 {
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
207 bool e2dv = xelem(0) + xelem(1) == 1;
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
208 bool e2dvb = dvb(0) + dvb(1) == 1;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
209 if (e2dvb)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
210 {
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
211 if (e2dv)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
212 *this = dim_vector ();
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
213 return true;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
214 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
215 else if (e2dv)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
216 {
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
217 *this = dvb;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
218 return true;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
219 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
220 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
221
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
222 return false;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
223 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
224
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
225 dim_vector
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
226 dim_vector::redim (int n) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
227 {
21660
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors.
Rik <rik@octave.org>
parents: 21574
diff changeset
228 int n_dims = ndims ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
229
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
230 if (n_dims == n)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
231 return *this;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
232 else if (n_dims < n)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
233 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
234 dim_vector retval = alloc (n);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
235
29945
13e9e244284e rename dim_vector data members for clarity
John W. Eaton <jwe@octave.org>
parents: 29944
diff changeset
236 std::copy_n (m_dims, n_dims, retval.m_dims);
13e9e244284e rename dim_vector data members for clarity
John W. Eaton <jwe@octave.org>
parents: 29944
diff changeset
237 std::fill_n (retval.m_dims + n_dims, n - n_dims, 1);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
238
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
239 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
240 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
241 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
242 {
23408
0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors.
Rik <rik@octave.org>
parents: 23392
diff changeset
243 if (n < 1)
0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors.
Rik <rik@octave.org>
parents: 23392
diff changeset
244 n = 1;
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
245
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
246 dim_vector retval = alloc (n);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
247
29945
13e9e244284e rename dim_vector data members for clarity
John W. Eaton <jwe@octave.org>
parents: 29944
diff changeset
248 std::copy_n (m_dims, n-1, retval.m_dims);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
249
23408
0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors.
Rik <rik@octave.org>
parents: 23392
diff changeset
250 // Accumulate overflow dimensions into last remaining dimension
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
251 int k = xelem(n-1);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
252 for (int i = n; i < n_dims; i++)
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
253 k *= xelem(i);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
254
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
255 retval.xelem(n-1) = k;
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
256
23408
0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors.
Rik <rik@octave.org>
parents: 23392
diff changeset
257 // All dim_vectors are at least 2-D. Make Nx1 if necessary.
0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors.
Rik <rik@octave.org>
parents: 23392
diff changeset
258 if (n == 1)
29944
029880dbbebb prefer xelem over indexing m_rep in dim_vector class
John W. Eaton <jwe@octave.org>
parents: 29943
diff changeset
259 retval.xelem(1) = 1;
23408
0af9a1ae0912 maint: Use std::copy_n and std::fill_n for dim_vectors and idx_vectors.
Rik <rik@octave.org>
parents: 23392
diff changeset
260
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
261 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
262 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
263 }
23679
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
264
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
265 Array<octave_idx_type>
31771
21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations.
Rik <rik@octave.org>
parents: 31706
diff changeset
266 dim_vector::as_array () const
23679
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
267 {
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
268 octave_idx_type nd = ndims ();
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
269
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
270 Array<octave_idx_type> retval (dim_vector (1, nd));
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
271
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
272 for (octave_idx_type i = 0; i < nd; i++)
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
273 retval(i) = elem (i);
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
274
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
275 return retval;
ece6f43304e5 new function to convert dim_vector to Array<octave_idx_type>
John W. Eaton <jwe@octave.org>
parents: 23450
diff changeset
276 }