octave: libinterp/corefcn/lookup.cc annotate

annotate libinterp/corefcn/lookup.cc @ 31605:e88a07dec498 stable

maint: Use macros to begin/end C++ namespaces. * oct-conf-post-public.in.h: Define two macros (OCTAVE_BEGIN_NAMESPACE, OCTAVE_END_NAMESPACE) that can be used to start/end a namespace. * mk-opts.pl, build-env.h, build-env.in.cc, __betainc__.cc, __contourc__.cc, __dsearchn__.cc, __eigs__.cc, __expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, auto-shlib.cc, auto-shlib.h, balance.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, data.h, debug.cc, defaults.cc, defaults.h, defun-int.h, defun.cc, det.cc, dirfns.cc, display.cc, display.h, dlmread.cc, dmperm.cc, dot.cc, dynamic-ld.cc, dynamic-ld.h, eig.cc, 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, fftn.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gsvd.cc, gtk-manager.cc, gtk-manager.h, hash.cc, help.cc, help.h, hess.cc, hex2num.cc, 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, kron.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-ascii-helper.cc, ls-ascii-helper.h, ls-oct-text.cc, ls-utils.cc, ls-utils.h, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex-private.h, mex.cc, mgorth.cc, nproc.cc, oct-fstrm.cc, oct-fstrm.h, oct-hdf5-types.cc, oct-hdf5-types.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, oct-tex-parser.yy, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-flt-fmt.cc, pr-output.cc, procstream.cc, procstream.h, psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xdiv.cc, sparse-xdiv.h, sparse-xpow.cc, sparse-xpow.h, sparse.cc, spparms.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symbfact.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, syscalls.cc, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, xdiv.h, xnorm.cc, xnorm.h, xpow.cc, xpow.h, __delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc, audioread.cc, convhulln.cc, fftw.cc, gzip.cc, mk-build-env-features.sh, mk-builtins.pl, 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.cc, ov-base.h, ov-bool-mat.cc, ov-builtin.h, ov-cell.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-java.cc, ov-java.h, ov-mex-fcn.h, ov-null-mat.cc, ov-oncleanup.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, octave.cc, octave.h, mk-ops.sh, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-mi.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.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, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, 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-vm-eval.cc, 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 : Use new macros to begin/end C++ namespaces.

