octave: libinterp/corefcn/oct-map.h annotate

annotate libinterp/corefcn/oct-map.h @ 21244:1473547f50f5

include octave-config.h in public header files * mk-opts.pl, mkbuiltins, mk-ops.awk, sparse-mk-ops.awk: Emit "#include octave-config.h" statement for generated header files. * build-env.h, builtins.h, Cell.h, base-text-renderer.h, c-file-ptr-stream.h, cdisplay.h, comment-list.h, data.h, debug.h, defaults.in.h, defun-dld.h, defun-int.h, defun.h, dirfns.h, display.h, dynamic-ld.h, error.h, errwarn.h, event-queue.h, file-io.h, ft-text-renderer.h, gl-render.h, gl2ps-print.h, graphics.in.h, gripes.h, help.h, hook-fcn.h, input.h, jit-ir.h, jit-typeinfo.h, jit-util.h, load-path.h, load-save.h, ls-ascii-helper.h, ls-hdf5.h, ls-mat-ascii.h, ls-mat4.h, ls-mat5.h, ls-oct-binary.h, ls-oct-text.h, ls-utils.h, mex.h, mexproto.h, mxarray.in.h, oct-errno.h, oct-fstrm.h, oct-handle.h, oct-hdf5-types.h, oct-hdf5.h, oct-hist.h, oct-iostrm.h, oct-lvalue.h, oct-map.h, oct-obj.h, oct-opengl.h, oct-prcstrm.h, oct-procbuf.h, oct-stdstrm.h, oct-stream.h, oct-strstrm.h, oct.h, octave-default-image.h, octave-link.h, octave-preserve-stream-state.h, pager.h, pr-output.h, procstream.h, profiler.h, pt-jit.h, sighandlers.h, siglist.h, sparse-xdiv.h, sparse-xpow.h, symtab.h, sysdep.h, text-renderer.h, toplev.h, txt-eng.h, utils.h, variables.h, workspace-element.h, xdiv.h, xnorm.h, xpow.h, zfstream.h, oct-qhull.h, ov-base-diag.h, ov-base-int.h, ov-base-mat.h, ov-base-scalar.h, ov-base-sparse.h, ov-base.h, ov-bool-mat.h, ov-bool-sparse.h, ov-bool.h, ov-builtin.h, ov-cell.h, ov-ch-mat.h, ov-class.h, ov-classdef.h, ov-colon.h, ov-complex.h, ov-cs-list.h, ov-cx-diag.h, ov-cx-mat.h, ov-cx-sparse.h, ov-dld-fcn.h, ov-fcn-handle.h, ov-fcn-inline.h, ov-fcn.h, ov-float.h, ov-flt-complex.h, ov-flt-cx-diag.h, ov-flt-cx-mat.h, ov-flt-re-diag.h, ov-flt-re-mat.h, ov-int-traits.h, ov-int16.h, ov-int32.h, ov-int64.h, ov-int8.h, ov-intx.h, ov-java.h, ov-lazy-idx.h, ov-mex-fcn.h, ov-null-mat.h, ov-oncleanup.h, ov-perm.h, ov-range.h, ov-re-diag.h, ov-re-mat.h, ov-re-sparse.h, ov-scalar.h, ov-str-mat.h, ov-struct.h, ov-type-conv.h, ov-typeinfo.h, ov-uint16.h, ov-uint32.h, ov-uint64.h, ov-uint8.h, ov-usr-fcn.h, ov.h, ovl.h, octave.h, op-int.h, ops.h, options-usage.h, lex.h, parse.h, pt-all.h, pt-arg-list.h, pt-array-list.h, pt-assign.h, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.h, pt-eval.h, pt-except.h, pt-exp.h, pt-fcn-handle.h, pt-funcall.h, pt-id.h, pt-idx.h, pt-jump.h, pt-loop.h, pt-mat.h, pt-misc.h, pt-pr-code.h, pt-select.h, pt-stmt.h, pt-unop.h, pt-walk.h, pt.h, token.h, version.in.h, Array-util.h, Array.h, CColVector.h, CDiagMatrix.h, CMatrix.h, CNDArray.h, CRowVector.h, CSparse.h, DiagArray2.h, MArray.h, MDiagArray2.h, MSparse.h, Matrix.h, MatrixType.h, PermMatrix.h, Range.h, Sparse.h, boolMatrix.h, boolNDArray.h, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.h, dDiagMatrix.h, dMatrix.h, dNDArray.h, dRowVector.h, dSparse.h, dim-vector.h, fCColVector.h, fCDiagMatrix.h, fCMatrix.h, fCNDArray.h, fCRowVector.h, fColVector.h, fDiagMatrix.h, fMatrix.h, fNDArray.h, fRowVector.h, idx-vector.h, int16NDArray.h, int32NDArray.h, int64NDArray.h, int8NDArray.h, intNDArray.h, uint16NDArray.h, uint32NDArray.h, uint64NDArray.h, uint8NDArray.h, f77-fcn.h, lo-error.h, quit.h, CmplxAEPBAL.h, CmplxCHOL.h, CmplxGEPBAL.h, CmplxHESS.h, CmplxLU.h, CmplxQR.h, CmplxQRP.h, CmplxSCHUR.h, CmplxSVD.h, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.h, DASRT.h, DASSL.h, DET.h, EIG.h, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, base-aepbal.h, base-dae.h, base-de.h, base-lu.h, base-min.h, base-qr.h, bsxfun-decl.h, bsxfun.h, dbleAEPBAL.h, dbleCHOL.h, dbleGEPBAL.h, dbleHESS.h, dbleLU.h, dbleQR.h, dbleQRP.h, dbleSCHUR.h, dbleSVD.h, eigs-base.h, fCmplxAEPBAL.h, fCmplxCHOL.h, fCmplxGEPBAL.h, fCmplxHESS.h, fCmplxLU.h, fCmplxQR.h, fCmplxQRP.h, fCmplxSCHUR.h, fCmplxSVD.h, fEIG.h, floatAEPBAL.h, floatCHOL.h, floatGEPBAL.h, floatHESS.h, floatLU.h, floatQR.h, floatQRP.h, floatSCHUR.h, floatSVD.h, lo-mappers.h, lo-specfun.h, oct-convn.h, oct-fftw.h, oct-norm.h, oct-rand.h, oct-spparms.h, randgamma.h, randmtzig.h, randpoisson.h, sparse-chol.h, sparse-dmsolve.h, sparse-lu.h, sparse-qr.h, Sparse-diag-op-defs.h, Sparse-op-decls.h, Sparse-op-defs.h, Sparse-perm-op-defs.h, mx-base.h, mx-defs.h, mx-ext.h, mx-op-decl.h, mx-op-defs.h, dir-ops.h, file-ops.h, file-stat.h, lo-sysdep.h, mach-info.h, oct-env.h, oct-group.h, oct-openmp.h, oct-passwd.h, oct-syscalls.h, oct-time.h, oct-uname.h, pathlen.h, sysdir.h, syswait.h, action-container.h, base-list.h, byte-swap.h, caseless-str.h, cmd-edit.h, cmd-hist.h, data-conv.h, functor.h, glob-match.h, lo-array-errwarn.h, lo-array-gripes.h, lo-cutils.h, lo-ieee.h, lo-macros.h, lo-math.h, lo-regexp.h, lo-traits.h, lo-utils.h, oct-alloc.h, oct-base64.h, oct-binmap.h, oct-cmplx.h, oct-glob.h, oct-inttypes.h, oct-locbuf.h, oct-mutex.h, oct-refcount.h, oct-rl-edit.h, oct-rl-hist.h, oct-shlib.h, oct-sort.h, oct-sparse.h, pathsearch.h, singleton-cleanup.h, sparse-sort.h, sparse-util.h, statdefs.h, str-vec.h, sun-utils.h, unwind-prot.h, url-transfer.h: Include octave-config.h.

