Mercurial > octave

comparison liboctave/array/fNDArray.cc @ 29931:7faff48840eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
prefer data over fortran_vec for read-only access to data See also the discussion here: https://octave.discourse.group/t/rename-uses-of-fortran-vec-to-data-for-clarity/1439 * Array.h (const T * Array<T>::fortran_vec (void) const): Deprecate. Change all uses to call data instead.
author John W. Eaton <jwe@octave.org>
date Fri, 30 Jul 2021 11:46:05 -0400
parents 7854d5752dd2
children da7210e30f3e
comparison
equal deleted inserted replaced
29930:aa98b5fdfbbb 29931:7faff48840eb
71 octave_idx_type howmany = numel () / dv(dim); 71 octave_idx_type howmany = numel () / dv(dim);
72 howmany = (stride == 1 ? howmany : (howmany > stride ? stride : howmany)); 72 howmany = (stride == 1 ? howmany : (howmany > stride ? stride : howmany));
73 octave_idx_type nloop = (stride == 1 ? 1 : numel () / dv(dim) / stride); 73 octave_idx_type nloop = (stride == 1 ? 1 : numel () / dv(dim) / stride);
74 octave_idx_type dist = (stride == 1 ? n : 1); 74 octave_idx_type dist = (stride == 1 ? n : 1);
75 75
76 const float *in (fortran_vec ()); 76 const float *in (data ());
77 FloatComplexNDArray retval (dv); 77 FloatComplexNDArray retval (dv);
78 FloatComplex *out (retval.fortran_vec ()); 78 FloatComplex *out (retval.fortran_vec ());
79 79
80 // Need to be careful here about the distance between fft's 80 // Need to be careful here about the distance between fft's
81 for (octave_idx_type k = 0; k < nloop; k++) 81 for (octave_idx_type k = 0; k < nloop; k++)
121 dim_vector dv = dims (); 121 dim_vector dv = dims ();
122 if (dv.ndims () < 2) 122 if (dv.ndims () < 2)
123 return FloatComplexNDArray (); 123 return FloatComplexNDArray ();
124 124
125 dim_vector dv2 (dv(0), dv(1)); 125 dim_vector dv2 (dv(0), dv(1));
126 const float *in = fortran_vec (); 126 const float *in = data ();
127 FloatComplexNDArray retval (dv); 127 FloatComplexNDArray retval (dv);
128 FloatComplex *out = retval.fortran_vec (); 128 FloatComplex *out = retval.fortran_vec ();
129 octave_idx_type howmany = numel () / dv(0) / dv(1); 129 octave_idx_type howmany = numel () / dv(0) / dv(1);
130 octave_idx_type dist = dv(0) * dv(1); 130 octave_idx_type dist = dv(0) * dv(1);
131 131
158 FloatNDArray::fourierNd (void) const 158 FloatNDArray::fourierNd (void) const
159 { 159 {
160 dim_vector dv = dims (); 160 dim_vector dv = dims ();
161 int rank = dv.ndims (); 161 int rank = dv.ndims ();
162 162
163 const float *in (fortran_vec ()); 163 const float *in (data ());
164 FloatComplexNDArray retval (dv); 164 FloatComplexNDArray retval (dv);
165 FloatComplex *out (retval.fortran_vec ()); 165 FloatComplex *out (retval.fortran_vec ());
166 166
167 octave::fftw::fftNd (in, out, rank, dv); 167 octave::fftw::fftNd (in, out, rank, dv);
168 168