Mercurial > octave-nkf

comparison src/ov-base-scalar.h @ 10545:ffe28cdc6fe2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix reshape() and permute() for scalars
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 23 Apr 2010 11:42:58 +0200
parents 9961fc022d9d
children ec5fa46e0e45
comparison
equal deleted inserted replaced
10544:9961fc022d9d 10545:ffe28cdc6fe2
78 78
79 dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; } 79 dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; }
80 80
81 octave_idx_type nnz (void) const { return (scalar != ST ()) ? 1 : 0; } 81 octave_idx_type nnz (void) const { return (scalar != ST ()) ? 1 : 0; }
82 82
83 octave_value permute (const Array<int>&, bool = false) const 83 octave_value permute (const Array<int>&, bool = false) const;
84 { return scalar; }
85 84
86 octave_value reshape (const dim_vector& new_dims) const 85 octave_value reshape (const dim_vector& new_dims) const;
87 { return array_value ().reshape (new_dims); }
88 86
89 size_t byte_size (void) const { return sizeof (ST); } 87 size_t byte_size (void) const { return sizeof (ST); }
90 88
91 octave_value all (int = 0) const { return (scalar != ST ()); } 89 octave_value all (int = 0) const { return (scalar != ST ()); }
92 90