Mercurial > hg > octave-lyh
view liboctave/dim-vector.h @ 14616:13cc11418393
improve handling of default resize fill value for arrays
* Array.cc (Array<T>::resize_fill_value): Return T, not const T&.
* Array.h (Array<T>::resize_fill_value): Now virtual member function
instead of static.
(Array<T>::resize1 (octave_idx_type)): New function.
(Array<T>::resize1 (octave_idx_type, const T&)):
Eliminate default value for second arg.
(Array<T>::resize (octave_idx_type, octave_idx_type)): New function.
(Array<T>::resize (octave_idx_type, octave_idx_type, const T&)):
Eliminate default value for third arg.
(Array<T>::resize (const dim_vector&)): New function.
(Array<T>::resize (const dim_vector&, const T&)): New function.
(Array<T>::resize2 (octave_idx_type, octave_idx_type)): New function.
(Array<T>::resize2 (octave_idx_type, octave_idx_type, const T&)):
Eliminate default value for third arg.
(Array<T>::index (const idx_vector&, bool) const): New function.
(Array<T>::index (const idx_vector&, bool, const T&) const):
Eliminate default value for third arg.
(Array<T>::index (const idx_vector&, const idx_vector&, bool) const):
New function.
(Array<T>::index (const idx_vector&, const idx_vector&, bool,
const T&) const): Eliminate default value for third arg.
(Array<T>::index (const Array<idx_vector>&, bool) const):
New function.
(Array<T>::index (const Array<idx_vector>&, const T&) const):
Eliminate default value for third arg.
(Array<T>::assign (const idx_vector&, const Array<T>&)):
New function.
(Array<T>::assign (const idx_vector&, const Array<T>&, const T&)):
Eliminate default value for third arg.
(Array<T>::assign (const idx_vector&, const idx_vector&,
const Array<T>&)): New function.
(Array<T>::assign (const idx_vector&, const idx_vector&,
const Array<T>&, const T&)): Eliminate default value for third arg.
(Array<T>::assign (const Array<idx_vector>&, const Array<T>&)):
New function.
(Array<T>::assign (const Array<idx_vector>&, const Array<T>&,
const T&)): Eliminate default value for third arg.
* DiagArray2.h (DiagArray2<T>::resize (octave_idx_type,
octave_idx_type)): New function.
(DiagArray2<T>::resize (octave_idx_type, octave_idx_type, const T&)):
Eliminate default value for third arg.
* CColVector.h (ComplexColumnVector::resize): Use Complex (0) as
default value instead of Array<Complex>::resize_fill_value ().
* CMatrix.h (ComplexMatrix::resize): Use Complex (0) as
default value instead of Array<Complex>::resize_fill_value ().
(ComplexMatrix::resize_fill_value): Delete.
* CNDArray.h (ComplexNDArray::resize_fill_value): Delete.
* CRowVector.h (ComplexRowVector::resize): Use Complex (0) as default
value instead of Array<Complex>::resize_fill_value ().
* boolMatrix.h (boolMatrix::resize): Use false as default value
instead of resize_fill_value ().
(boolMatrix::resize_fill_value): Delete.
* boolNDArray.h (boolNDArray::resize_fill_value): Delete.
* chMatrix.h (charMatrix::resize): Use 0 as default value instead of
resize_fill_value.
(charMatrix::resize_fill_value): Delete.
* chNDArray.h (charNDArray::resize_fill_value): Delete.
* dColVector.h (ColumnVector::resize): Use 0 as default value instead
of Array<double>::resize_fill_value ().
* dMatrix.h (Matrix::resize): Use 0 as default value instead of
resize_fill_value ().
(Matrix::resize_fill_value): Delete.
* dNDArray.h (NDArray::resize_fill_value): Delete.
* dRowVector.h (RowVector::resize): Use 0 as default value instead of
Array<double>::resize_fill_value ().
* fCColVector.h (FloatComplexColumnVector::resize): Use FloatComplex (0)
as default value instead of Array<FloatComplex>::resize_fill_value ().
* fCMatrix.h (FloatComplexMatrix::resize): Use FloatComplex (0) as
default value instead of resize_fill_value ()).
FloatCmplexMatrix::resize_fill_value): Delete.
* fCNDArray.h (FloatComplexNDArray::resize_fill_value): Delete.
* fCRowVector.h (FloatComplexRowVector::resize): Use FloatComplex (0)
as default value instead of Array<FloatComplex>::resize_fill_value ().
* fColVector.h (FloatColumnVector::resize): Use 0 as default value
instead of Array<float>::resize_fill_value ().
* fMatrix.h (FloatMatrix::resize): Use 0 as default value instead of
resize_fill_value ().
* fMatrix.h (FloatMatrix::resize_fill_value): Delete.
* fNDArray.h (FloatNDArray::resize_fill_value): Delete.
* fRowVector.h (FloatRowVector::resize): Use 0 as default value
instead of Array<float>::resize_fill_value ().
* intNDArray.h (intNDArray<T>::resize_fill_value): Delete.
* str-vec.h (string_vector::resize): Use std::string as default value
instead of resize_fill_value ().
* Cell.cc, Cell.h (Cell::Cell, Cell::assign, Cell::index):
Use Matrix () as default value instead of resize_fill_value ().
(Cell::resize_fill_value): No longer static.
* oct-map.cc (octave_map::resize, octave_map::assign,
Octave_map::resize, Octave_map::assign): Use Matrix () as default
value instead of Cell::resize_fill_value.
* oct-obj.h (octave_value_list::resize): Use octave_value () instead
of Array<octave_value>::resize_fill_value ().
* ov-complex.cc (octave_complex::resize): Use Complex (0) for fill
value instead of ComplexNDArray::resize_fill_value ().
* ov-float.cc (octave_float_scalar::resize): Use 0 for fill value
instead of NDArray::resize_fill_value ().
* ov-flt-complex.cc (octave_float_complex_scalar::resize): Use Complex
(0) for fill value instead of ComplexNDArray::resize_fill_value ().
* ov-range.cc (octave_range::resize): Use 0 for fill value instead of
NDArray::resize_fill_value ().
* ov-scalar.cc (octave_scalar::resize): Use 0 for fill value instead
of NDArray::resize_fill_value ().
* ov-str-mat.cc (octave_char_matrix_str::resize): Use 0 for fill value
instead of charNDArray::resize_fill_value ().
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 10 May 2012 16:31:02 -0400 |
parents | b50654a09ba7 |
children | bb5ecda3b975 |
line wrap: on
line source
/* Copyright (C) 2003-2012 John W. Eaton Copyirght (C) 2009, 2010 VZLU Prague This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_dim_vector_h) #define octave_dim_vector_h 1 #include <cassert> #include <limits> #include <sstream> #include <string> #include "lo-error.h" #include "lo-macros.h" #include "oct-refcount.h" // Rationale: This implementation is more tricky than Array, but the // big plus is that dim_vector requires only one allocation instead of // two. It is (slightly) patterned after GCC's basic_string // implementation. rep is a pointer to an array of memory, comprising // count, length, and the data: // // <count> // <ndims> // rep --> <dims[0]> // <dims[1]> // ... // // The inlines count(), ndims() recover this data from the rep. Note // that rep points to the beginning of dims to grant faster access // (reinterpret_cast is assumed to be an inexpensive operation). class OCTAVE_API dim_vector { private: octave_idx_type *rep; octave_idx_type& ndims (void) const { return rep[-1]; } octave_idx_type& count (void) const { return rep[-2]; } // Construct a new rep with count = 1 and ndims given. static octave_idx_type *newrep (int ndims) { octave_idx_type *r = new octave_idx_type[ndims + 2]; *r++ = 1; *r++ = ndims; return r; } // Clone this->rep. octave_idx_type *clonerep (void) { int l = ndims (); octave_idx_type *r = new octave_idx_type[l + 2]; *r++ = 1; *r++ = l; for (int i = 0; i < l; i++) r[i] = rep[i]; return r; } // Clone and resize this->rep to length n, filling by given value. octave_idx_type *resizerep (int n, octave_idx_type fill_value) { int l = ndims (); if (n < 2) n = 2; octave_idx_type *r = new octave_idx_type[n + 2]; *r++ = 1; *r++ = n; if (l > n) l = n; int j; for (j = 0; j < l; j++) r[j] = rep[j]; for (; j < n; j++) r[j] = fill_value; return r; } // Free the rep. void freerep (void) { assert (count () == 0); delete [] (rep - 2); } void make_unique (void) { if (count () > 1) { octave_idx_type *new_rep = clonerep (); if (OCTREFCOUNT_ATOMIC_DECREMENT(&(count())) == 0) freerep (); rep = new_rep; } } public: // The constructor // // dim_vector (n) // // creates an dimension vector with N rows and 1 column. It is // deprecated because of the potentiol for confusion that it causes. // Additional constructors of the form // // dim_vector (r, c) // dim_vector (r, c, p) // dim_vector (d1, d2, d3, d4, ...) // // are available for up to 7 dimensions. explicit dim_vector (octave_idx_type n) GCC_ATTR_DEPRECATED : rep (newrep (2)) { rep[0] = n; rep[1] = 1; } #define ASSIGN_REP(i) rep[i] = d ## i; #define DIM_VECTOR_CTOR(N) \ dim_vector (OCT_MAKE_DECL_LIST (octave_idx_type, d, N)) \ : rep (newrep (N)) \ { \ OCT_ITERATE_MACRO (ASSIGN_REP, N) \ } // Add more if needed. DIM_VECTOR_CTOR (2) DIM_VECTOR_CTOR (3) DIM_VECTOR_CTOR (4) DIM_VECTOR_CTOR (5) DIM_VECTOR_CTOR (6) DIM_VECTOR_CTOR (7) #undef ASSIGN_REP #undef DIM_VECTOR_CTOR octave_idx_type& elem (int i) { #ifdef BOUNDS_CHECKING assert (i >= 0 && i < ndims ()); #endif make_unique (); return rep[i]; } octave_idx_type elem (int i) const { #ifdef BOUNDS_CHECKING assert (i >= 0 && i < ndims ()); #endif return rep[i]; } void chop_trailing_singletons (void) { int l = ndims (); if (l > 2 && rep[l-1] == 1) { make_unique (); do l--; while (l > 2 && rep[l-1] == 1); ndims () = l; } } void chop_all_singletons (void); private: static octave_idx_type *nil_rep (void) { static dim_vector zv (0, 0); return zv.rep; } explicit dim_vector (octave_idx_type *r) : rep (r) { } public: static octave_idx_type dim_max (void); explicit dim_vector (void) : rep (nil_rep ()) { OCTREFCOUNT_ATOMIC_INCREMENT (&(count())); } dim_vector (const dim_vector& dv) : rep (dv.rep) { OCTREFCOUNT_ATOMIC_INCREMENT (&(count())); } static dim_vector alloc (int n) { return dim_vector (newrep (n < 2 ? 2 : n)); } dim_vector& operator = (const dim_vector& dv) { if (&dv != this) { if (OCTREFCOUNT_ATOMIC_DECREMENT (&(count())) == 0) freerep (); rep = dv.rep; OCTREFCOUNT_ATOMIC_INCREMENT (&(count())); } return *this; } ~dim_vector (void) { if (OCTREFCOUNT_ATOMIC_DECREMENT (&(count())) == 0) freerep (); } int length (void) const { return ndims (); } octave_idx_type& operator () (int i) { return elem (i); } octave_idx_type operator () (int i) const { return elem (i); } void resize (int n, int fill_value = 0) { int len = length (); if (n != len) { octave_idx_type *r = resizerep (n, fill_value); if (OCTREFCOUNT_ATOMIC_DECREMENT (&(count())) == 0) freerep (); rep = r; } } std::string str (char sep = 'x') const; bool all_zero (void) const { bool retval = true; for (int i = 0; i < length (); i++) { if (elem (i) != 0) { retval = false; break; } } return retval; } bool empty_2d (void) const { return length () == 2 && (elem (0) == 0 || elem (1) == 0); } bool zero_by_zero (void) const { return length () == 2 && elem (0) == 0 && elem (1) == 0; } bool any_zero (void) const { bool retval = false; for (int i = 0; i < length (); i++) { if (elem (i) == 0) { retval = true; break; } } return retval; } int num_ones (void) const; bool all_ones (void) const { return (num_ones () == length ()); } // Return the number of elements that a matrix with this dimension // vector would have, NOT the number of dimensions (elements in the // dimension vector). octave_idx_type numel (int n = 0) const { int n_dims = length (); octave_idx_type retval = 1; for (int i = n; i < n_dims; i++) retval *= elem (i); return retval; } // The following function will throw a std::bad_alloc () // exception if the requested size is larger than can be indexed by // octave_idx_type. This may be smaller than the actual amount of // memory that can be safely allocated on a system. However, if we // don't fail here, we can end up with a mysterious crash inside a // function that is iterating over an array using octave_idx_type // indices. octave_idx_type safe_numel (void) const; bool any_neg (void) const { int n_dims = length (); int i; for (i = 0; i < n_dims; i++) if (elem (i) < 0) break; return i < n_dims; } dim_vector squeeze (void) const; // This corresponds to cat(). bool concat (const dim_vector& dvb, int dim); // This corresponds to [,] (horzcat, dim = 0) and [;] (vertcat, dim = 1). // The rules are more relaxed here. bool hvcat (const dim_vector& dvb, int dim); // Force certain dimensionality, preserving numel (). Missing // dimensions are set to 1, redundant are folded into the trailing // one. If n = 1, the result is 2d and the second dim is 1 // (dim_vectors are always at least 2D). If the original dimensions // were all zero, the padding value is zero. dim_vector redim (int n) const; dim_vector as_column (void) const { if (length () == 2 && elem (1) == 1) return *this; else return dim_vector (numel (), 1); } dim_vector as_row (void) const { if (length () == 2 && elem (0) == 1) return *this; else return dim_vector (1, numel ()); } bool is_vector (void) const { return (length () == 2 && (elem (0) == 1 || elem (1) == 1)); } int first_non_singleton (int def = 0) const { for (int i = 0; i < length (); i++) { if (elem (i) != 1) return i; } return def; } // Compute a linear index from an index tuple. octave_idx_type compute_index (const octave_idx_type *idx) const { octave_idx_type k = 0; for (int i = length () - 1; i >= 0; i--) k = k * rep[i] + idx[i]; return k; } // Ditto, but the tuple may be incomplete (nidx < length ()). octave_idx_type compute_index (const octave_idx_type *idx, int nidx) const { octave_idx_type k = 0; for (int i = nidx - 1; i >= 0; i--) k = k * rep[i] + idx[i]; return k; } // Increment a multi-dimensional index tuple, optionally starting // from an offset position and return the index of the last index // position that was changed, or length () if just cycled over. int increment_index (octave_idx_type *idx, int start = 0) const { int i; for (i = start; i < length (); i++) { if (++(*idx) == rep[i]) *idx++ = 0; else break; } return i; } // Return cumulative dimensions. dim_vector cumulative (void) const { int nd = length (); dim_vector retval = alloc (nd); octave_idx_type k = 1; for (int i = 0; i < nd; i++) retval.rep[i] = k *= rep[i]; return retval; } // Compute a linear index from an index tuple. Dimensions are // required to be cumulative. octave_idx_type cum_compute_index (const octave_idx_type *idx) const { octave_idx_type k = idx[0]; for (int i = 1; i < length (); i++) k += rep[i-1] * idx[i]; return k; } friend bool operator == (const dim_vector& a, const dim_vector& b); }; inline bool operator == (const dim_vector& a, const dim_vector& b) { // Fast case. if (a.rep == b.rep) return true; bool retval = true; int a_len = a.length (); int b_len = b.length (); if (a_len != b_len) retval = false; else { for (int i = 0; i < a_len; i++) { if (a(i) != b(i)) { retval = false; break; } } } return retval; } inline bool operator != (const dim_vector& a, const dim_vector& b) { return ! operator == (a, b); } #endif