Mercurial > octave

comparison libinterp/corefcn/psi.cc @ 22197:e43d83253e28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refill multi-line macro definitions Use the Emacs C++ mode style for line continuation markers in multi-line macro definitions. * make_int.cc, __dsearchn__.cc, __magick_read__.cc, besselj.cc, bitfcns.cc, bsxfun.cc, cellfun.cc, data.cc, defun-dld.h, defun-int.h, defun.h, det.cc, error.h, find.cc, gcd.cc, graphics.cc, interpreter.h, jit-ir.h, jit-typeinfo.h, lookup.cc, ls-mat5.cc, max.cc, mexproto.h, mxarray.in.h, oct-stream.cc, ordschur.cc, pr-output.cc, profiler.h, psi.cc, regexp.cc, sparse-xdiv.cc, sparse-xpow.cc, tril.cc, txt-eng.h, utils.cc, variables.cc, variables.h, xdiv.cc, xpow.cc, __glpk__.cc, ov-base.cc, ov-base.h, ov-cell.cc, ov-ch-mat.cc, ov-classdef.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-int-traits.h, ov-lazy-idx.h, ov-perm.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-type-conv.h, ov.cc, ov.h, op-class.cc, op-int-conv.cc, op-int.h, op-str-str.cc, ops.h, lex.ll, Array.cc, CMatrix.cc, CSparse.cc, MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse.h, Sparse.cc, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc, idx-vector.cc, f77-fcn.h, quit.h, bsxfun-decl.h, bsxfun-defs.cc, lo-specfun.cc, oct-convn.cc, oct-convn.h, oct-norm.cc, oct-norm.h, oct-rand.cc, Sparse-op-decls.h, Sparse-op-defs.h, mx-inlines.cc, mx-op-decl.h, mx-op-defs.h, mach-info.cc, oct-group.cc, oct-passwd.cc, oct-syscalls.cc, oct-time.cc, data-conv.cc, kpse.cc, lo-ieee.h, lo-macros.h, oct-cmplx.h, oct-glob.cc, oct-inttypes.cc, oct-inttypes.h, oct-locbuf.h, oct-sparse.h, url-transfer.cc, oct-conf-post.in.h, shared-fcns.h: Refill macro definitions.
author John W. Eaton <jwe@octave.org>
date Mon, 01 Aug 2016 12:40:18 -0400
parents 112b20240c87
children bac0d6f07a3e
comparison
equal deleted inserted replaced
22196:dd992fd74fce 22197:e43d83253e28
79 79
80 octave_value retval; 80 octave_value retval;
81 81
82 if (k == 0) 82 if (k == 0)
83 { 83 {
84 #define FLOAT_BRANCH(T, A, M, E) \ 84 #define FLOAT_BRANCH(T, A, M, E) \
85 if (oct_z.is_ ## T ##_type ()) \ 85 if (oct_z.is_ ## T ##_type ()) \
86 { \ 86 { \
87 const A ## NDArray z = oct_z.M ## array_value (); \ 87 const A ## NDArray z = oct_z.M ## array_value (); \
88 A ## NDArray psi_z (z.dims ()); \ 88 A ## NDArray psi_z (z.dims ()); \
89 \ 89 \
90 const E* zv = z.data (); \ 90 const E* zv = z.data (); \
91 E* psi_zv = psi_z.fortran_vec (); \ 91 E* psi_zv = psi_z.fortran_vec (); \
92 const octave_idx_type n = z.numel (); \ 92 const octave_idx_type n = z.numel (); \
93 for (octave_idx_type i = 0; i < n; i++) \ 93 for (octave_idx_type i = 0; i < n; i++) \
94 *psi_zv++ = octave::math::psi (*zv++); \ 94 *psi_zv++ = octave::math::psi (*zv++); \
95 \ 95 \
96 retval = psi_z; \ 96 retval = psi_z; \
97 } 97 }
98 98
99 if (oct_z.is_complex_type ()) 99 if (oct_z.is_complex_type ())
100 { 100 {
101 FLOAT_BRANCH(double, Complex, complex_, Complex) 101 FLOAT_BRANCH(double, Complex, complex_, Complex)
116 else 116 else
117 { 117 {
118 if (! oct_z.is_real_type ()) 118 if (! oct_z.is_real_type ())
119 error ("psi: Z must be real value for polygamma (K > 0)"); 119 error ("psi: Z must be real value for polygamma (K > 0)");
120 120
121 #define FLOAT_BRANCH(T, A, M, E) \ 121 #define FLOAT_BRANCH(T, A, M, E) \
122 if (oct_z.is_ ## T ##_type ()) \ 122 if (oct_z.is_ ## T ##_type ()) \
123 { \ 123 { \
124 const A ## NDArray z = oct_z.M ## array_value (); \ 124 const A ## NDArray z = oct_z.M ## array_value (); \
125 A ## NDArray psi_z (z.dims ()); \ 125 A ## NDArray psi_z (z.dims ()); \
126 \ 126 \
127 const E* zv = z.data (); \ 127 const E* zv = z.data (); \
128 E* psi_zv = psi_z.fortran_vec (); \ 128 E* psi_zv = psi_z.fortran_vec (); \
129 const octave_idx_type n = z.numel (); \ 129 const octave_idx_type n = z.numel (); \
130 for (octave_idx_type i = 0; i < n; i++) \ 130 for (octave_idx_type i = 0; i < n; i++) \
131 { \ 131 { \
132 if (*zv < 0) \ 132 if (*zv < 0) \
133 error ("psi: Z must be non-negative for polygamma (K > 0)"); \ 133 error ("psi: Z must be non-negative for polygamma (K > 0)"); \
134 \ 134 \
135 *psi_zv++ = octave::math::psi (k, *zv++); \ 135 *psi_zv++ = octave::math::psi (k, *zv++); \
136 } \ 136 } \
137 retval = psi_z; \ 137 retval = psi_z; \
138 } 138 }
139 139
140 FLOAT_BRANCH(double, , , double) 140 FLOAT_BRANCH(double, , , double)
141 else FLOAT_BRANCH(single, Float, float_, float) 141 else FLOAT_BRANCH(single, Float, float_, float)
142 else 142 else