# HG changeset patch # User Jaroslav Hajek # Date 1255691551 -7200 # Node ID b4fdfee405b5cab18551b0fb6705bf7b300f1da5 # Parent 7b9cbaad68d64b9c7770adb3857f700480ba5806 remove ArrayN + fix nonhom. diag-scalar ops diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/Array-C.cc --- a/liboctave/Array-C.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/Array-C.cc Fri Oct 16 13:12:31 2009 +0200 @@ -96,12 +96,7 @@ template class OCTAVE_API Array2; -#include "ArrayN.h" -#include "ArrayN.cc" - -template class OCTAVE_API ArrayN; - -template OCTAVE_API std::ostream& operator << (std::ostream&, const ArrayN&); +template OCTAVE_API std::ostream& operator << (std::ostream&, const Array&); #include "DiagArray2.h" #include "DiagArray2.cc" diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/Array-b.cc --- a/liboctave/Array-b.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/Array-b.cc Fri Oct 16 13:12:31 2009 +0200 @@ -39,12 +39,7 @@ template class OCTAVE_API Array2; -#include "ArrayN.h" -#include "ArrayN.cc" - -template class OCTAVE_API ArrayN; - -template OCTAVE_API std::ostream& operator << (std::ostream&, const ArrayN&); +template OCTAVE_API std::ostream& operator << (std::ostream&, const Array&); #include "DiagArray2.h" #include "DiagArray2.cc" diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/Array-ch.cc --- a/liboctave/Array-ch.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/Array-ch.cc Fri Oct 16 13:12:31 2009 +0200 @@ -39,12 +39,7 @@ template class OCTAVE_API Array2; -#include "ArrayN.h" -#include "ArrayN.cc" - -template class OCTAVE_API ArrayN; - -template OCTAVE_API std::ostream& operator << (std::ostream&, const ArrayN&); +template OCTAVE_API std::ostream& operator << (std::ostream&, const Array&); #include "DiagArray2.h" #include "DiagArray2.cc" diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/Array-d.cc --- a/liboctave/Array-d.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/Array-d.cc Fri Oct 16 13:12:31 2009 +0200 @@ -92,12 +92,7 @@ template class OCTAVE_API Array2; -#include "ArrayN.h" -#include "ArrayN.cc" - -template class OCTAVE_API ArrayN; - -template OCTAVE_API std::ostream& operator << (std::ostream&, const ArrayN&); +template OCTAVE_API std::ostream& operator << (std::ostream&, const Array&); #include "DiagArray2.h" #include "DiagArray2.cc" diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/Array-f.cc --- a/liboctave/Array-f.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/Array-f.cc Fri Oct 16 13:12:31 2009 +0200 @@ -92,12 +92,7 @@ template class OCTAVE_API Array2; -#include "ArrayN.h" -#include "ArrayN.cc" - -template class OCTAVE_API ArrayN; - -template OCTAVE_API std::ostream& operator << (std::ostream&, const ArrayN&); +template OCTAVE_API std::ostream& operator << (std::ostream&, const Array&); #include "DiagArray2.h" #include "DiagArray2.cc" diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/Array-fC.cc --- a/liboctave/Array-fC.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/Array-fC.cc Fri Oct 16 13:12:31 2009 +0200 @@ -97,12 +97,7 @@ template class OCTAVE_API Array2; -#include "ArrayN.h" -#include "ArrayN.cc" - -template class OCTAVE_API ArrayN; - -template OCTAVE_API std::ostream& operator << (std::ostream&, const ArrayN&); +template OCTAVE_API std::ostream& operator << (std::ostream&, const Array&); #include "DiagArray2.h" #include "DiagArray2.cc" diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/Array.cc --- a/liboctave/Array.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/Array.cc Fri Oct 16 13:12:31 2009 +0200 @@ -2937,6 +2937,109 @@ template <> void Array::instantiation_guard () { } \ template class API Array +// FIXME: is this used? + +template +std::ostream& +operator << (std::ostream& os, const Array& a) +{ + dim_vector a_dims = a.dims (); + + int n_dims = a_dims.length (); + + os << n_dims << "-dimensional array"; + + if (n_dims) + os << " (" << a_dims.str () << ")"; + + os <<"\n\n"; + + if (n_dims) + { + os << "data:"; + + Array ra_idx (n_dims, 0); + + // Number of times the first 2d-array is to be displayed. + + octave_idx_type m = 1; + for (int i = 2; i < n_dims; i++) + m *= a_dims(i); + + if (m == 1) + { + octave_idx_type rows = 0; + octave_idx_type cols = 0; + + switch (n_dims) + { + case 2: + rows = a_dims(0); + cols = a_dims(1); + + for (octave_idx_type j = 0; j < rows; j++) + { + ra_idx(0) = j; + for (octave_idx_type k = 0; k < cols; k++) + { + ra_idx(1) = k; + os << " " << a.elem(ra_idx); + } + os << "\n"; + } + break; + + default: + rows = a_dims(0); + + for (octave_idx_type k = 0; k < rows; k++) + { + ra_idx(0) = k; + os << " " << a.elem(ra_idx); + } + break; + } + + os << "\n"; + } + else + { + octave_idx_type rows = a_dims(0); + octave_idx_type cols = a_dims(1); + + for (int i = 0; i < m; i++) + { + os << "\n(:,:,"; + + for (int j = 2; j < n_dims - 1; j++) + os << ra_idx(j) + 1 << ","; + + os << ra_idx(n_dims - 1) + 1 << ") = \n"; + + for (octave_idx_type j = 0; j < rows; j++) + { + ra_idx(0) = j; + + for (octave_idx_type k = 0; k < cols; k++) + { + ra_idx(1) = k; + os << " " << a.elem(ra_idx); + } + + os << "\n"; + } + + os << "\n"; + + if (i != m - 1) + increment_index (ra_idx, a_dims, 2); + } + } + } + + return os; +} + /* ;;; Local Variables: *** ;;; mode: C++ *** diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/Array.h --- a/liboctave/Array.h Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/Array.h Fri Oct 16 13:12:31 2009 +0200 @@ -735,6 +735,10 @@ #endif +template +std::ostream& +operator << (std::ostream& os, const Array& a); + /* ;;; Local Variables: *** ;;; mode: C++ *** diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/ArrayN.cc --- a/liboctave/ArrayN.cc Fri Oct 16 10:28:26 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,144 +0,0 @@ -// Template array classes -/* - -Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009 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 -. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include - -#include - -#include "Array-util.h" -#include "ArrayN.h" -#include "idx-vector.h" -#include "lo-error.h" - -// N-dimensional array class. - -template -std::ostream& -operator << (std::ostream& os, const ArrayN& a) -{ - dim_vector a_dims = a.dims (); - - int n_dims = a_dims.length (); - - os << n_dims << "-dimensional array"; - - if (n_dims) - os << " (" << a_dims.str () << ")"; - - os <<"\n\n"; - - if (n_dims) - { - os << "data:"; - - Array ra_idx (n_dims, 0); - - // Number of times the first 2d-array is to be displayed. - - octave_idx_type m = 1; - for (int i = 2; i < n_dims; i++) - m *= a_dims(i); - - if (m == 1) - { - octave_idx_type rows = 0; - octave_idx_type cols = 0; - - switch (n_dims) - { - case 2: - rows = a_dims(0); - cols = a_dims(1); - - for (octave_idx_type j = 0; j < rows; j++) - { - ra_idx(0) = j; - for (octave_idx_type k = 0; k < cols; k++) - { - ra_idx(1) = k; - os << " " << a.elem(ra_idx); - } - os << "\n"; - } - break; - - default: - rows = a_dims(0); - - for (octave_idx_type k = 0; k < rows; k++) - { - ra_idx(0) = k; - os << " " << a.elem(ra_idx); - } - break; - } - - os << "\n"; - } - else - { - octave_idx_type rows = a_dims(0); - octave_idx_type cols = a_dims(1); - - for (int i = 0; i < m; i++) - { - os << "\n(:,:,"; - - for (int j = 2; j < n_dims - 1; j++) - os << ra_idx(j) + 1 << ","; - - os << ra_idx(n_dims - 1) + 1 << ") = \n"; - - for (octave_idx_type j = 0; j < rows; j++) - { - ra_idx(0) = j; - - for (octave_idx_type k = 0; k < cols; k++) - { - ra_idx(1) = k; - os << " " << a.elem(ra_idx); - } - - os << "\n"; - } - - os << "\n"; - - if (i != m - 1) - increment_index (ra_idx, a_dims, 2); - } - } - } - - return os; -} - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/ArrayN.h --- a/liboctave/ArrayN.h Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/ArrayN.h Fri Oct 16 13:12:31 2009 +0200 @@ -25,153 +25,13 @@ #if !defined (octave_ArrayN_h) #define octave_ArrayN_h 1 -#include -#include -#include - -#include - #include "Array.h" -#include "Array2.h" -#include "lo-error.h" -#include "lo-math.h" - -class idx_vector; - -// N-dimensional array class. - -template -class -ArrayN : public Array -{ -protected: - - ArrayN (T *d, const dim_vector& dv) : Array (d, dv) { } - -public: - - // These really need to be protected (and they will be in the - // future, so don't depend on them being here!), but they can't be - // until template friends work correctly in g++. - - ArrayN (void) : Array () { } - - ArrayN (const dim_vector& dv) : Array (dv) { } - - ArrayN (const dim_vector& dv, const T& val) - : Array (dv) { Array::fill (val); } - - template - explicit ArrayN (const Array2& a) : Array (a, a.dims ()) { } - - template - ArrayN (const ArrayN& a) : Array (a, a.dims ()) { } - - template - ArrayN (const Array& a) : Array (a) { } - - template - ArrayN (const Array& a, const dim_vector& dv) - : Array (a, dv) { } - - ~ArrayN (void) { } - - ArrayN& operator = (const ArrayN& a) - { - if (this != &a) - Array::operator = (a); - - return *this; - } - - ArrayN column (octave_idx_type k) const - { return Array::column (k); } - ArrayN page (octave_idx_type k) const - { return Array::page (k); } - - ArrayN linearize (void) const - { return Array::linearize (); } - ArrayN linear_slice (octave_idx_type lo, octave_idx_type up) const - { return Array::linear_slice (lo, up); } - - ArrayN reshape (const dim_vector& new_dims) const - { return Array::reshape (new_dims); } +#define ArrayN Array - ArrayN permute (const Array& vec, bool inv = false) const - { return Array::permute (vec, inv); } - - ArrayN ipermute (const Array& vec) const - { return Array::ipermute (vec); } - - ArrayN squeeze (void) const { return Array::squeeze (); } - - ArrayN transpose (void) const { return Array::transpose (); } - ArrayN hermitian (T (*fcn) (const T&) = 0) const { return Array::hermitian (fcn); } - - ArrayN& insert (const ArrayN& a, const dim_vector& dv) - { - Array::insert (a, dv); - return *this; - } - - ArrayN& insert (const ArrayN& a, octave_idx_type r, octave_idx_type c) - { - Array::insert (a, r, c); - return *this; - } - - ArrayN index (const idx_vector& i, bool resize_ok = false, - const T& rfv = Array::resize_fill_value ()) const - { - Array tmp = Array::index (i, resize_ok, rfv); - return ArrayN (tmp, tmp.dims ()); - } - - ArrayN index (const idx_vector& i, const idx_vector& j, bool resize_ok = false, - const T& rfv = Array::resize_fill_value ()) const - { - Array tmp = Array::index (i, j, resize_ok, rfv); - return ArrayN (tmp, tmp.dims ()); - } - - ArrayN index (const Array& ra_idx, bool resize_ok = false, - const T& rfv = Array::resize_fill_value ()) const - { - Array tmp = Array::index (ra_idx, resize_ok, rfv); - return ArrayN (tmp, tmp.dims ()); - } - - ArrayN sort (int dim = 0, sortmode mode = ASCENDING) const - { - return Array::sort (dim, mode); - } - - ArrayN sort (Array &sidx, int dim = 0, - sortmode mode = ASCENDING) const - { - return Array::sort (sidx, dim, mode); - } - - ArrayN nth_element (const idx_vector& n, int dim = 0) const - { - return Array::nth_element (n, dim); - } - - ArrayN diag (octave_idx_type k) const - { - return Array::diag (k); - } - - template - ArrayN map (F fcn) const - { - return Array::template map (fcn); - } -}; - -template -std::ostream& -operator << (std::ostream&, const ArrayN&); +// If we're with GNU C++, issue a warning. +#ifdef __GNUC__ +#warning Using ArrayN is deprecated. Use Array directly. +#endif #endif diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/CNDArray.cc --- a/liboctave/CNDArray.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/CNDArray.cc Fri Oct 16 13:12:31 2009 +0200 @@ -714,7 +714,7 @@ } ComplexNDArray -ComplexNDArray::max (ArrayN& idx_arg, int dim) const +ComplexNDArray::max (Array& idx_arg, int dim) const { return do_mx_minmax_op (*this, idx_arg, dim, mx_inline_max); } @@ -726,7 +726,7 @@ } ComplexNDArray -ComplexNDArray::min (ArrayN& idx_arg, int dim) const +ComplexNDArray::min (Array& idx_arg, int dim) const { return do_mx_minmax_op (*this, idx_arg, dim, mx_inline_min); } @@ -738,7 +738,7 @@ } ComplexNDArray -ComplexNDArray::cummax (ArrayN& idx_arg, int dim) const +ComplexNDArray::cummax (Array& idx_arg, int dim) const { return do_mx_cumminmax_op (*this, idx_arg, dim, mx_inline_cummax); } @@ -750,7 +750,7 @@ } ComplexNDArray -ComplexNDArray::cummin (ArrayN& idx_arg, int dim) const +ComplexNDArray::cummin (Array& idx_arg, int dim) const { return do_mx_cumminmax_op (*this, idx_arg, dim, mx_inline_cummin); } @@ -765,19 +765,19 @@ boolNDArray ComplexNDArray::isnan (void) const { - return ArrayN (fastmap (xisnan)); + return Array (fastmap (xisnan)); } boolNDArray ComplexNDArray::isinf (void) const { - return ArrayN (fastmap (xisinf)); + return Array (fastmap (xisinf)); } boolNDArray ComplexNDArray::isfinite (void) const { - return ArrayN (fastmap (xfinite)); + return Array (fastmap (xfinite)); } ComplexNDArray diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/CNDArray.h --- a/liboctave/CNDArray.h Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/CNDArray.h Fri Oct 16 13:12:31 2009 +0200 @@ -52,7 +52,7 @@ ComplexNDArray (const MArrayN& a) : MArrayN (a) { } template - ComplexNDArray (const ArrayN& a) : MArrayN (a) { } + ComplexNDArray (const Array& a) : MArrayN (a) { } ComplexNDArray (const charNDArray&); @@ -87,14 +87,14 @@ ComplexNDArray concat (const NDArray& rb, const Array& ra_idx); ComplexNDArray max (int dim = 0) const; - ComplexNDArray max (ArrayN& index, int dim = 0) const; + ComplexNDArray max (Array& index, int dim = 0) const; ComplexNDArray min (int dim = 0) const; - ComplexNDArray min (ArrayN& index, int dim = 0) const; + ComplexNDArray min (Array& index, int dim = 0) const; ComplexNDArray cummax (int dim = 0) const; - ComplexNDArray cummax (ArrayN& index, int dim = 0) const; + ComplexNDArray cummax (Array& index, int dim = 0) const; ComplexNDArray cummin (int dim = 0) const; - ComplexNDArray cummin (ArrayN& index, int dim = 0) const; + ComplexNDArray cummin (Array& index, int dim = 0) const; ComplexNDArray diff (octave_idx_type order = 1, int dim = 0) const; diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/ChangeLog --- a/liboctave/ChangeLog Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/ChangeLog Fri Oct 16 13:12:31 2009 +0200 @@ -1,3 +1,39 @@ +2009-10-16 Jaroslav Hajek + + * ArrayN.h: Remove everything, just #define ArrayN Array. + Warn if under gcc. + * ArrayN.cc: Remove. + * Array.cc (operator >>): New operator. + * Array.h: Declare it. + + * Array-C.cc: Remove traces of ArrayN. + * Array-b.cc: Ditto. + * Array-ch.cc: Ditto. + * Array-d.cc: Ditto. + * Array-f.cc: Ditto. + * Array-fC.cc: Ditto. + * CNDArray.cc: Ditto. + * CNDArray.h: Ditto. + * MArrayN.h: Ditto. + * boolNDArray.cc: Ditto. + * boolNDArray.h: Ditto. + * chNDArray.h: Ditto. + * dNDArray.cc: Ditto. + * dNDArray.h: Ditto. + * fCNDArray.cc: Ditto. + * fCNDArray.h: Ditto. + * fNDArray.cc: Ditto. + * fNDArray.h: Ditto. + * intNDArray.cc: Ditto. + * intNDArray.h: Ditto. + * lo-specfun.cc: Ditto. + * lo-specfun.h: Ditto. + + * mx-op-defs.h (DMS_BIN_OP, SDM_BIN_OP): Rewrite. + (DMS_BIN_OPS, SDM_BIN_OPS): Define dm*s and dm/s rather than dm+s and + dm-s which are rather useless. + * mx-ops: Update. + 2009-10-16 Jaroslav Hajek * Array.cc (Array::column, Array::page, Array::linearize, diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/MArrayN.h --- a/liboctave/MArrayN.h Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/MArrayN.h Fri Oct 16 13:12:31 2009 +0200 @@ -25,7 +25,7 @@ #if !defined (octave_MArrayN_h) #define octave_MArrayN_h 1 -#include "ArrayN.h" +#include "Array.h" #include "MArray2.h" #include "dim-vector.h" @@ -39,34 +39,34 @@ template class -MArrayN : public ArrayN +MArrayN : public Array { protected: - MArrayN (T *d, const dim_vector& dv) : ArrayN (d, dv) { } + MArrayN (T *d, const dim_vector& dv) : Array (d, dv) { } public: - MArrayN (void) : ArrayN () {} + MArrayN (void) : Array () {} - MArrayN (const dim_vector& dv) : ArrayN (dv) { } + MArrayN (const dim_vector& dv) : Array (dv) { } - MArrayN (const dim_vector& dv, const T& val) : ArrayN (dv, val) { } + MArrayN (const dim_vector& dv, const T& val) : Array (dv, val) { } template - explicit MArrayN (const Array2& a) : ArrayN (a) { } + explicit MArrayN (const Array2& a) : Array (a) { } template - MArrayN (const ArrayN& a) : ArrayN (a) { } + MArrayN (const Array& a) : Array (a) { } template - MArrayN (const MArrayN& a) : ArrayN (a) { } + MArrayN (const MArrayN& a) : Array (a) { } ~MArrayN (void) { } MArrayN& operator = (const MArrayN& a) { - ArrayN::operator = (a); + Array::operator = (a); return *this; } @@ -88,26 +88,26 @@ } MArrayN reshape (const dim_vector& new_dims) const - { return ArrayN::reshape (new_dims); } + { return Array::reshape (new_dims); } MArrayN permute (const Array& vec, bool inv = false) const - { return ArrayN::permute (vec, inv); } + { return Array::permute (vec, inv); } MArrayN ipermute (const Array& vec) const - { return ArrayN::ipermute (vec); } + { return Array::ipermute (vec); } - MArrayN squeeze (void) const { return ArrayN::squeeze (); } + MArrayN squeeze (void) const { return Array::squeeze (); } MArrayN diag (octave_idx_type k) const { - return ArrayN::diag (k); + return Array::diag (k); } template MArrayN map (F fcn) const { - return ArrayN::template map (fcn); + return Array::template map (fcn); } void changesign (void); diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/boolNDArray.cc --- a/liboctave/boolNDArray.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/boolNDArray.cc Fri Oct 16 13:12:31 2009 +0200 @@ -150,7 +150,7 @@ boolNDArray boolNDArray::diag (octave_idx_type k) const { - return ArrayN::diag (k); + return Array::diag (k); } NDND_BOOL_OPS (boolNDArray, boolNDArray) diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/boolNDArray.h --- a/liboctave/boolNDArray.h Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/boolNDArray.h Fri Oct 16 13:12:31 2009 +0200 @@ -23,7 +23,7 @@ #if !defined (octave_boolNDArray_h) #define octave_boolNDArray_h 1 -#include "ArrayN.h" +#include "Array.h" #include "mx-defs.h" #include "mx-op-decl.h" @@ -32,28 +32,28 @@ class OCTAVE_API -boolNDArray : public ArrayN +boolNDArray : public Array { public: typedef boolMatrix matrix_type; - boolNDArray (void) : ArrayN () { } + boolNDArray (void) : Array () { } - boolNDArray (const dim_vector& dv) : ArrayN (dv) { } + boolNDArray (const dim_vector& dv) : Array (dv) { } boolNDArray (const dim_vector& dv, const bool& val) - : ArrayN (dv, val) { } + : Array (dv, val) { } - boolNDArray (const boolNDArray& a) : ArrayN (a) { } + boolNDArray (const boolNDArray& a) : Array (a) { } - boolNDArray (const boolMatrix& a) : ArrayN (a) { } + boolNDArray (const boolMatrix& a) : Array (a) { } - boolNDArray (const ArrayN& a) : ArrayN (a) { } + boolNDArray (const Array& a) : Array (a) { } boolNDArray& operator = (const boolNDArray& a) { - ArrayN::operator = (a); + Array::operator = (a); return *this; } @@ -80,7 +80,7 @@ boolMatrix matrix_value (void) const; - boolNDArray squeeze (void) const { return ArrayN::squeeze (); } + boolNDArray squeeze (void) const { return Array::squeeze (); } static void increment_index (Array& ra_idx, const dim_vector& dimensions, @@ -120,7 +120,7 @@ private: - boolNDArray (bool *d, dim_vector& dv) : ArrayN (d, dv) { } + boolNDArray (bool *d, dim_vector& dv) : Array (d, dv) { } }; NDND_BOOL_OP_DECLS (boolNDArray, boolNDArray, OCTAVE_API) diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/chNDArray.h --- a/liboctave/chNDArray.h Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/chNDArray.h Fri Oct 16 13:12:31 2009 +0200 @@ -55,7 +55,7 @@ charNDArray (const string_vector& s) : MArrayN (charMatrix (s)) { } - charNDArray (const ArrayN& a) : MArrayN (a) { } + charNDArray (const Array& a) : MArrayN (a) { } charNDArray& operator = (const charNDArray& a) { @@ -77,7 +77,7 @@ charMatrix matrix_value (void) const; - charNDArray squeeze (void) const { return ArrayN::squeeze (); } + charNDArray squeeze (void) const { return Array::squeeze (); } static void increment_index (Array& ra_idx, const dim_vector& dimensions, diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/dNDArray.cc --- a/liboctave/dNDArray.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/dNDArray.cc Fri Oct 16 13:12:31 2009 +0200 @@ -744,7 +744,7 @@ } NDArray -NDArray::max (ArrayN& idx_arg, int dim) const +NDArray::max (Array& idx_arg, int dim) const { return do_mx_minmax_op (*this, idx_arg, dim, mx_inline_max); } @@ -756,7 +756,7 @@ } NDArray -NDArray::min (ArrayN& idx_arg, int dim) const +NDArray::min (Array& idx_arg, int dim) const { return do_mx_minmax_op (*this, idx_arg, dim, mx_inline_min); } @@ -768,7 +768,7 @@ } NDArray -NDArray::cummax (ArrayN& idx_arg, int dim) const +NDArray::cummax (Array& idx_arg, int dim) const { return do_mx_cumminmax_op (*this, idx_arg, dim, mx_inline_cummax); } @@ -780,7 +780,7 @@ } NDArray -NDArray::cummin (ArrayN& idx_arg, int dim) const +NDArray::cummin (Array& idx_arg, int dim) const { return do_mx_cumminmax_op (*this, idx_arg, dim, mx_inline_cummin); } @@ -882,19 +882,19 @@ boolNDArray NDArray::isnan (void) const { - return ArrayN (fastmap (xisnan)); + return Array (fastmap (xisnan)); } boolNDArray NDArray::isinf (void) const { - return ArrayN (fastmap (xisinf)); + return Array (fastmap (xisinf)); } boolNDArray NDArray::isfinite (void) const { - return ArrayN (fastmap (xfinite)); + return Array (fastmap (xfinite)); } Matrix diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/dNDArray.h --- a/liboctave/dNDArray.h Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/dNDArray.h Fri Oct 16 13:12:31 2009 +0200 @@ -57,7 +57,7 @@ NDArray (const MArrayN& a) : MArrayN (a) { } template - NDArray (const ArrayN& a) : MArrayN (a) { } + NDArray (const Array& a) : MArrayN (a) { } template explicit NDArray (const intNDArray& a) : MArrayN (a) { } @@ -99,14 +99,14 @@ charNDArray concat (const charNDArray& rb, const Array& ra_idx); NDArray max (int dim = 0) const; - NDArray max (ArrayN& index, int dim = 0) const; + NDArray max (Array& index, int dim = 0) const; NDArray min (int dim = 0) const; - NDArray min (ArrayN& index, int dim = 0) const; + NDArray min (Array& index, int dim = 0) const; NDArray cummax (int dim = 0) const; - NDArray cummax (ArrayN& index, int dim = 0) const; + NDArray cummax (Array& index, int dim = 0) const; NDArray cummin (int dim = 0) const; - NDArray cummin (ArrayN& index, int dim = 0) const; + NDArray cummin (Array& index, int dim = 0) const; NDArray diff (octave_idx_type order = 1, int dim = 0) const; diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/fCNDArray.cc --- a/liboctave/fCNDArray.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/fCNDArray.cc Fri Oct 16 13:12:31 2009 +0200 @@ -709,7 +709,7 @@ } FloatComplexNDArray -FloatComplexNDArray::max (ArrayN& idx_arg, int dim) const +FloatComplexNDArray::max (Array& idx_arg, int dim) const { return do_mx_minmax_op (*this, idx_arg, dim, mx_inline_max); } @@ -721,7 +721,7 @@ } FloatComplexNDArray -FloatComplexNDArray::min (ArrayN& idx_arg, int dim) const +FloatComplexNDArray::min (Array& idx_arg, int dim) const { return do_mx_minmax_op (*this, idx_arg, dim, mx_inline_min); } @@ -733,7 +733,7 @@ } FloatComplexNDArray -FloatComplexNDArray::cummax (ArrayN& idx_arg, int dim) const +FloatComplexNDArray::cummax (Array& idx_arg, int dim) const { return do_mx_cumminmax_op (*this, idx_arg, dim, mx_inline_cummax); } @@ -745,7 +745,7 @@ } FloatComplexNDArray -FloatComplexNDArray::cummin (ArrayN& idx_arg, int dim) const +FloatComplexNDArray::cummin (Array& idx_arg, int dim) const { return do_mx_cumminmax_op (*this, idx_arg, dim, mx_inline_cummin); } @@ -760,19 +760,19 @@ boolNDArray FloatComplexNDArray::isnan (void) const { - return ArrayN (fastmap (xisnan)); + return Array (fastmap (xisnan)); } boolNDArray FloatComplexNDArray::isinf (void) const { - return ArrayN (fastmap (xisinf)); + return Array (fastmap (xisinf)); } boolNDArray FloatComplexNDArray::isfinite (void) const { - return ArrayN (fastmap (xfinite)); + return Array (fastmap (xfinite)); } FloatComplexNDArray diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/fCNDArray.h --- a/liboctave/fCNDArray.h Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/fCNDArray.h Fri Oct 16 13:12:31 2009 +0200 @@ -52,7 +52,7 @@ FloatComplexNDArray (const MArrayN& a) : MArrayN (a) { } template - FloatComplexNDArray (const ArrayN& a) : MArrayN (a) { } + FloatComplexNDArray (const Array& a) : MArrayN (a) { } FloatComplexNDArray (const charNDArray&); @@ -87,14 +87,14 @@ FloatComplexNDArray concat (const FloatNDArray& rb, const Array& ra_idx); FloatComplexNDArray max (int dim = 0) const; - FloatComplexNDArray max (ArrayN& index, int dim = 0) const; + FloatComplexNDArray max (Array& index, int dim = 0) const; FloatComplexNDArray min (int dim = 0) const; - FloatComplexNDArray min (ArrayN& index, int dim = 0) const; + FloatComplexNDArray min (Array& index, int dim = 0) const; FloatComplexNDArray cummax (int dim = 0) const; - FloatComplexNDArray cummax (ArrayN& index, int dim = 0) const; + FloatComplexNDArray cummax (Array& index, int dim = 0) const; FloatComplexNDArray cummin (int dim = 0) const; - FloatComplexNDArray cummin (ArrayN& index, int dim = 0) const; + FloatComplexNDArray cummin (Array& index, int dim = 0) const; FloatComplexNDArray diff (octave_idx_type order = 1, int dim = 0) const; diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/fNDArray.cc --- a/liboctave/fNDArray.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/fNDArray.cc Fri Oct 16 13:12:31 2009 +0200 @@ -702,7 +702,7 @@ } FloatNDArray -FloatNDArray::max (ArrayN& idx_arg, int dim) const +FloatNDArray::max (Array& idx_arg, int dim) const { return do_mx_minmax_op (*this, idx_arg, dim, mx_inline_max); } @@ -714,7 +714,7 @@ } FloatNDArray -FloatNDArray::min (ArrayN& idx_arg, int dim) const +FloatNDArray::min (Array& idx_arg, int dim) const { return do_mx_minmax_op (*this, idx_arg, dim, mx_inline_min); } @@ -726,7 +726,7 @@ } FloatNDArray -FloatNDArray::cummax (ArrayN& idx_arg, int dim) const +FloatNDArray::cummax (Array& idx_arg, int dim) const { return do_mx_cumminmax_op (*this, idx_arg, dim, mx_inline_cummax); } @@ -738,7 +738,7 @@ } FloatNDArray -FloatNDArray::cummin (ArrayN& idx_arg, int dim) const +FloatNDArray::cummin (Array& idx_arg, int dim) const { return do_mx_cumminmax_op (*this, idx_arg, dim, mx_inline_cummin); } @@ -840,19 +840,19 @@ boolNDArray FloatNDArray::isnan (void) const { - return ArrayN (fastmap (xisnan)); + return Array (fastmap (xisnan)); } boolNDArray FloatNDArray::isinf (void) const { - return ArrayN (fastmap (xisinf)); + return Array (fastmap (xisinf)); } boolNDArray FloatNDArray::isfinite (void) const { - return ArrayN (fastmap (xfinite)); + return Array (fastmap (xfinite)); } FloatMatrix diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/fNDArray.h --- a/liboctave/fNDArray.h Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/fNDArray.h Fri Oct 16 13:12:31 2009 +0200 @@ -54,7 +54,7 @@ FloatNDArray (const MArrayN& a) : MArrayN (a) { } template - FloatNDArray (const ArrayN& a) : MArrayN (a) { } + FloatNDArray (const Array& a) : MArrayN (a) { } template explicit FloatNDArray (const intNDArray& a) : MArrayN (a) { } @@ -96,14 +96,14 @@ charNDArray concat (const charNDArray& rb, const Array& ra_idx); FloatNDArray max (int dim = 0) const; - FloatNDArray max (ArrayN& index, int dim = 0) const; + FloatNDArray max (Array& index, int dim = 0) const; FloatNDArray min (int dim = 0) const; - FloatNDArray min (ArrayN& index, int dim = 0) const; + FloatNDArray min (Array& index, int dim = 0) const; FloatNDArray cummax (int dim = 0) const; - FloatNDArray cummax (ArrayN& index, int dim = 0) const; + FloatNDArray cummax (Array& index, int dim = 0) const; FloatNDArray cummin (int dim = 0) const; - FloatNDArray cummin (ArrayN& index, int dim = 0) const; + FloatNDArray cummin (Array& index, int dim = 0) const; FloatNDArray diff (octave_idx_type order = 1, int dim = 0) const; diff -r 7b9cbaad68d6 -r b4fdfee405b5 liboctave/intNDArray.cc --- a/liboctave/intNDArray.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/liboctave/intNDArray.cc Fri Oct 16 13:12:31 2009 +0200 @@ -231,7 +231,7 @@ template intNDArray -intNDArray::max (ArrayN& idx_arg, int dim) const +intNDArray::max (Array& idx_arg, int dim) const { return do_mx_minmax_op > (*this, idx_arg, dim, mx_inline_max); } @@ -245,7 +245,7 @@ template intNDArray -intNDArray::min (ArrayN& idx_arg, int dim) const +intNDArray::min (Array& idx_arg, int dim) const { return do_mx_minmax_op > (*this, idx_arg, dim, mx_inline_min); } @@ -259,7 +259,7 @@ template intNDArray -intNDArray::cummax (ArrayN