octave-lyh: libinterp/corefcn/lookup.cc annotate

annotate libinterp/corefcn/lookup.cc @ 17280:8ce6cdd272eb

Support TeX elements in FreeType renderer. * libinterp/corefcn/txt-eng.cc: New file. Contains mapping from symbol name to character code, in Unicode and MS symbol. * libinterp/corefcn/modules.mk (COREFCN_SRC): Add txt-eng.cc. * libinterp/corefcn/oct-tex-lexer.ll: Add "\n" to rules applicable to ".", as the latter does not include new line characters. * libinterp/corefcn/oct-tex-parser.yy: Remove debug statements. * libinterp/corefcn/txt-eng.ft.cc (gripe_missing_glyph, gripe_glyph_render): Change signature from char to FT_ULong. (ft_render::ft_render): Adapt to new/removed members. (ft_render::~ft_render): Remove use of fonts member. (ft_render::set_font): Likewise. Use font instead. (ft_render::push_new_line): Likewise. Change meaning of yoffset and initialize line_yoffset. (ft_render::update_line_bbox): New method. (ft_render::set_mode): Change meaning of yoffset and initialize line_yoffset. (ft_render::process_character): New method. (ft_render::visit(text_element_string)): Use it. (ft_render::visit(text_element_list), ft_render::visit(text_element_subscript), ft_render::visit(text_element_superscript), ft_render::visit(text_element_color), ft_render::visit(text_element_fontsize), ft_render::visit(text_element_fontname), ft_render::visit(text_element_fontstyle), ft_render::visit(text_element_symbol)): New methods. (ft_render::set_color): Use color member instead of red/green/blue. * libinterp/corefcn/txt-eng-ft.h (ft_render::visit(text_element_list), ft_render::visit(text_element_subscript), ft_render::visit(text_element_superscript), ft_render::visit(text_element_color), ft_render::visit(text_element_fontsize), ft_render::visit(text_element_fontname), ft_render::visit(text_element_fontstyle), ft_render::visit(text_element_symbol)): New methods. (ft_render::update_line_bbox, ft_render::process_character): New methods. (ft_render::current_face): Removed method.i (ft_render::font): New member, replaces obsolete ft_render::fonts. (ft_render::line_yoffset): New member. (ft_render::color): New member, replaces obsolete red, green and blue. (ft_render::ft_font::ft_font()): Implement default constructor. (ft_render::ft_font::operator=): Fix incorrect use of FT_Reference_Face return value. (ft_render::ft_font::is_valid): New method. * libinterp/corefcn/txt-eng.h (class text_element_symbol, class text_element_fontname, class text_element_fontsize, class text_element_fontname, class text_element_fontstyle, class text_element_color): Add forward definition. (text_element_symbol::invalid_code): New enum. (text_element_symbol::code): New member. (text_element_symbol::text_element_symbol): Initialize it. (text_element_symbol::get_symbol_code): New method. (text_element_fontstyle::get_fontstyle): New method. (text_element_fontname::get_fontname): Renamed from fontname. (text_element_fontsize::get_fontsize): Renamed from fontsize.

author	Michael Goffioul <michael.goffioul@gmail.com>
date	Sun, 18 Aug 2013 16:36:46 -0400
parents	2fc554ffbc28
children

