Mercurial > octave

annotate liboctave/array/dim-vector.cc @ 21573:f3f8e1d3e399 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid mulitple definitions of static function-scope vars (bug #47372) Some systems (Windows, others?) may generate multiple definitions of function-scope static variables if those functions appear in header files. This can cause trouble in various ways. Attempt to avoid the problem by moving functions that contain file-scope varaibles from header files to source files, or by using class-scope static variables instead. Also attempt to avoid similar problems caused by implicit instantiations of templates that have functions with static variables. * Cell.h, Cell.cc (Cell::resize_fill_value): Move definition from header to source file. * oct-map.h, oct-map.cc (octave_fields::nil_rep): Likewise. * ov-base-scalar.h, ov-base-scalar.cc (octave_base_scalar<ST>::dims): Likewise. * ov-fcn-handle.h, ov-fcn-handle.cc (octave_fcn_handle::dims): Likewise. * ov.h, ov.cc (octave_value::nil_rep): Likewise. * Array.h, Array.cc (Array<T>::nil_rep): Likewise. * DiagArray2.h, DiagArray2.cc (DiagArray2<T>::elem, DiagArray2<T>::checkelem): Likewise. * Sparse.h, Sparse.cc (Sparse<T>::nil_rep): Likewise. * dim-vector.h, dim-vector.cc (dim_vector::nil_rep): Likewise. * idx-vector.h, idx-vector.cc (idx_vector::nil_rep, idx_vector::err_rep): Likewise. * oct-inttypes.h, oct-inttypes.cc (octave_int_base<T>::convert_real): Likewise. * symtab.h, symtab.cc (octave_value symbol_table::dummy_octave_value, symbol_table::symbol_record symbol_table::dummy_symbol_record): New class-scope static variables. Use them to eliminate function-scope static variables. * ov-int8.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-uint8.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-scalar.cc, ov-flt-complex.cc, ov-complex.cc, ov-classdef.cc, ov-bool.cc, Array-jit.cc, Array-os.cc, Array-tc.cc, Array-C.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc, Array-i.cc, Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-voidp.cc: Prevent impliticit template instantiation. * Array-tc.cc: Also instantiate Array<cdef_object>.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Apr 2016 12:04:04 -0400
parents 4197fc428c7d
children ae4d7dfea337
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
19697
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 18084
diff changeset
3 Copyright (C) 2003-2015 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
21573
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
32 octave_idx_type *
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
33 dim_vector::nil_rep (void)
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
34 {
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
35 static dim_vector zv (0, 0);
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
36 return zv.rep;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
37 }
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 19697
diff changeset
38
17769
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents: 17744
diff changeset
39 // 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
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
b4ebfd675321 avoid static initialization disaster in dim_vector
Jaroslav Hajek <highegg@gmail.com>
parents: 10810
diff changeset
44 dim_vector::dim_max (void)
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
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
50 dim_vector::chop_all_singletons (void)
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 make_unique ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
53
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
54 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
55 int l = ndims ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
56
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
57 for (int i = 0; i < l; i++)
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 if (rep[i] != 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
60 rep[j++] = rep[i];
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
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
63 if (j == 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
64 rep[1] = 1;
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 ndims () = j > 2 ? j : 2;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
67 }
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 std::string
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
70 dim_vector::str (char sep) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
71 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
72 std::ostringstream buf;
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 for (int i = 0; i < length (); i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
75 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
76 buf << elem (i);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
77
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
78 if (i < length () - 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
79 buf << sep;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
80 }
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 std::string retval = buf.str ();
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 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
85 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
86
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
87 int
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
88 dim_vector::num_ones (void) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
89 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
90 int retval = 0;
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 for (int i = 0; i < length (); i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
93 if (elem (i) == 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
94 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 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
97 }
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 octave_idx_type
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
100 dim_vector::safe_numel (void) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
101 {
10830
b4ebfd675321 avoid static initialization disaster in dim_vector
Jaroslav Hajek <highegg@gmail.com>
parents: 10810
diff changeset
102 octave_idx_type idx_max = dim_max ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
103 octave_idx_type n = 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
104 int n_dims = length ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
105
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
106 for (int i = 0; i < n_dims; i++)
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 n *= rep[i];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
109 if (rep[i] != 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
110 idx_max /= rep[i];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
111 if (idx_max <= 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
112 throw std::bad_alloc ();
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
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
115 return n;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
116 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
117
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
118 dim_vector
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
119 dim_vector::squeeze (void) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
120 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
121 dim_vector new_dims = *this;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
122
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
123 bool dims_changed = 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
124
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
125 int k = 0;
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 for (int i = 0; i < length (); i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
128 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
129 if (elem (i) == 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
130 dims_changed = true;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
131 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
132 new_dims(k++) = elem (i);
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
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
135 if (dims_changed)
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 (k == 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
138 new_dims = dim_vector (1, 1);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
139 else if (k == 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
140 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
141 // There is one non-singleton dimension, so we need
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
142 // to decide the correct orientation.
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 if (elem (0) == 1)
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 // The original dimension vector had a leading
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
147 // singleton dimension.
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 octave_idx_type tmp = new_dims(0);
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 new_dims.resize (2);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
152
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
153 new_dims(0) = 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
154 new_dims(1) = tmp;
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 else
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 // The first element of the original dimension vector
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
159 // was not a singleton dimension.
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 new_dims.resize (2);
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 new_dims(1) = 1;
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 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
166 else
15018
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents: 14846
diff changeset
167 new_dims.resize (k);
10683
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 return new_dims;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
171 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
172
15018
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents: 14846
diff changeset
173 // 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
174 // of the following holds, in this order:
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
175 //
15018
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents: 14846
diff changeset
176 // 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
177 // 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
178 // other sizes remain intact.
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
179 //
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
180 // 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
181 // 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
182
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
183 bool
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
184 dim_vector::concat (const dim_vector& dvb, int dim)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
185 {
18084
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents: 17769
diff changeset
186 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
187 int ndb = dvb.ndims ();
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
188 int new_nd = dim < ndb ? ndb : dim + 1;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
189 if (new_nd > orig_nd)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
190 resize (new_nd, 1);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
191 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
192 new_nd = orig_nd;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
193
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
194 make_unique ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
195
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
196 bool match = true;
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 for (int i = 0; i < ndb; i++)
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 if (i != dim && rep[i] != dvb(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 match = false;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
203 break;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
204 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
205 }
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 for (int i = ndb; i < new_nd; i++)
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 (i != dim && rep[i] != 1)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
210 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
211 match = false;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
212 break;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
213 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
214 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
215
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
216 if (match)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
217 rep[dim] += (dim < ndb ? dvb(dim) : 1);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
218 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
219 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
220 // Dimensions don't match. The only allowed fix is
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
221 // to omit 0x0.
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
222 if (ndb == 2 && dvb(0) == 0 && dvb(1) == 0)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
223 match = true;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
224 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
225 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
226 *this = dvb;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
227 match = true;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
228 }
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
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
231 chop_trailing_singletons ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
232
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
233 return match;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
234 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
235
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
236 // 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
237 // two arrays A, B can be concatenated
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
238 // 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
239 // following holds, in this order:
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
240 //
15018
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents: 14846
diff changeset
241 // 1. cat (dim, A, B) works
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
242 //
10715
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
243 // 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
244 // 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
245 // 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
246
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
247 bool
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
248 dim_vector::hvcat (const dim_vector& dvb, int dim)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
249 {
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
250 if (concat (dvb, dim))
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
251 return true;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
252 else if (length () == 2 && dvb.length () == 2)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
253 {
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
254 bool e2dv = rep[0] + rep[1] == 1;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
255 bool e2dvb = dvb(0) + dvb(1) == 1;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
256 if (e2dvb)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
257 {
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
258 if (e2dv)
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
259 *this = dim_vector ();
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
260 return true;
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 else if (e2dv)
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 *this = dvb;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
265 return true;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
266 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
267 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
268
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
269 return false;
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
270 }
53253f796351 make [] (hopefully) more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents: 10686
diff changeset
271
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
272 dim_vector
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
273 dim_vector::redim (int n) const
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
274 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
275 int n_dims = length ();
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
276
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
277 if (n_dims == n)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
278 return *this;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
279 else if (n_dims < n)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
280 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
281 dim_vector retval = alloc (n);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
282
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
283 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
284 retval.rep[i] = rep[i];
10683
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 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
287 retval.rep[i] = 1;
10683
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
288
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
289 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
290 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
291 else
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
292 {
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
293 if (n < 1) n = 1;
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 dim_vector retval = alloc (n);
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
296
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
297 retval.rep[1] = 1;
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 for (int i = 0; i < n-1; i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
300 retval.rep[i] = rep[i];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
301
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
302 int k = rep[n-1];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
303 for (int i = n; i < n_dims; i++)
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
304 k *= rep[i];
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
305
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
306 retval.rep[n-1] = k;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
307
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
308 return retval;
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
309 }
4fdb36ffa066 omitted file from 10681:0ba9bd294421
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
310 }