author	Rik <rik@octave.org>
date	Thu, 01 Dec 2022 14:23:45 -0800
parents	796f54d4ddbf
children	aac27ad79be6

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 29961 diff changeset	3 // Copyright (C) 2008-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	27 # include "config.h"
10039 1e306aa51d6c Include config.h before another header file. Thomas Treichl parents: 9923 diff changeset	28 #endif
1e306aa51d6c Include config.h before another header file. Thomas Treichl parents: 9923 diff changeset	29
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	30 #include <cctype>
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	31 #include <functional>
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	32 #include <algorithm>
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	33
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	34 #include "dNDArray.h"
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	35 #include "CNDArray.h"
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	36
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	37 #include "Cell.h"
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14846 diff changeset	38 #include "defun.h"
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	39 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 20940 diff changeset	40 #include "errwarn.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20939 diff changeset	41 #include "ovl.h"
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	42 #include "ov.h"
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	43
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30564 diff changeset	44 OCTAVE_BEGIN_NAMESPACE(octave)
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29569 diff changeset	45
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	46 static
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	47 bool
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	48 contains_char (const std::string& str, char c)
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	49 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	50 return (str.find (c) != std::string::npos
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	51 \|\| str.find (std::toupper (c)) != std::string::npos);
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	52 }
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	53
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21100 diff changeset	54 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	55 inline sortmode
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	56 get_sort_mode (const Array<T>& array,
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	57 typename octave_sort<T>::compare_fcn_type desc_comp
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	58 = octave_sort<T>::descending_compare)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	59 {
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	60 octave_idx_type n = array.numel ();
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	61 if (n > 1 && desc_comp (array (0), array (n-1)))
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	62 return DESCENDING;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	63 else
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	64 return ASCENDING;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	65 }
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	66
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	67 // FIXME: perhaps there should be octave_value::lookup?
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	68 // The question is, how should it behave w.r.t. the second argument's type.
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	69 // We'd need a dispatch on two arguments. Hmmm...
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	70
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	71 #define INT_ARRAY_LOOKUP(TYPE) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	72 (table.is_ ## TYPE ## _type () && y.is_ ## TYPE ## _type ()) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	73 retval = do_numeric_lookup (table.TYPE ## _array_value (), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	74 y.TYPE ## _array_value (), \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	75 left_inf, right_inf, \
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	76 match_idx, match_bool);
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21100 diff changeset	77 template <typename ArrayT>
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	78 static octave_value
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	79 do_numeric_lookup (const ArrayT& array, const ArrayT& values,
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	80 bool left_inf, bool right_inf,
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	81 bool match_idx, bool match_bool)
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	82 {
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	83 octave_value retval;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	84
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	85 Array<octave_idx_type> idx = array.lookup (values);
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	86 octave_idx_type n = array.numel ();
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	87 octave_idx_type nval = values.numel ();
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	88
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	89 // Post-process.
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	90 if (match_bool)
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	91 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	92 boolNDArray match (idx.dims ());
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	93 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	94 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	95 octave_idx_type j = idx.xelem (i);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	96 match.xelem (i) = j != 0 && values(i) == array(j-1);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	97 }
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	98
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	99 retval = match;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	100 }
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	101 else if (match_idx \|\| left_inf \|\| right_inf)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	102 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	103 if (match_idx)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	104 {
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	105 NDArray ridx (idx.dims ());
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	106
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	107 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	108 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	109 octave_idx_type j = idx.xelem (i);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	110 ridx.xelem (i) = (j != 0 && values(i) == array(j-1)) ? j : 0;
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	111 }
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	112
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	113 retval = ridx;
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	114 }
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	115 else if (left_inf && right_inf)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	116 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	117 // Results in valid indices. Optimize using lazy index.
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	118 octave_idx_type zero = 0;
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	119 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	120 {
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	121 octave_idx_type j = idx.xelem (i) - 1;
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	122 idx.xelem (i) = std::max (zero, std::min (j, n-2));
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	123 }
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	124
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	125 retval = idx_vector (idx);
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	126 }
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	127 else if (left_inf)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	128 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	129 // Results in valid indices. Optimize using lazy index.
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	130 octave_idx_type zero = 0;
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	131 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	132 {
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	133 octave_idx_type j = idx.xelem (i) - 1;
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	134 idx.xelem (i) = std::max (zero, j);
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	135 }
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	136
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	137 retval = idx_vector (idx);
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	138 }
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	139 else if (right_inf)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	140 {
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	141 NDArray ridx (idx.dims ());
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	142
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	143 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	144 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	145 octave_idx_type j = idx.xelem (i);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	146 ridx.xelem (i) = std::min (j, n-1);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	147 }
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	148
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	149 retval = ridx;
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	150 }
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	151 }
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	152 else
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	153 retval = idx;
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	154
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	155 return retval;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	156 }
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	157
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14846 diff changeset	158 DEFUN (lookup, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	159 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	160 @deftypefn {} {@var{idx} =} lookup (@var{table}, @var{y})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	161 @deftypefnx {} {@var{idx} =} lookup (@var{table}, @var{y}, @var{opt})
23999 21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	162 Lookup values in a @strong{sorted} table.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	163
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	164 This function is usually used as a prelude to interpolation.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	165
24548 a00033be2134 Clean up lookup() code and documentation with no functional changes (bug #52785). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24534 diff changeset	166 If table is increasing, of length N and @code{idx = lookup (table, y)}, then
23999 21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	167 @code{table(idx(i)) <= y(i) < table(idx(i+1))} for all @code{y(i)} within the
21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	168 table. If @code{y(i) < table(1)} then @code{idx(i)} is 0. If
24548 a00033be2134 Clean up lookup() code and documentation with no functional changes (bug #52785). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24534 diff changeset	169 @code{y(i) >= table(end)} or @code{isnan (y(i))} then @code{idx(i)} is N.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	170
23999 21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	171 If the table is decreasing, then the tests are reversed. For non-strictly
21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	172 monotonic tables, empty intervals are always skipped. The result is undefined
21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	173 if @var{table} is not monotonic, or if @var{table} contains a NaN.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	174
24548 a00033be2134 Clean up lookup() code and documentation with no functional changes (bug #52785). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24534 diff changeset	175 The complexity of the lookup is O(M*log(N)) where M is the size of @var{y}.
a00033be2134 Clean up lookup() code and documentation with no functional changes (bug #52785). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24534 diff changeset	176 In the special case when @var{y} is also sorted, the complexity is
a00033be2134 Clean up lookup() code and documentation with no functional changes (bug #52785). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24534 diff changeset	177 O(min (M*log(N), M+N)).
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	178
23999 21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	179 @var{table} and @var{y} can also be cell arrays of strings (or @var{y} can be a
21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	180 single string). In this case, string lookup is performed using lexicographical
21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	181 comparison.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	182
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	183 If @var{opts} is specified, it must be a string with letters indicating
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	184 additional options.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	185
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	186 @table @code
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	187 @item m
24505 9c178e5252e4 maint: merge stable to default. Rik <rik@octave.org> parents: 23999 24504 diff changeset	188 Match. @code{table(idx(i)) == y(i)} if @code{y(i)} occurs in table;
23999 21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	189 otherwise, @code{idx(i)} is zero.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	190
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	191 @item b
24526 d68d1096d294 doc: Another tweak to lookup() documentation (bug #52785). Rik <rik@octave.org> parents: 24505 diff changeset	192 Boolean. @code{idx(i)} is a logical 1 or 0, indicating whether @code{y(i)}
23999 21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	193 is contained in table or not.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	194
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	195 @item l
23999 21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	196 Left. For numeric lookups the leftmost subinterval shall be extended to
24548 a00033be2134 Clean up lookup() code and documentation with no functional changes (bug #52785). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24534 diff changeset	197 minus infinity (i.e., all indices at least 1).
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	198
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	199 @item r
23999 21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	200 Right. For numeric lookups the rightmost subinterval shall be extended to
24548 a00033be2134 Clean up lookup() code and documentation with no functional changes (bug #52785). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24534 diff changeset	201 infinity (i.e., all indices at most N-1).
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	202 @end table
23999 21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	203
21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	204 @strong{Note}: If @var{table} is not sorted the results from @code{lookup}
21d2114476a4 Improve docstring for lookup() (bug #46425). Rik <rik@octave.org> parents: 23586 diff changeset	205 will be unpredictable.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	206 @end deftypefn */)
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	207 {
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	208 int nargin = args.length ();
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	209
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	210 if (nargin < 2 \|\| nargin > 3)
20802 8bb38ba1bad6 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	211 print_usage ();
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	212
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	213 octave_value table = args(0);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	214 octave_value y = args(1);
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	215 if (table.ndims () > 2 \|\| (table.columns () > 1 && table.rows () > 1))
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	216 warning ("lookup: table is not a vector");
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	217
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	218 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	219
23586 f6c5db0a02e7 maint: Deprecate is_numeric_type and replace with isnumeric. Rik <rik@octave.org> parents: 23581 diff changeset	220 bool num_case = ((table.isnumeric () && y.isnumeric ())
9344 0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	221 \|\| (table.is_char_matrix () && y.is_char_matrix ()));
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23450 diff changeset	222 bool str_case = table.iscellstr () && (y.is_string () \|\| y.iscellstr ());
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	223 bool left_inf = false;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	224 bool right_inf = false;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	225 bool match_idx = false;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	226 bool match_bool = false;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	227
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	228 if (nargin == 3)
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	229 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	230 std::string opt = args(2).xstring_value ("lookup: OPT must be a string");
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	231 left_inf = contains_char (opt, 'l');
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	232 right_inf = contains_char (opt, 'r');
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	233 match_idx = contains_char (opt, 'm');
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	234 match_bool = contains_char (opt, 'b');
11560 05b5bcdb09c8 validate opts in lookup Jaroslav Hajek <highegg@gmail.com> parents: 11553 diff changeset	235 if (opt.find_first_not_of ("lrmb") != std::string::npos)
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	236 error ("lookup: unrecognized option: %c",
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20853 diff changeset	237 opt[opt.find_first_not_of ("lrmb")]);
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	238 }
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	239
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	240 if ((match_idx \|\| match_bool) && (left_inf \|\| right_inf))
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	241 error ("lookup: m, b cannot be specified with l or r");
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	242 else if (match_idx && match_bool)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	243 error ("lookup: only one of m or b can be specified");
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	244 else if (str_case && (left_inf \|\| right_inf))
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	245 error ("lookup: l, r are not recognized for string lookups");
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	246
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	247 if (num_case)
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	248 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	249 // In the case of a complex array, absolute values will be used for
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	250 // compatibility (though it's not too meaningful).
23581 c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex. Rik <rik@octave.org> parents: 23575 diff changeset	251 if (table.iscomplex ())
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	252 table = table.abs ();
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	253
23581 c3075ae020e1 maint: Deprecate is_complex_type and replace with iscomplex. Rik <rik@octave.org> parents: 23575 diff changeset	254 if (y.iscomplex ())
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	255 y = y.abs ();
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	256
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	257 Array<octave_idx_type> idx;
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	258
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	259 // PS: I learned this from data.cc
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	260 if INT_ARRAY_LOOKUP (int8)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	261 else if INT_ARRAY_LOOKUP (int16)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	262 else if INT_ARRAY_LOOKUP (int32)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	263 else if INT_ARRAY_LOOKUP (int64)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	264 else if INT_ARRAY_LOOKUP (uint8)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	265 else if INT_ARRAY_LOOKUP (uint16)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	266 else if INT_ARRAY_LOOKUP (uint32)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	267 else if INT_ARRAY_LOOKUP (uint64)
9344 0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	268 else if (table.is_char_matrix () && y.is_char_matrix ())
0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	269 retval = do_numeric_lookup (table.char_array_value (),
0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	270 y.char_array_value (),
0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	271 left_inf, right_inf,
0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	272 match_idx, match_bool);
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	273 else if (table.is_single_type () \|\| y.is_single_type ())
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	274 retval = do_numeric_lookup (table.float_array_value (),
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	275 y.float_array_value (),
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	276 left_inf, right_inf,
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	277 match_idx, match_bool);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7671 diff changeset	278 else
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	279 retval = do_numeric_lookup (table.array_value (),
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	280 y.array_value (),
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	281 left_inf, right_inf,
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	282 match_idx, match_bool);
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	283 }
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	284 else if (str_case)
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	285 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	286 Array<std::string> str_table = table.cellstr_value ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11560 diff changeset	287 Array<std::string> str_y (dim_vector (1, 1));
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	288
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23450 diff changeset	289 if (y.iscellstr ())
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	290 str_y = y.cellstr_value ();
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	291 else
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	292 str_y(0) = y.string_value ();
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	293
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	294 Array<octave_idx_type> idx = str_table.lookup (str_y);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	295 octave_idx_type nval = str_y.numel ();
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	296
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	297 // Post-process.
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	298 if (match_bool)
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	299 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	300 boolNDArray match (idx.dims ());
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	301 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	302 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	303 octave_idx_type j = idx.xelem (i);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	304 match.xelem (i) = j != 0 && str_y(i) == str_table(j-1);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	305 }
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	306
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	307 retval = match;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	308 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	309 else if (match_idx)
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	310 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	311 NDArray ridx (idx.dims ());
24548 a00033be2134 Clean up lookup() code and documentation with no functional changes (bug #52785). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24534 diff changeset	312 for (octave_idx_type i = 0; i < nval; i++)
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	313 {
24548 a00033be2134 Clean up lookup() code and documentation with no functional changes (bug #52785). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24534 diff changeset	314 octave_idx_type j = idx.xelem (i);
a00033be2134 Clean up lookup() code and documentation with no functional changes (bug #52785). Daniel J Sebald <daniel.sebald@ieee.org> parents: 24534 diff changeset	315 ridx.xelem (i) = (j != 0 && str_y(i) == str_table(j-1) ? j : 0);
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	316 }
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	317
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	318 retval = ridx;
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	319 }
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	320 else
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	321 retval = idx;
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	322 }
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	323 else
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	324 print_usage ();
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	325
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	326 return retval;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	327 }
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	328
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	329 /*
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	330 %!assert (lookup (1:3, 0.5), 0) # value before table
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	331 %!assert (lookup (1:3, 3.5), 3) # value after table error
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	332 %!assert (lookup (1:3, 1.5), 1) # value within table error
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	333 %!assert (lookup (1:3, [3,2,1]), [3,2,1])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	334 %!assert (lookup ([1:4]', [1.2, 3.5]'), [1, 3]')
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	335 %!assert (lookup ([1:4], [1.2, 3.5]'), [1, 3]')
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	336 %!assert (lookup ([1:4]', [1.2, 3.5]), [1, 3])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	337 %!assert (lookup ([1:4], [1.2, 3.5]), [1, 3])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	338 %!assert (lookup (1:3, [3, 2, 1]), [3, 2, 1])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	339 %!assert (lookup ([3:-1:1], [3.5, 3, 1.2, 2.5, 2.5]), [0, 1, 2, 1, 1])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	340 %!assert (isempty (lookup ([1:3], [])))
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	341 %!assert (isempty (lookup ([1:3]', [])))
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	342 %!assert (lookup (1:3, [1, 2; 3, 0.5]), [1, 2; 3, 0])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	343 %!assert (lookup (1:4, [1, 1.2; 3, 2.5], "m"), [1, 0; 3, 0])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	344 %!assert (lookup (4:-1:1, [1, 1.2; 3, 2.5], "m"), [4, 0; 2, 0])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	345 %!assert (lookup (1:4, [1, 1.2; 3, 2.5], "b"), logical ([1, 0; 3, 0]))
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	346 %!assert (lookup (4:-1:1, [1, 1.2; 3, 2.5], "b"), logical ([4, 0; 2, 0]))
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	347 %!
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	348 %!assert (lookup ({"apple","lemon","orange"}, {"banana","kiwi"; "ananas","mango"}), [1,1;0,2])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	349 %!assert (lookup ({"apple","lemon","orange"}, "potato"), 3)
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	350 %!assert (lookup ({"orange","lemon","apple"}, "potato"), 0)
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	351 */
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29569 diff changeset	352
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30564 diff changeset	353 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libinterp/corefcn/lookup.cc @ 31605:e88a07dec498 stable