Mercurial > hg > octave-lyh
diff liboctave/lo-specfun.h @ 9732:b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Fri, 16 Oct 2009 13:12:31 +0200 |
parents | 11844593875a |
children | f80c566bc751 |
line wrap: on
line diff
--- a/liboctave/lo-specfun.h +++ b/liboctave/lo-specfun.h @@ -25,7 +25,7 @@ #define octave_liboctave_specfun_h 1 #include "oct-cmplx.h" -#include "ArrayN.h" +#include "Array.h" template <class T> class Array2; class Matrix; @@ -202,75 +202,75 @@ extern OCTAVE_API ComplexNDArray besselj (double alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray bessely (double alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besseli (double alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselk (double alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselh1 (double alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselh2 (double alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselj (const NDArray& alpha, const Complex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray bessely (const NDArray& alpha, const Complex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besseli (const NDArray& alpha, const Complex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselk (const NDArray& alpha, const Complex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselh1 (const NDArray& alpha, const Complex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselh2 (const NDArray& alpha, const Complex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselj (const NDArray& alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray bessely (const NDArray& alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besseli (const NDArray& alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselk (const NDArray& alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselh1 (const NDArray& alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray besselh2 (const NDArray& alpha, const ComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexMatrix besselj (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, @@ -388,75 +388,75 @@ extern OCTAVE_API FloatComplexNDArray besselj (float alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray bessely (float alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besseli (float alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselk (float alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselh1 (float alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselh2 (float alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselj (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray bessely (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besseli (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselk (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselh1 (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselh2 (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselj (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray bessely (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besseli (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselk (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselh1 (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray besselh2 (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, - ArrayN<octave_idx_type>& ierr); + Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexMatrix besselj (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, @@ -492,10 +492,10 @@ biry (const ComplexMatrix& z, bool deriv, bool scaled, Array2<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray -airy (const ComplexNDArray& z, bool deriv, bool scaled, ArrayN<octave_idx_type>& ierr); +airy (const ComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); extern OCTAVE_API ComplexNDArray -biry (const ComplexNDArray& z, bool deriv, bool scaled, ArrayN<octave_idx_type>& ierr); +biry (const ComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplex airy (const FloatComplex& z, bool deriv, bool scaled, octave_idx_type& ierr); extern OCTAVE_API FloatComplex biry (const FloatComplex& z, bool deriv, bool scaled, octave_idx_type& ierr); @@ -507,10 +507,10 @@ biry (const FloatComplexMatrix& z, bool deriv, bool scaled, Array2<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray -airy (const FloatComplexNDArray& z, bool deriv, bool scaled, ArrayN<octave_idx_type>& ierr); +airy (const FloatComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); extern OCTAVE_API FloatComplexNDArray -biry (const FloatComplexNDArray& z, bool deriv, bool scaled, ArrayN<octave_idx_type>& ierr); +biry (const FloatComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); extern OCTAVE_API double betainc (double x, double a, double b); extern OCTAVE_API Matrix betainc (double x, double a, const Matrix& b);