Mercurial > octave

comparison libinterp/octave-value/ov-complex.cc @ 31607:aac27ad79be6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 18:02:15 -0800
parents e88a07dec498
children 597f3ee61a48
comparison
equal deleted inserted replaced
31605:e88a07dec498 31607:aac27ad79be6
65 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_complex, 65 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_complex,
66 "complex scalar", "double"); 66 "complex scalar", "double");
67 67
68 OCTAVE_BEGIN_NAMESPACE(octave) 68 OCTAVE_BEGIN_NAMESPACE(octave)
69 69
70 // Complain if a complex value is used as a subscript. 70 // Complain if a complex value is used as a subscript.
71 71
72 class complex_index_exception : public index_exception 72 class complex_index_exception : public index_exception
73 {
74 public:
75
76 complex_index_exception (const std::string& value)
77 : index_exception (value)
73 { 78 {
74 public: 79 // Virtual, but the one we want to call is defined in this class.
75 80 update_message ();
76 complex_index_exception (const std::string& value) 81 }
77 : index_exception (value) 82
78 { 83 ~complex_index_exception (void) = default;
79 // Virtual, but the one we want to call is defined in this class. 84
80 update_message (); 85 void update_message (void)
81 } 86 {
82 87 set_message (expression ()
83 ~complex_index_exception (void) = default; 88 + ": subscripts must be real (forgot to initialize i or j?)");
84 89 }
85 void update_message (void) 90
86 { 91 // ID of error to throw.
87 set_message (expression () 92 const char * err_id (void) const
88 + ": subscripts must be real (forgot to initialize i or j?)"); 93 {
89 } 94 return "Octave:invalid-index";
90 95 }
91 // ID of error to throw. 96 };
92 const char * err_id (void) const
93 {
94 return "Octave:invalid-index";
95 }
96 };
97 97
98 OCTAVE_END_NAMESPACE(octave) 98 OCTAVE_END_NAMESPACE(octave)
99 99
100 static octave_base_value * 100 static octave_base_value *
101 default_numeric_demotion_function (const octave_base_value& a) 101 default_numeric_demotion_function (const octave_base_value& a)
505 { 505 {
506 #define SCALAR_MAPPER(UMAP, FCN) \ 506 #define SCALAR_MAPPER(UMAP, FCN) \
507 case umap_ ## UMAP: \ 507 case umap_ ## UMAP: \
508 return octave_value (FCN (scalar)) 508 return octave_value (FCN (scalar))
509 509
510 SCALAR_MAPPER (abs, std::abs); 510 SCALAR_MAPPER (abs, std::abs);
511 SCALAR_MAPPER (acos, octave::math::acos); 511 SCALAR_MAPPER (acos, octave::math::acos);
512 SCALAR_MAPPER (acosh, octave::math::acosh); 512 SCALAR_MAPPER (acosh, octave::math::acosh);
513 SCALAR_MAPPER (angle, std::arg); 513 SCALAR_MAPPER (angle, std::arg);
514 SCALAR_MAPPER (arg, std::arg); 514 SCALAR_MAPPER (arg, std::arg);
515 SCALAR_MAPPER (asin, octave::math::asin); 515 SCALAR_MAPPER (asin, octave::math::asin);
516 SCALAR_MAPPER (asinh, octave::math::asinh); 516 SCALAR_MAPPER (asinh, octave::math::asinh);
517 SCALAR_MAPPER (atan, octave::math::atan); 517 SCALAR_MAPPER (atan, octave::math::atan);
518 SCALAR_MAPPER (atanh, octave::math::atanh); 518 SCALAR_MAPPER (atanh, octave::math::atanh);
519 SCALAR_MAPPER (erf, octave::math::erf); 519 SCALAR_MAPPER (erf, octave::math::erf);
520 SCALAR_MAPPER (erfc, octave::math::erfc); 520 SCALAR_MAPPER (erfc, octave::math::erfc);
521 SCALAR_MAPPER (erfcx, octave::math::erfcx); 521 SCALAR_MAPPER (erfcx, octave::math::erfcx);
522 SCALAR_MAPPER (erfi, octave::math::erfi); 522 SCALAR_MAPPER (erfi, octave::math::erfi);
523 SCALAR_MAPPER (dawson, octave::math::dawson); 523 SCALAR_MAPPER (dawson, octave::math::dawson);
524 SCALAR_MAPPER (ceil, octave::math::ceil); 524 SCALAR_MAPPER (ceil, octave::math::ceil);
525 SCALAR_MAPPER (conj, std::conj); 525 SCALAR_MAPPER (conj, std::conj);
526 SCALAR_MAPPER (cos, std::cos); 526 SCALAR_MAPPER (cos, std::cos);
527 SCALAR_MAPPER (cosh, std::cosh); 527 SCALAR_MAPPER (cosh, std::cosh);
528 SCALAR_MAPPER (exp, std::exp); 528 SCALAR_MAPPER (exp, std::exp);
529 SCALAR_MAPPER (expm1, octave::math::expm1); 529 SCALAR_MAPPER (expm1, octave::math::expm1);
530 SCALAR_MAPPER (fix, octave::math::fix); 530 SCALAR_MAPPER (fix, octave::math::fix);
531 SCALAR_MAPPER (floor, octave::math::floor); 531 SCALAR_MAPPER (floor, octave::math::floor);
532 SCALAR_MAPPER (imag, std::imag); 532 SCALAR_MAPPER (imag, std::imag);
533 SCALAR_MAPPER (log, std::log); 533 SCALAR_MAPPER (log, std::log);
534 SCALAR_MAPPER (log2, octave::math::log2); 534 SCALAR_MAPPER (log2, octave::math::log2);
535 SCALAR_MAPPER (log10, std::log10); 535 SCALAR_MAPPER (log10, std::log10);
536 SCALAR_MAPPER (log1p, octave::math::log1p); 536 SCALAR_MAPPER (log1p, octave::math::log1p);
537 SCALAR_MAPPER (real, std::real); 537 SCALAR_MAPPER (real, std::real);
538 SCALAR_MAPPER (round, octave::math::round); 538 SCALAR_MAPPER (round, octave::math::round);
539 SCALAR_MAPPER (roundb, octave::math::roundb); 539 SCALAR_MAPPER (roundb, octave::math::roundb);
540 SCALAR_MAPPER (signum, octave::math::signum); 540 SCALAR_MAPPER (signum, octave::math::signum);
541 SCALAR_MAPPER (sin, std::sin); 541 SCALAR_MAPPER (sin, std::sin);
542 SCALAR_MAPPER (sinh, std::sinh); 542 SCALAR_MAPPER (sinh, std::sinh);
543 SCALAR_MAPPER (sqrt, std::sqrt); 543 SCALAR_MAPPER (sqrt, std::sqrt);
544 SCALAR_MAPPER (tan, std::tan); 544 SCALAR_MAPPER (tan, std::tan);
545 SCALAR_MAPPER (tanh, std::tanh); 545 SCALAR_MAPPER (tanh, std::tanh);
546 SCALAR_MAPPER (isfinite, octave::math::isfinite); 546 SCALAR_MAPPER (isfinite, octave::math::isfinite);
547 SCALAR_MAPPER (isinf, octave::math::isinf); 547 SCALAR_MAPPER (isinf, octave::math::isinf);
548 SCALAR_MAPPER (isna, octave::math::isna); 548 SCALAR_MAPPER (isna, octave::math::isna);
549 SCALAR_MAPPER (isnan, octave::math::isnan); 549 SCALAR_MAPPER (isnan, octave::math::isnan);
550 550
551 // Special cases for Matlab compatibility. 551 // Special cases for Matlab compatibility.
552 case umap_xtolower: 552 case umap_xtolower:
553 case umap_xtoupper: 553 case umap_xtoupper:
554 return scalar; 554 return scalar;