rev	line source
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	1 /*
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	2
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 12639 diff changeset	3 Copyright (C) 2008-2012 VZLU Prague a.s., Czech Republic
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	4
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	5 This file is part of Octave.
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	6
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	8 under the terms of the GNU General Public License as published by
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	9 the Free Software Foundation; either version 3 of the License, or (at
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	10 your option) any later version.
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	11
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	15 General Public License for more details.
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	16
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	20
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	21 */
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	22
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	23 // Author: Jaroslav Hajek <highegg@gmail.com>
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	24
10039 1e306aa51d6c Include config.h before another header file. Thomas Treichl parents: 9923 diff changeset	25 #ifdef HAVE_CONFIG_H
1e306aa51d6c Include config.h before another header file. Thomas Treichl parents: 9923 diff changeset	26 #include <config.h>
1e306aa51d6c Include config.h before another header file. Thomas Treichl parents: 9923 diff changeset	27 #endif
1e306aa51d6c Include config.h before another header file. Thomas Treichl parents: 9923 diff changeset	28
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	29 #include <cctype>
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	30 #include <functional>
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	31 #include <algorithm>
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	32
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	33 #include "dNDArray.h"
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	34 #include "CNDArray.h"
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	35
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	36 #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	37 #include "defun.h"
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	38 #include "error.h"
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	39 #include "gripes.h"
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	40 #include "oct-obj.h"
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	41 #include "ov.h"
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	42
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	43 static
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	44 bool
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	45 contains_char (const std::string& str, char c)
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	46 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	47 return (str.find (c) != std::string::npos
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10076 diff changeset	48 \|\| str.find (std::toupper (c)) != std::string::npos);
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	49 }
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	50
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	51 // case-insensitive character comparison functors
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	52 struct icmp_char_lt : public std::binary_function<char, char, bool>
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	53 {
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	54 bool operator () (char x, char y) const
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	55 { return std::toupper (x) < std::toupper (y); }
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	56 };
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	57
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	58 struct icmp_char_gt : public std::binary_function<char, char, bool>
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	59 {
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	60 bool operator () (char x, char y) const
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	61 { return std::toupper (x) > std::toupper (y); }
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	62 };
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	63
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 10039 diff changeset	64 // FIXME -- maybe these should go elsewhere?
4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 10039 diff changeset	65 // FIXME -- are they even needed now?
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	66 // case-insensitive ascending comparator
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 10039 diff changeset	67 #if 0
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	68 static bool
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	69 stri_comp_lt (const std::string& a, const std::string& b)
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	70 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	71 return std::lexicographical_compare (a.begin (), a.end (),
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	72 b.begin (), b.end (),
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14501 diff changeset	73 icmp_char_lt ());
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	74 }
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	75
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	76 // case-insensitive descending comparator
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	77 static bool
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	78 stri_comp_gt (const std::string& a, const std::string& b)
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	79 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	80 return std::lexicographical_compare (a.begin (), a.end (),
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	81 b.begin (), b.end (),
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14501 diff changeset	82 icmp_char_gt ());
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	83 }
10076 4b270d1540f7 avoid various GCC warnings John W. Eaton <jwe@octave.org> parents: 10039 diff changeset	84 #endif
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	85
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	86 template <class T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	87 inline sortmode
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	88 get_sort_mode (const Array<T>& array,
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	89 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	90 = octave_sort<T>::descending_compare)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	91 {
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	92 octave_idx_type n = array.numel ();
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	93 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	94 return DESCENDING;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	95 else
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	96 return ASCENDING;
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	97 }
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	98
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	99 // 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	100 // The question is, how should it behave w.r.t. the second argument's type.
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	101 // We'd need a dispatch on two arguments. Hmmm...
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	102
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	103 #define INT_ARRAY_LOOKUP(TYPE) \
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	104 (table.is_ ## TYPE ## _type () && y.is_ ## TYPE ## _type ()) \
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	105 retval = do_numeric_lookup (table.TYPE ## _array_value (), \
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	106 y.TYPE ## _array_value (), \
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	107 left_inf, right_inf, \
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	108 match_idx, match_bool);
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	109 template <class ArrayT>
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	110 static octave_value
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	111 do_numeric_lookup (const ArrayT& array, const ArrayT& values,
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	112 bool left_inf, bool right_inf,
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	113 bool match_idx, bool match_bool)
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	114 {
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	115 octave_value retval;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	116
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	117 Array<octave_idx_type> idx = array.lookup (values);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	118 octave_idx_type n = array.numel (), nval = values.numel ();
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	119
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	120 // Post-process.
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	121 if (match_bool)
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	122 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	123 boolNDArray match (idx.dims ());
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	124 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	125 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	126 octave_idx_type j = idx.xelem (i);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	127 match.xelem (i) = j != 0 && values(i) == array(j-1);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	128 }
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	129
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	130 retval = match;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	131 }
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	132 else if (match_idx \|\| left_inf \|\| right_inf)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	133 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	134 if (match_idx)
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 NDArray ridx (idx.dims ());
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	137
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	138 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	139 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	140 octave_idx_type j = idx.xelem (i);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	141 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	142 }
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	143
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	144 retval = ridx;
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	145 }
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	146 else if (left_inf && right_inf)
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 // Results in valid indices. Optimize using lazy index.
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	149 octave_idx_type zero = 0;
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	150 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	151 {
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	152 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	153 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	154 }
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	155
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	156 retval = idx_vector (idx);
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	157 }
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	158 else if (left_inf)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	159 {
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	160 // Results in valid indices. Optimize using lazy index.
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	161 octave_idx_type zero = 0;
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	162 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	163 {
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	164 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	165 idx.xelem (i) = std::max (zero, j);
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	166 }
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	167
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	168 retval = idx_vector (idx);
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	169 }
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	170 else if (right_inf)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	171 {
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	172 NDArray ridx (idx.dims ());
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	173
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	174 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	175 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	176 octave_idx_type j = idx.xelem (i);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	177 ridx.xelem (i) = std::min (j, n-1);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	178 }
10327 76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	179
76cf6dd20f1a take advantage of lazy index optimization in lookup Jaroslav Hajek <highegg@gmail.com> parents: 10258 diff changeset	180 retval = ridx;
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	181 }
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	182 }
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	183 else
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	184 retval = idx;
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	185
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	186 return retval;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	187 }
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	188
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14846 diff changeset	189 DEFUN (lookup, args, ,
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	190 "-- texinfo --\n\
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14846 diff changeset	191 @deftypefn {Built-in Function} {@var{idx} =} lookup (@var{table}, @var{y})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14846 diff changeset	192 @deftypefnx {Built-in Function} {@var{idx} =} lookup (@var{table}, @var{y}, @var{opt})\n\
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	193 Lookup values in a sorted table. Usually used as a prelude to\n\
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	194 interpolation.\n\
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	195 \n\
9366 25b52645de34 improve lookup's inline docs Jaroslav Hajek <highegg@gmail.com> parents: 9351 diff changeset	196 If table is increasing and @code{idx = lookup (table, y)}, then\n\
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	197 @code{table(idx(i)) <= y(i) < table(idx(i+1))} for all @code{y(i)}\n\
12639 4d777e05d47c doc: Review and update documentation for "Matrix Manipulation" chapter. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	198 within the table. If @code{y(i) < table(1)} then\n\
9730 dd4aa19c3053 update docstring of lookup Jaroslav Hajek <highegg@gmail.com> parents: 9366 diff changeset	199 @code{idx(i)} is 0. If @code{y(i) >= table(end)} or @code{isnan (y(i))} then\n\
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	200 @code{idx(i)} is @code{n}.\n\
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	201 \n\
9366 25b52645de34 improve lookup's inline docs Jaroslav Hajek <highegg@gmail.com> parents: 9351 diff changeset	202 If the table is decreasing, then the tests are reversed.\n\
25b52645de34 improve lookup's inline docs Jaroslav Hajek <highegg@gmail.com> parents: 9351 diff changeset	203 For non-strictly monotonic tables, empty intervals are always skipped.\n\
25b52645de34 improve lookup's inline docs Jaroslav Hajek <highegg@gmail.com> parents: 9351 diff changeset	204 The result is undefined if @var{table} is not monotonic, or if\n\
9730 dd4aa19c3053 update docstring of lookup Jaroslav Hajek <highegg@gmail.com> parents: 9366 diff changeset	205 @var{table} contains a NaN.\n\
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	206 \n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	207 The complexity of the lookup is O(M*log(N)) where N is the size of\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	208 @var{table} and M is the size of @var{y}. In the special case when @var{y}\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	209 is also sorted, the complexity is O(min(M*log(N),M+N)).\n\
8617 4b26e9fbbb37 fix lookup's docstring Jaroslav Hajek <highegg@gmail.com> parents: 7924 diff changeset	210 \n\
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	211 @var{table} and @var{y} can also be cell arrays of strings\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	212 (or @var{y} can be a single string). In this case, string lookup\n\
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	213 is performed using lexicographical comparison.\n\
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	214 \n\
12639 4d777e05d47c doc: Review and update documentation for "Matrix Manipulation" chapter. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	215 If @var{opts} is specified, it must be a string with letters indicating\n\
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	216 additional options.\n\
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	217 \n\
10687 a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	218 @table @code\n\
a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	219 @item m\n\
a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	220 @code{table(idx(i)) == val(i)} if @code{val(i)}\n\
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	221 occurs in table; otherwise, @code{idx(i)} is zero.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10711 diff changeset	222 \n\
10687 a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	223 @item b\n\
a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	224 @code{idx(i)} is a logical 1 or 0, indicating whether\n\
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	225 @code{val(i)} is contained in table or not.\n\
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	226 \n\
10687 a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	227 @item l\n\
a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	228 For numeric lookups\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	229 the leftmost subinterval shall be extended to infinity (i.e., all indices\n\
10687 a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	230 at least 1)\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10711 diff changeset	231 \n\
10687 a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	232 @item r\n\
a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	233 For numeric lookups\n\
a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	234 the rightmost subinterval shall be extended to infinity (i.e., all indices\n\
a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	235 at most n-1).\n\
a8ce6bdecce5 Improve documentation strings. Rik <octave@nomad.inbox5.com> parents: 10407 diff changeset	236 @end table\n\
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	237 @end deftypefn")
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	238 {
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	239 octave_value retval;
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	240
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	241 int nargin = args.length ();
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	242
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	243 if (nargin < 2 \|\| nargin > 3 \|\| (nargin == 3 && ! args(2).is_string ()))
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	244 {
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	245 print_usage ();
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	246 return retval;
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	247 }
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	248
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	249 octave_value table = args(0), y = args(1);
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	250 if (table.ndims () > 2 \|\| (table.columns () > 1 && table.rows () > 1))
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	251 warning ("lookup: table is not a vector");
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	252
9344 0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	253 bool num_case = ((table.is_numeric_type () && y.is_numeric_type ())
0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	254 \|\| (table.is_char_matrix () && y.is_char_matrix ()));
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	255 bool str_case = table.is_cellstr () && (y.is_string () \|\| y.is_cellstr ());
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	256 bool left_inf = false;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	257 bool right_inf = false;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	258 bool match_idx = false;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	259 bool match_bool = false;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	260
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	261 if (nargin == 3)
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	262 {
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	263 std::string opt = args(2).string_value ();
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	264 left_inf = contains_char (opt, 'l');
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	265 right_inf = contains_char (opt, 'r');
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	266 match_idx = contains_char (opt, 'm');
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	267 match_bool = contains_char (opt, 'b');
11560 05b5bcdb09c8 validate opts in lookup Jaroslav Hajek <highegg@gmail.com> parents: 11553 diff changeset	268 if (opt.find_first_not_of ("lrmb") != std::string::npos)
05b5bcdb09c8 validate opts in lookup Jaroslav Hajek <highegg@gmail.com> parents: 11553 diff changeset	269 {
05b5bcdb09c8 validate opts in lookup Jaroslav Hajek <highegg@gmail.com> parents: 11553 diff changeset	270 error ("lookup: unrecognized option: %c",
05b5bcdb09c8 validate opts in lookup Jaroslav Hajek <highegg@gmail.com> parents: 11553 diff changeset	271 opt[opt.find_first_not_of ("lrmb")]);
05b5bcdb09c8 validate opts in lookup Jaroslav Hajek <highegg@gmail.com> parents: 11553 diff changeset	272 return retval;
05b5bcdb09c8 validate opts in lookup Jaroslav Hajek <highegg@gmail.com> parents: 11553 diff changeset	273 }
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	274 }
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	275
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	276 if ((match_idx \|\| match_bool) && (left_inf \|\| right_inf))
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	277 error ("lookup: m, b cannot be specified with l or r");
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	278 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	279 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	280 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	281 error ("lookup: l, r are not recognized for string lookups");
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	282
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	283 if (error_state)
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	284 return retval;
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	285
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	286 if (num_case)
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	287 {
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	288
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	289 // In the case of a complex array, absolute values will be used for compatibility
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	290 // (though it's not too meaningful).
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	291
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	292 if (table.is_complex_type ())
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	293 table = table.abs ();
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	294
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	295 if (y.is_complex_type ())
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	296 y = y.abs ();
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	297
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	298 Array<octave_idx_type> idx;
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	299
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	300 // PS: I learned this from data.cc
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	301 if INT_ARRAY_LOOKUP (int8)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	302 else if INT_ARRAY_LOOKUP (int16)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	303 else if INT_ARRAY_LOOKUP (int32)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	304 else if INT_ARRAY_LOOKUP (int64)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	305 else if INT_ARRAY_LOOKUP (uint8)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	306 else if INT_ARRAY_LOOKUP (uint16)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	307 else if INT_ARRAY_LOOKUP (uint32)
de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	308 else if INT_ARRAY_LOOKUP (uint64)
9344 0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	309 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	310 retval = do_numeric_lookup (table.char_array_value (),
0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	311 y.char_array_value (),
0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	312 left_inf, right_inf,
0c4e6a3d6e3e support char arrays in lookup Jaroslav Hajek <highegg@gmail.com> parents: 9341 diff changeset	313 match_idx, match_bool);
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	314 else if (table.is_single_type () \|\| y.is_single_type ())
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	315 retval = do_numeric_lookup (table.float_array_value (),
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	316 y.float_array_value (),
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	317 left_inf, right_inf,
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	318 match_idx, match_bool);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7671 diff changeset	319 else
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	320 retval = do_numeric_lookup (table.array_value (),
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	321 y.array_value (),
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	322 left_inf, right_inf,
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	323 match_idx, match_bool);
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	324
7671 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 else if (str_case)
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	327 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	328 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	329 Array<std::string> str_y (dim_vector (1, 1));
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	330
8814 de16ebeef93d improve lookup, provide Array<T>::lookup Jaroslav Hajek <highegg@gmail.com> parents: 8646 diff changeset	331 if (y.is_cellstr ())
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	332 str_y = y.cellstr_value ();
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	333 else
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	334 str_y(0) = y.string_value ();
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	335
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	336 Array<octave_idx_type> idx = str_table.lookup (str_y);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	337 octave_idx_type nval = str_y.numel ();
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	338
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	339 // Post-process.
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	340 if (match_bool)
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	341 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	342 boolNDArray match (idx.dims ());
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	343 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	344 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	345 octave_idx_type j = idx.xelem (i);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	346 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	347 }
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	348
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	349 retval = match;
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	350 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	351 else if (match_idx)
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	352 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	353 NDArray ridx (idx.dims ());
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	354 if (match_idx)
9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	355 {
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	356 for (octave_idx_type i = 0; i < nval; i++)
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	357 {
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	358 octave_idx_type j = idx.xelem (i);
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	359 ridx.xelem (i) = (j != 0 && str_y(i) == str_table(j-1)) ? j : 0;
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	360 }
9341 9fd5c56ce57a extend lookup capabilities Jaroslav Hajek <highegg@gmail.com> parents: 9064 diff changeset	361 }
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	362
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	363 retval = ridx;
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	364 }
9921 7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	365 else
7c8392a034e6 fix & improve lookup API Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	366 retval = idx;
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	367 }
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	368 else
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	369 print_usage ();
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	370
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	371 return retval;
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	372
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	373 }
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	374
4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	375 /*
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	376 %!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	377 %!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	378 %!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	379 %!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	380 %!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	381 %!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	382 %!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	383 %!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	384 %!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	385 %!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	386 %!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	387 %!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	388 %!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	389 %!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	390 %!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	391 %!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	392 %!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	393 %!
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	394 %!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	395 %!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	396 %!assert (lookup ({"orange","lemon","apple"}, "potato"), 0)
7671 4fbaba9abec1 implement compiled binary lookup Jaroslav Hajek <highegg@gmail.com> parents: diff changeset	397 */

Mercurial > hg > octave-lyh

annotate libinterp/corefcn/lookup.cc @ 17280:8ce6cdd272eb