Mercurial > octave-nkf
view liboctave/dNDArray.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 | e8e86ae3abbc |
children | 4c9fd3e31436 |
line wrap: on
line source
/* Copyright (C) 1996-2012 John W. Eaton 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_NDArray_h) #define octave_NDArray_h 1 #include "MArray.h" #include "dMatrix.h" #include "intNDArray.h" #include "mx-defs.h" #include "mx-op-decl.h" #include "bsxfun-decl.h" class OCTAVE_API NDArray : public MArray<double> { public: typedef Matrix matrix_type; NDArray (void) : MArray<double> () { } NDArray (const dim_vector& dv) : MArray<double> (dv) { } NDArray (const dim_vector& dv, double val) : MArray<double> (dv, val) { } NDArray (const NDArray& a) : MArray<double> (a) { } NDArray (const Matrix& a) : MArray<double> (a) { } NDArray (const Array<octave_idx_type>& a, bool zero_based = false, bool negative_to_nan = false); template <class U> NDArray (const MArray<U>& a) : MArray<double> (a) { } template <class U> NDArray (const Array<U>& a) : MArray<double> (a) { } template <class U> explicit NDArray (const intNDArray<U>& a) : MArray<double> (a) { } NDArray (const charNDArray&); NDArray& operator = (const NDArray& a) { MArray<double>::operator = (a); return *this; } // unary operations boolNDArray operator ! (void) const; bool any_element_is_negative (bool = false) const; bool any_element_is_positive (bool = false) const; bool any_element_is_nan (void) const; bool any_element_is_inf_or_nan (void) const; bool any_element_not_one_or_zero (void) const; bool all_elements_are_zero (void) const; bool all_elements_are_int_or_inf_or_nan (void) const; bool all_integers (double& max_val, double& min_val) const; bool all_integers (void) const; bool too_large_for_float (void) const; // FIXME -- this is not quite the right thing. boolNDArray all (int dim = -1) const; boolNDArray any (int dim = -1) const; NDArray cumprod (int dim = -1) const; NDArray cumsum (int dim = -1) const; NDArray prod (int dim = -1) const; NDArray sum (int dim = -1) const; NDArray xsum (int dim = -1) const; NDArray sumsq (int dim = -1) const; NDArray concat (const NDArray& rb, const Array<octave_idx_type>& ra_idx); ComplexNDArray concat (const ComplexNDArray& rb, const Array<octave_idx_type>& ra_idx); charNDArray concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx); NDArray max (int dim = -1) const; NDArray max (Array<octave_idx_type>& index, int dim = -1) const; NDArray min (int dim = -1) const; NDArray min (Array<octave_idx_type>& index, int dim = -1) const; NDArray cummax (int dim = -1) const; NDArray cummax (Array<octave_idx_type>& index, int dim = -1) const; NDArray cummin (int dim = -1) const; NDArray cummin (Array<octave_idx_type>& index, int dim = -1) const; NDArray diff (octave_idx_type order = 1, int dim = -1) const; NDArray& insert (const NDArray& a, octave_idx_type r, octave_idx_type c); NDArray& insert (const NDArray& a, const Array<octave_idx_type>& ra_idx); NDArray abs (void) const; boolNDArray isnan (void) const; boolNDArray isinf (void) const; boolNDArray isfinite (void) const; ComplexNDArray fourier (int dim = 1) const; ComplexNDArray ifourier (int dim = 1) const; ComplexNDArray fourier2d (void) const; ComplexNDArray ifourier2d (void) const; ComplexNDArray fourierNd (void) const; ComplexNDArray ifourierNd (void) const; friend OCTAVE_API NDArray real (const ComplexNDArray& a); friend OCTAVE_API NDArray imag (const ComplexNDArray& a); friend class ComplexNDArray; Matrix matrix_value (void) const; NDArray squeeze (void) const { return MArray<double>::squeeze (); } static void increment_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions, int start_dimension = 0); static octave_idx_type compute_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions); // i/o friend OCTAVE_API std::ostream& operator << (std::ostream& os, const NDArray& a); friend OCTAVE_API std::istream& operator >> (std::istream& is, NDArray& a); NDArray diag (octave_idx_type k = 0) const; NDArray diag (octave_idx_type m, octave_idx_type n) const; NDArray& changesign (void) { MArray<double>::changesign (); return *this; } }; // Publish externally used friend functions. extern OCTAVE_API NDArray real (const ComplexNDArray& a); extern OCTAVE_API NDArray imag (const ComplexNDArray& a); MINMAX_DECLS (NDArray, double, OCTAVE_API) NDS_CMP_OP_DECLS (NDArray, double, OCTAVE_API) NDS_BOOL_OP_DECLS (NDArray, double, OCTAVE_API) SND_CMP_OP_DECLS (double, NDArray, OCTAVE_API) SND_BOOL_OP_DECLS (double, NDArray, OCTAVE_API) NDND_CMP_OP_DECLS (NDArray, NDArray, OCTAVE_API) NDND_BOOL_OP_DECLS (NDArray, NDArray, OCTAVE_API) MARRAY_FORWARD_DEFS (MArray, NDArray, double) BSXFUN_STDOP_DECLS (NDArray, OCTAVE_API) BSXFUN_STDREL_DECLS (NDArray, OCTAVE_API) BSXFUN_OP_DECL (pow, NDArray, OCTAVE_API) BSXFUN_OP2_DECL (pow, ComplexNDArray, ComplexNDArray, NDArray, OCTAVE_API) BSXFUN_OP2_DECL (pow, ComplexNDArray, NDArray, ComplexNDArray, OCTAVE_API) #endif