author	John W. Eaton <jwe@octave.org>
date	Wed, 10 Feb 2016 14:25:53 -0500
parents	538b57866b90
children	ae4d7dfea337

rev	line source
746 46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	1 /*
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 18402 diff changeset	3 Copyright (C) 1994-2015 John W. Eaton
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	4 Copyright (C) 2010 VZLU Prague
746 46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	5
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	7
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6959 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6959 diff changeset	11 option) any later version.
746 46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	12
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	16 for more details.
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	17
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6959 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6959 diff changeset	20 <http://www.gnu.org/licenses/>.
746 46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	21
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	22 */
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	23
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 20232 diff changeset	24 #if ! defined (octave_oct_map_h)
746 46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	25 #define octave_oct_map_h 1
46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	26
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	27 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	28
6059 8fd77759707c [project @ 2006-10-18 02:21:22 by jwe] jwe parents: 5925 diff changeset	29 #include <algorithm>
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4200 diff changeset	30 #include <map>
746 46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	31
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4435 diff changeset	32 #include "Cell.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20791 diff changeset	33 #include "ovl.h"
746 46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	34
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1737 diff changeset	35 class string_vector;
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1737 diff changeset	36
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	37 // A class holding a map field->index. Supports reference-counting.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	38 class OCTINTERP_API
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	39 octave_fields
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	40 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	41 class fields_rep : public std::map<std::string, octave_idx_type>
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	42 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	43 public:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	44 fields_rep (void) : std::map<std::string, octave_idx_type> (), count (1) { }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	45 fields_rep (const fields_rep& other)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	46 : std::map<std::string, octave_idx_type> (other), count (1) { }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	47
12125 a21a3875ca83 implement a common class for reference counts Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	48 octave_refcount<int> count;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	49
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	50 private:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	51 fields_rep& operator = (const fields_rep&); // no assignment!
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	52 };
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	53
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	54 fields_rep *rep;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	55
11068 b0eec300d3fc avoid SID in octave_fields Jaroslav Hajek <highegg@gmail.com> parents: 10766 diff changeset	56 static fields_rep *nil_rep (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	57 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	58 static fields_rep nr;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	59 return &nr;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	60 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	61
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	62 public:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	63
11068 b0eec300d3fc avoid SID in octave_fields Jaroslav Hajek <highegg@gmail.com> parents: 10766 diff changeset	64 octave_fields (void) : rep (nil_rep ()) { rep->count++; }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	65 octave_fields (const string_vector&);
10766 f0304c545588 make map constructors from octave_fields public Jaroslav Hajek <highegg@gmail.com> parents: 10764 diff changeset	66 octave_fields (const char * const *);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	67
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	68 ~octave_fields (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	69 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	70 if (--rep->count == 0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	71 delete rep;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	72 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	73
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	74 void make_unique (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	75 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	76 if (rep->count > 1)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	77 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	78 fields_rep r = new fields_rep (rep);
13985 43cc49c7abd1 Use thread-safe atomic reference counting (GCC and MSVC). Michael Goffioul <michael.goffioul@gmail.com> parents: 12155 diff changeset	79
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	80 if (--rep->count == 0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	81 delete rep;
13985 43cc49c7abd1 Use thread-safe atomic reference counting (GCC and MSVC). Michael Goffioul <michael.goffioul@gmail.com> parents: 12155 diff changeset	82
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	83 rep = r;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	84 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	85 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	86
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	87 octave_fields (const octave_fields& o) : rep (o.rep) { rep->count++; }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	88
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	89 octave_fields&
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	90 operator = (const octave_fields& o)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	91 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	92 o.rep->count++;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	93 if (--rep->count == 0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	94 delete rep;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	95 rep = o.rep;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	96
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	97 return *this;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	98 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	99
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	100 // constant iteration support. non-const iteration intentionally unsupported.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	101
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	102 typedef std::map<std::string, octave_idx_type>::const_iterator const_iterator;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	103 typedef const_iterator iterator;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	104
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	105 const_iterator begin (void) const { return rep->begin (); }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	106 const_iterator end (void) const { return rep->end (); }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	107
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	108 std::string key (const_iterator p) const { return p->first; }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	109 octave_idx_type index (const_iterator p) const { return p->second; }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	110
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	111 const_iterator seek (const std::string& k) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	112 { return rep->find (k); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	113
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	114 // high-level methods.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	115
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	116 // number of fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	117 octave_idx_type nfields (void) const { return rep->size (); }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	118
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	119 // check whether a field exists.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	120 bool isfield (const std::string& name) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	121
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	122 // get index of field. return -1 if not exist
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	123 octave_idx_type getfield (const std::string& name) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	124 // get index of field. add if not exist
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	125 octave_idx_type getfield (const std::string& name);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	126 // remove field and return the index. -1 if didn't exist.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	127 octave_idx_type rmfield (const std::string& name);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	128
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	129 // order the fields of this map. creates a permutation
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	130 // used to order the fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	131 void orderfields (Array<octave_idx_type>& perm);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	132
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	133 // compares two instances for equality up to order of fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	134 // returns a permutation needed to bring the fields of other
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	135 // into the order of this.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	136 bool equal_up_to_order (const octave_fields& other,
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10757 diff changeset	137 octave_idx_type* perm) const;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10757 diff changeset	138
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10757 diff changeset	139 bool equal_up_to_order (const octave_fields& other,
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	140 Array<octave_idx_type>& perm) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	141
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	142 bool is_same (const octave_fields& other) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	143 { return rep == other.rep; }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	144
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	145 // Returns the fields as a vector of strings.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	146 string_vector fieldnames (void) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	147
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	148 void clear (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	149 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	150 *this = octave_fields ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	151 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	152 };
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	153
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	154
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	155 class OCTINTERP_API
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	156 octave_scalar_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	157 {
10766 f0304c545588 make map constructors from octave_fields public Jaroslav Hajek <highegg@gmail.com> parents: 10764 diff changeset	158 public:
f0304c545588 make map constructors from octave_fields public Jaroslav Hajek <highegg@gmail.com> parents: 10764 diff changeset	159
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	160 octave_scalar_map (const octave_fields& k)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	161 : xkeys (k), xvals (k.nfields ()) { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	162
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	163 octave_scalar_map (void) : xkeys (), xvals () { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	164
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	165 octave_scalar_map (const string_vector& k)
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	166 : xkeys (k), xvals (k.numel ()) { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	167
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	168 octave_scalar_map (const octave_scalar_map& m)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	169 : xkeys (m.xkeys), xvals(m.xvals) { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	170
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	171 octave_scalar_map& operator = (const octave_scalar_map& m)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	172 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	173 xkeys = m.xkeys;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	174 xvals = m.xvals;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	175
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	176 return *this;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	177 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	178
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	179 // iteration support. note that both const and non-const iterators are the
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	180 // same. The const/non-const distinction is made by the key & contents method.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	181 typedef octave_fields::const_iterator const_iterator;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	182 typedef const_iterator iterator;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	183
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	184 const_iterator begin (void) const { return xkeys.begin (); }
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	185 const_iterator end (void) const { return xkeys.end (); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	186
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	187 const_iterator seek (const std::string& k) const { return xkeys.seek (k); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	188
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	189 std::string key (const_iterator p) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	190 { return xkeys.key (p); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	191 octave_idx_type index (const_iterator p) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	192 { return xkeys.index (p); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	193
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	194 const octave_value& contents (const_iterator p) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	195 { return xvals[xkeys.index (p)]; }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	196
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	197 octave_value& contents (iterator p)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	198 { return xvals[xkeys.index (p)]; }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	199
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	200 const octave_value& contents (octave_idx_type i) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	201 { return xvals[i]; }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	202
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	203 octave_value& contents (octave_idx_type i)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	204 { return xvals[i]; }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	205
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	206 // number of fields.
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	207 octave_idx_type nfields (void) const { return xkeys.nfields (); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	208
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	209 // check whether a field exists.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	210 bool isfield (const std::string& name) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	211 { return xkeys.isfield (name); }
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	212
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	213 bool contains (const std::string& name) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	214 { return isfield (name); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	215
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	216 string_vector fieldnames (void) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	217 { return xkeys.fieldnames (); }
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	218
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	219 string_vector keys (void) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	220 { return fieldnames (); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	221
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	222 // get contents of a given field. empty value if not exist.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	223 octave_value getfield (const std::string& key) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	224
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	225 // set contents of a given field. add if not exist.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	226 void setfield (const std::string& key, const octave_value& val);
10761 12dfe91e9fab more bkw compatibility for octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10760 diff changeset	227 void assign (const std::string& k, const octave_value& val)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	228 { setfield (k, val); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	229
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	230 // remove a given field. do nothing if not exist.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	231 void rmfield (const std::string& key);
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	232 void del (const std::string& k) { rmfield (k); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	233
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	234 // return a copy with fields ordered, optionally along with permutation.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	235 octave_scalar_map orderfields (void) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	236 octave_scalar_map orderfields (Array<octave_idx_type>& perm) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	237 octave_scalar_map orderfields (const octave_scalar_map& other,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	238 Array<octave_idx_type>& perm) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	239
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	240 // aka getfield/setfield, but the latter returns a reference.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	241 octave_value contents (const std::string& k) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	242 octave_value& contents (const std::string& k);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	243
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	244 void clear (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	245 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	246 xkeys.clear ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	247 xvals.clear ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	248 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	249
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	250 friend class octave_map;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	251
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	252 private:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	253
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	254 octave_fields xkeys;
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	255 std::vector<octave_value> xvals;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	256
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	257 };
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	258
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	259 template <>
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	260 inline octave_scalar_map
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	261 octave_value_extract<octave_scalar_map> (const octave_value& v)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	262 { return v.scalar_map_value (); }
10757 1cc44f3ec814 templated extractors for maps and cells Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	263
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	264 class OCTINTERP_API
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	265 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	266 {
10766 f0304c545588 make map constructors from octave_fields public Jaroslav Hajek <highegg@gmail.com> parents: 10764 diff changeset	267 public:
f0304c545588 make map constructors from octave_fields public Jaroslav Hajek <highegg@gmail.com> parents: 10764 diff changeset	268
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	269 octave_map (const octave_fields& k)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	270 : xkeys (k), xvals (k.nfields ()), dimensions () { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	271
10753 bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	272 octave_map (const dim_vector& dv, const octave_fields& k)
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	273 : xkeys (k), xvals (k.nfields (), Cell (dv)), dimensions (dv) { }
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	274
10756 d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	275 typedef octave_scalar_map element_type;
d808eb829d48 optimize num2cell on structs Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	276
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	277 octave_map (void) : xkeys (), xvals (), dimensions () { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	278
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	279 octave_map (const dim_vector& dv) : xkeys (), xvals (), dimensions (dv) { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	280
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	281 octave_map (const string_vector& k)
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	282 : xkeys (k), xvals (k.numel (), Cell (1, 1)), dimensions (1, 1) { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	283
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	284 octave_map (const dim_vector& dv, const string_vector& k)
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	285 : xkeys (k), xvals (k.numel (), Cell (dv)), dimensions (dv) { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	286
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	287 octave_map (const octave_map& m)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	288 : xkeys (m.xkeys), xvals (m.xvals), dimensions (m.dimensions) { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	289
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	290 octave_map (const octave_scalar_map& m);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	291
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	292 octave_map& operator = (const octave_map& m)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	293 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	294 xkeys = m.xkeys;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	295 xvals = m.xvals;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	296 dimensions = m.dimensions;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	297
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	298 return *this;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	299 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	300
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	301 // iteration support. note that both const and non-const iterators are the
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	302 // same. The const/non-const distinction is made by the key & contents method.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	303 typedef octave_fields::const_iterator const_iterator;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	304 typedef const_iterator iterator;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	305
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	306 const_iterator begin (void) const { return xkeys.begin (); }
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	307 const_iterator end (void) const { return xkeys.end (); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	308
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	309 const_iterator seek (const std::string& k) const { return xkeys.seek (k); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	310
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	311 std::string key (const_iterator p) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	312 { return xkeys.key (p); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	313 octave_idx_type index (const_iterator p) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	314 { return xkeys.index (p); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	315
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	316 const Cell& contents (const_iterator p) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	317 { return xvals[xkeys.index (p)]; }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	318
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	319 Cell& contents (iterator p)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	320 { return xvals[xkeys.index (p)]; }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	321
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	322 const Cell& contents (octave_idx_type i) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	323 { return xvals[i]; }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	324
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	325 Cell& contents (octave_idx_type i)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	326 { return xvals[i]; }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	327
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	328 // number of fields.
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	329 octave_idx_type nfields (void) const { return xkeys.nfields (); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	330
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	331 // check whether a field exists.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	332 bool isfield (const std::string& name) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	333 { return xkeys.isfield (name); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	334
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	335 bool contains (const std::string& name) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	336 { return isfield (name); }
10743 cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	337
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	338 string_vector fieldnames (void) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	339 { return xkeys.fieldnames (); }
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	340
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	341 string_vector keys (void) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	342 { return fieldnames (); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	343
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	344 // get contents of a given field. empty value if not exist.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	345 Cell getfield (const std::string& key) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	346
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	347 // set contents of a given field. add if not exist. checks for
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	348 // correct dimensions.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	349 void setfield (const std::string& key, const Cell& val);
10761 12dfe91e9fab more bkw compatibility for octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10760 diff changeset	350 void assign (const std::string& k, const Cell& val)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	351 { setfield (k, val); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	352
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	353 // remove a given field. do nothing if not exist.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	354 void rmfield (const std::string& key);
10744 4716e2e17118 fix octave_map::extract_scalar Jaroslav Hajek <highegg@gmail.com> parents: 10743 diff changeset	355 void del (const std::string& k) { rmfield (k); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	356
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	357 // return a copy with fields ordered, optionally along with permutation.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	358 octave_map orderfields (void) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	359 octave_map orderfields (Array<octave_idx_type>& perm) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	360 octave_map orderfields (const octave_map& other,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	361 Array<octave_idx_type>& perm) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	362
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	363 // aka getfield/setfield, but the latter returns a reference.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	364 Cell contents (const std::string& k) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	365 Cell& contents (const std::string& k);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	366
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	367 void clear (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	368 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	369 xkeys.clear ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	370 xvals.clear ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	371 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	372
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	373 // The Array-like methods.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	374 octave_idx_type numel (void) const { return dimensions.numel (); }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	375 octave_idx_type length (void) const { return numel (); }
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10761 diff changeset	376 bool is_empty (void) const { return dimensions.any_zero (); }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	377
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	378 octave_idx_type rows (void) const { return dimensions(0); }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	379 octave_idx_type cols (void) const { return dimensions(1); }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	380 octave_idx_type columns (void) const { return dimensions(1); }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	381
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	382 // Extract a scalar substructure.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	383 octave_scalar_map checkelem (octave_idx_type n) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	384 octave_scalar_map checkelem (octave_idx_type i, octave_idx_type j) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	385
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	386 octave_scalar_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	387 checkelem (const Array<octave_idx_type>& ra_idx) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	388
10755 6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	389 octave_scalar_map operator () (octave_idx_type n) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	390 { return checkelem (n); }
10755 6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	391 octave_scalar_map operator () (octave_idx_type i, octave_idx_type j) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	392 { return checkelem (i, j); }
10755 6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	393
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	394 octave_scalar_map
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	395 operator () (const Array<octave_idx_type>& ra_idx) const
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	396 { return checkelem (ra_idx); }
10755 6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	397
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	398 octave_map squeeze (void) const;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	399
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	400 octave_map permute (const Array<int>& vec, bool inv = false) const;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	401
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	402 dim_vector dims (void) const { return dimensions; }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	403
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	404 int ndims (void) const { return dimensions.length (); }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	405
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	406 octave_map transpose (void) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	407
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	408 octave_map reshape (const dim_vector& dv) const;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	409
10743 cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	410 void resize (const dim_vector& dv, bool fill = false);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	411
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	412 static octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	413 cat (int dim, octave_idx_type n, const octave_scalar_map *map_list);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	414
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	415 static octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	416 cat (int dim, octave_idx_type n, const octave_map *map_list);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	417
10743 cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	418 octave_map index (const idx_vector& i, bool resize_ok = false) const;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	419
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	420 octave_map index (const idx_vector& i, const idx_vector& j,
10743 cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	421 bool resize_ok = false) const;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	422
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	423 octave_map index (const Array<idx_vector>& ia,
10743 cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	424 bool resize_ok = false) const;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	425
10743 cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	426 octave_map index (const octave_value_list&, bool resize_ok = false) const;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	427
10755 6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	428 octave_map column (octave_idx_type k) const;
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	429 octave_map page (octave_idx_type k) const;
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	430
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	431 void assign (const idx_vector& i, const octave_map& rhs);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	432
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	433 void assign (const idx_vector& i, const idx_vector& j, const octave_map& rhs);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	434
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	435 void assign (const Array<idx_vector>& ia, const octave_map& rhs);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	436
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	437 void assign (const octave_value_list&, const octave_map& rhs);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	438
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	439 void assign (const octave_value_list& idx, const std::string& k,
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	440 const Cell& rhs);
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	441
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	442 void delete_elements (const idx_vector& i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	443
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	444 void delete_elements (int dim, const idx_vector& i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	445
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	446 void delete_elements (const Array<idx_vector>& ia);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	447
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	448 void delete_elements (const octave_value_list&);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	449
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	450 octave_map concat (const octave_map& rb,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	451 const Array<octave_idx_type>& ra_idx);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	452
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10757 diff changeset	453 // like checkelem, but no check.
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10757 diff changeset	454 octave_scalar_map fast_elem_extract (octave_idx_type n) const;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10757 diff changeset	455
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10757 diff changeset	456 // element assignment, no bounds check
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10757 diff changeset	457 bool fast_elem_insert (octave_idx_type n, const octave_scalar_map& rhs);
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10757 diff changeset	458
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	459 private:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	460
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	461 octave_fields xkeys;
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	462 std::vector<Cell> xvals;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	463 dim_vector dimensions;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	464
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	465 void optimize_dimensions (void);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	466 void extract_scalar (octave_scalar_map& dest,
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	467 octave_idx_type index) const;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	468 static void do_cat (int dim, octave_idx_type n,
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	469 const octave_scalar_map *map_list, octave_map& retval);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	470 static void do_cat (int dim, octave_idx_type n,
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	471 const octave_map *map_list, octave_map& retval);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	472 };
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10333 diff changeset	473
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 20940 diff changeset	474 template <>
10757 1cc44f3ec814 templated extractors for maps and cells Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	475 inline octave_map octave_value_extract<octave_map> (const octave_value& v)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	476 { return v.map_value (); }
10757 1cc44f3ec814 templated extractors for maps and cells Jaroslav Hajek <highegg@gmail.com> parents: 10756 diff changeset	477
746 46f6f6a4f5c6 [project @ 1994-09-30 15:05:10 by jwe] jwe parents: diff changeset	478 #endif

Mercurial > octave

annotate libinterp/corefcn/oct-map.h @ 21244:1473547f50f5