Mercurial > octave-nkf

annotate liboctave/array/dim-vector.cc @ 18084:8e056300994b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Follow coding convention of defining and initializing only 1 variable per line in liboctave. * liboctave/array/Array-b.cc, liboctave/array/Array-util.cc, liboctave/array/Array.cc, liboctave/array/CDiagMatrix.cc, liboctave/array/CMatrix.cc, liboctave/array/CSparse.cc, liboctave/array/MDiagArray2.cc, liboctave/array/MatrixType.cc, liboctave/array/PermMatrix.cc, liboctave/array/Sparse.cc, liboctave/array/Sparse.h, liboctave/array/boolSparse.cc, liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc, liboctave/array/dSparse.cc, liboctave/array/dim-vector.cc, liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc, liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc, liboctave/array/idx-vector.cc, liboctave/array/idx-vector.h, liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc, liboctave/numeric/base-qr.cc, liboctave/numeric/bsxfun-defs.cc, liboctave/numeric/bsxfun.h, liboctave/numeric/dbleLU.cc, liboctave/numeric/dbleQR.cc, liboctave/numeric/fCmplxLU.cc, liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc, liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-convn.cc, liboctave/numeric/oct-norm.cc, liboctave/numeric/sparse-dmsolve.cc, liboctave/operators/mx-inlines.cc, liboctave/operators/mx-op-defs.h, liboctave/util/caseless-str.h, liboctave/util/kpse.cc, liboctave/util/lo-utils.cc, liboctave/util/oct-binmap.h, liboctave/util/oct-cmplx.h, liboctave/util/oct-inttypes.cc, liboctave/util/oct-inttypes.h, liboctave/util/oct-sort.cc: Follow coding convention of defining and initializing only 1 variable per line in liboctave.
author Rik <rik@octave.org>
date Wed, 04 Dec 2013 22:13:18 -0800
parents 49a5a4be04a1
children 4197fc428c7d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
1 /*
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
2
17744
d63878346099 maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents: 15271
diff changeset
3 Copyright (C) 2003-2013 John W. Eaton
10686
8675858ba1e2 fix copyright stmt in 10683:4fdb36ffa066
Jaroslav Hajek <highegg@gmail.com>
parents: 10683
diff changeset
4 Copyirght (C) 2009, 2010 VZLU Prague
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
5
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
6 This file is part of Octave.
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
7
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
8 Octave is free software; you can redistribute it and/or modify it
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
10 Free Software Foundation; either version 3 of the License, or (at your
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
11 option) any later version.
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
12
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
13 Octave is distributed in the hope that it will be useful, but WITHOUT
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
16 for more details.
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
17
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
19 along with Octave; see the file COPYING. If not, see
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
20 <http://www.gnu.org/licenses/>.
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
21
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
22 */
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
23
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
24 #ifdef HAVE_CONFIG_H
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
25 #include <config.h>
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
26 #endif
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
27
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
28 #include <iostream>
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
29
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
30 #include "dim-vector.h"
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
31
17769
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents: 17744
diff changeset
32 // The maximum allowed value for a dimension extent. This will normally be a
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents: 17744
diff changeset
33 // 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
34 // 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
35 // 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
36 octave_idx_type
b4ebfd675321 avoid static initialization disaster in dim_vector
Jaroslav Hajek <highegg@gmail.com>
parents: 10810
diff changeset
37 dim_vector::dim_max (void)
b4ebfd675321 avoid static initialization disaster in dim_vector
Jaroslav Hajek <highegg@gmail.com>
parents: 10810
diff changeset
38 {
b4ebfd675321 avoid static initialization disaster in dim_vector
Jaroslav Hajek <highegg@gmail.com>
parents: 10810
diff changeset
39 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
40 }
10810
6683f0c9d742 make the maximum extent externally accessible
Jaroslav Hajek <highegg@gmail.com>
parents: 10715
diff changeset
41
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
42 void
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
43 dim_vector::chop_all_singletons (void)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
44 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
45 make_unique ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
46
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
47 int j = 0;
14846
460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents: 14624
diff changeset
48 int l = ndims ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
49
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
50 for (int i = 0; i < l; i++)
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 if (rep[i] != 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
53 rep[j++] = rep[i];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
54 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
55
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
56 if (j == 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
57 rep[1] = 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
58
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
59 ndims () = j > 2 ? j : 2;
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
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
62 std::string
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
63 dim_vector::str (char sep) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
64 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
65 std::ostringstream buf;
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 for (int i = 0; i < length (); i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
68 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
69 buf << elem (i);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
70
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
71 if (i < length () - 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
72 buf << sep;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
73 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
74
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
75 std::string retval = buf.str ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
76
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
77 return retval;
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 int
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
81 dim_vector::num_ones (void) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
82 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
83 int retval = 0;
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 for (int i = 0; i < length (); i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
86 if (elem (i) == 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
87 retval++;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
88
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
89 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
90 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
91
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
92 octave_idx_type
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
93 dim_vector::safe_numel (void) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
94 {
10830
b4ebfd675321 avoid static initialization disaster in dim_vector
Jaroslav Hajek <highegg@gmail.com>
parents: 10810
diff changeset
95 octave_idx_type idx_max = dim_max ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
96 octave_idx_type n = 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
97 int n_dims = length ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
98
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
99 for (int i = 0; i < n_dims; i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
100 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
101 n *= rep[i];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
102 if (rep[i] != 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
103 idx_max /= rep[i];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
104 if (idx_max <= 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
105 throw std::bad_alloc ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
106 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
107
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
108 return n;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
109 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
110
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
111 dim_vector
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
112 dim_vector::squeeze (void) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
113 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
114 dim_vector new_dims = *this;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
115
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
116 bool dims_changed = 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
117
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
118 int k = 0;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
119
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
120 for (int i = 0; i < length (); i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
121 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
122 if (elem (i) == 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
123 dims_changed = true;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
124 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
125 new_dims(k++) = elem (i);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
126 }
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 if (dims_changed)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
129 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
130 if (k == 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
131 new_dims = dim_vector (1, 1);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
132 else if (k == 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
133 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
134 // There is one non-singleton dimension, so we need
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
135 // to decide the correct orientation.
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
136
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
137 if (elem (0) == 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
138 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
139 // The original dimension vector had a leading
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
140 // singleton dimension.
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
141
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
142 octave_idx_type tmp = new_dims(0);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
143
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
144 new_dims.resize (2);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
145
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
146 new_dims(0) = 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
147 new_dims(1) = tmp;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
148 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
149 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
150 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
151 // The first element of the original dimension vector
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
152 // was not a singleton dimension.
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
153
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
154 new_dims.resize (2);
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 new_dims(1) = 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
157 }
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 else
15018
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents: 14846
diff changeset
160 new_dims.resize (k);
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
161 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
162
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
163 return new_dims;
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
15018
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents: 14846
diff changeset
166 // 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
167 // of the following holds, in this order:
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
168 //
15018
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents: 14846
diff changeset
169 // 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
170 // 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
171 // other sizes remain intact.
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
172 //
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
173 // 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
174 // 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
175
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
176 bool
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
177 dim_vector::concat (const dim_vector& dvb, int dim)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
178 {
18084
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents: 17769
diff changeset
179 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
180 int ndb = dvb.ndims ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
181 int new_nd = dim < ndb ? ndb : dim + 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
182 if (new_nd > orig_nd)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
183 resize (new_nd, 1);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
184 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
185 new_nd = orig_nd;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
186
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
187 make_unique ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
188
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
189 bool match = true;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
190
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
191 for (int i = 0; i < ndb; i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
192 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
193 if (i != dim && rep[i] != dvb(i))
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
194 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
195 match = false;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
196 break;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
197 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
198 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
199
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
200 for (int i = ndb; i < new_nd; i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
201 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
202 if (i != dim && rep[i] != 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
203 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
204 match = false;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
205 break;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
206 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
207 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
208
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
209 if (match)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
210 rep[dim] += (dim < ndb ? dvb(dim) : 1);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
211 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
212 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
213 // Dimensions don't match. The only allowed fix is
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
214 // to omit 0x0.
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
215 if (ndb == 2 && dvb(0) == 0 && dvb(1) == 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
216 match = true;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
217 else if (orig_nd == 2 && rep[0] == 0 && rep[1] == 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
218 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
219 *this = dvb;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
220 match = true;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
221 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
222 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
223
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
224 chop_trailing_singletons ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
225
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
226 return match;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
227 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
228
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
229 // 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
230 // two arrays A, B can be concatenated
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
231 // 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
232 // following holds, in this order:
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
233 //
15018
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents: 14846
diff changeset
234 // 1. cat (dim, A, B) works
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
235 //
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
236 // 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
237 // 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
238 // 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
239
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
240 bool
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
241 dim_vector::hvcat (const dim_vector& dvb, int dim)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
242 {
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
243 if (concat (dvb, dim))
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
244 return true;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
245 else if (length () == 2 && dvb.length () == 2)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
246 {
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
247 bool e2dv = rep[0] + rep[1] == 1;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
248 bool e2dvb = dvb(0) + dvb(1) == 1;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
249 if (e2dvb)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
250 {
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
251 if (e2dv)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
252 *this = dim_vector ();
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
253 return true;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
254 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
255 else if (e2dv)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
256 {
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
257 *this = dvb;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
258 return true;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
259 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
260 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
261
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
262 return false;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
263 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
264
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
265 dim_vector
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
266 dim_vector::redim (int n) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
267 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
268 int n_dims = length ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
269
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
270 if (n_dims == n)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
271 return *this;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
272 else if (n_dims < n)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
273 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
274 dim_vector retval = alloc (n);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
275
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
276 for (int i = 0; i < n_dims; i++)
14624
edf9ca8a92a8 when redimensioning, always pad dim_vector objects with 1 (bug #33216)
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
277 retval.rep[i] = rep[i];
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
278
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
279 for (int i = n_dims; i < n; i++)
14624
edf9ca8a92a8 when redimensioning, always pad dim_vector objects with 1 (bug #33216)
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
280 retval.rep[i] = 1;
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
281
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
282 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
283 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
284 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
285 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
286 if (n < 1) n = 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
287
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
288 dim_vector retval = alloc (n);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
289
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
290 retval.rep[1] = 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
291
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
292 for (int i = 0; i < n-1; i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
293 retval.rep[i] = rep[i];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
294
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
295 int k = rep[n-1];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
296 for (int i = n; i < n_dims; i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
297 k *= rep[i];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
298
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
299 retval.rep[n-1] = k;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
300
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
301 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
302 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
303 }