Mercurial > octave
diff libinterp/corefcn/svd.cc @ 29961:7d6709900da7
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc,
besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc,
colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc,
eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc,
fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc,
getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc,
hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc,
load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc,
mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc,
psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc,
schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc,
sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc,
tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc,
__delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc,
audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc,
ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc,
andpt-eval.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 14 Aug 2021 22:48:52 -0400 |
| parents | 32c3a5805893 |
| children | 428cccc75cc9 |
line wrap: on
line diff
--- a/libinterp/corefcn/svd.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/svd.cc Sat Aug 14 22:48:52 2021 -0400 @@ -42,34 +42,34 @@ static std::string Vsvd_driver = "gesvd"; template <typename T> -static typename octave::math::svd<T>::Type +static typename math::svd<T>::Type svd_type (int nargin, int nargout, const octave_value_list & args, const T & A) { if (nargout == 0 || nargout == 1) - return octave::math::svd<T>::Type::sigma_only; + return math::svd<T>::Type::sigma_only; else if (nargin == 1) - return octave::math::svd<T>::Type::std; + return math::svd<T>::Type::std; else if (! args(1).is_real_scalar ()) - return octave::math::svd<T>::Type::economy; + return math::svd<T>::Type::economy; else { if (A.rows () > A.columns ()) - return octave::math::svd<T>::Type::economy; + return math::svd<T>::Type::economy; else - return octave::math::svd<T>::Type::std; + return math::svd<T>::Type::std; } } template <typename T> -static typename octave::math::svd<T>::Driver +static typename math::svd<T>::Driver svd_driver (void) { if (Vsvd_driver == "gejsv") - return octave::math::svd<T>::Driver::GEJSV; + return math::svd<T>::Driver::GEJSV; else if (Vsvd_driver == "gesdd") - return octave::math::svd<T>::Driver::GESDD; + return math::svd<T>::Driver::GESDD; else - return octave::math::svd<T>::Driver::GESVD; // default + return math::svd<T>::Driver::GESVD; // default } DEFUN (svd, args, nargout, @@ -198,7 +198,7 @@ if (tmp.any_element_is_inf_or_nan ()) error ("svd: cannot take SVD of matrix containing Inf or NaN values"); - octave::math::svd<FloatMatrix> result + math::svd<FloatMatrix> result (tmp, svd_type<FloatMatrix> (nargin, nargout, args, tmp), svd_driver<FloatMatrix> ()); @@ -222,7 +222,7 @@ if (ctmp.any_element_is_inf_or_nan ()) error ("svd: cannot take SVD of matrix containing Inf or NaN values"); - octave::math::svd<FloatComplexMatrix> result + math::svd<FloatComplexMatrix> result (ctmp, svd_type<FloatComplexMatrix> (nargin, nargout, args, ctmp), svd_driver<FloatComplexMatrix> ()); @@ -249,7 +249,7 @@ if (tmp.any_element_is_inf_or_nan ()) error ("svd: cannot take SVD of matrix containing Inf or NaN values"); - octave::math::svd<Matrix> result + math::svd<Matrix> result (tmp, svd_type<Matrix> (nargin, nargout, args, tmp), svd_driver<Matrix> ()); @@ -273,7 +273,7 @@ if (ctmp.any_element_is_inf_or_nan ()) error ("svd: cannot take SVD of matrix containing Inf or NaN values"); - octave::math::svd<ComplexMatrix> result + math::svd<ComplexMatrix> result (ctmp, svd_type<ComplexMatrix> (nargin, nargout, args, ctmp), svd_driver<ComplexMatrix> ());