octave-nkf: src/oct-map.cc annotate

annotate src/oct-map.cc @ 10760:76079e505f9d

optimize cellfun with uniform struct output

author	Jaroslav Hajek <highegg@gmail.com>
date	Thu, 01 Jul 2010 08:51:14 +0200
parents	6ba7937a6fa4
children	b397b8edd8c5

rev	line source
1278 606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	1 /*
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	2
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8682 diff changeset	3 Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004, 2005, 2006, 2007,
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8682 diff changeset	4 2008, 2009 John W. Eaton
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	5 Copyright (C) 2010 VZLU Prague
1278 606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	6
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	8
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	10 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	11 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	12 option) any later version.
1278 606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	13
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	17 for more details.
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	18
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	19 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	20 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	21 <http://www.gnu.org/licenses/>.
1278 606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	22
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	23 */
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	24
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	25 #ifdef HAVE_CONFIG_H
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	26 #include <config.h>
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	27 #endif
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	28
3932 2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	29 #include "error.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	30 #include "str-vec.h"
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	31
1278 606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	32 #include "oct-map.h"
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	33 #include "utils.h"
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	34
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	35 octave_fields::fields_rep octave_fields::nil_rep;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	36
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	37 octave_fields::octave_fields (const string_vector& fields)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	38 : rep (new fields_rep)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	39 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	40 octave_idx_type n = fields.numel ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	41 for (octave_idx_type i = 0; i < n; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	42 (*rep)[fields(i)] = i;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	43 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	44
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	45 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	46 octave_fields::isfield (const std::string& field) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	47 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	48 return rep->find (field) != rep->end ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	49 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	50
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	51 octave_idx_type
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	52 octave_fields::getfield (const std::string& field) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	53 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	54 fields_rep::iterator p = rep->find (field);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	55 return (p != rep->end ()) ? p->second : -1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	56 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	57
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	58 octave_idx_type
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	59 octave_fields::getfield (const std::string& field)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	60 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	61 fields_rep::iterator p = rep->find (field);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	62 if (p != rep->end ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	63 return p->second;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	64 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	65 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	66 make_unique ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	67 octave_idx_type n = rep->size ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	68 return (*rep)[field] = n;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	69 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	70 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	71
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	72 octave_idx_type
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	73 octave_fields::rmfield (const std::string& field)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	74 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	75 fields_rep::iterator p = rep->find (field);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	76 if (p == rep->end ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	77 return -1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	78 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	79 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	80 octave_idx_type n = p->second;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	81 make_unique ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	82 rep->erase (field);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	83 for (fields_rep::iterator q = rep->begin (); q != rep->end (); q++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	84 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	85 if (q->second >= n)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	86 q->second--;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	87 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	88
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	89 return n;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	90 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	91 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	92
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	93 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	94 octave_fields::orderfields (Array<octave_idx_type>& perm)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	95 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	96 octave_idx_type n = rep->size ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	97 perm.clear (n, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	98
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	99 make_unique ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	100 octave_idx_type i = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	101 for (fields_rep::iterator q = rep->begin (); q != rep->end (); q++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	102 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	103 octave_idx_type j = q->second;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	104 q->second = i;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	105 perm(i++) = j;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	106 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	107 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	108
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	109 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	110 octave_fields::equal_up_to_order (const octave_fields& other,
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	111 octave_idx_type* perm) const
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	112 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	113 bool retval = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	114
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	115 octave_idx_type n = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	116
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	117 iterator p = begin (), q = other.begin ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	118 for (; p != end () && q != other.end (); p++, q++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	119 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	120 if (p->first == q->first)
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	121 perm[p->second] = q->second;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	122 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	123 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	124 retval = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	125 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	126 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	127 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	128
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	129 retval = (p == end () && q == other.end ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	130
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	131 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	132 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	133
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	134 bool
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	135 octave_fields::equal_up_to_order (const octave_fields& other,
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	136 Array<octave_idx_type>& perm) const
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	137 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	138 bool retval = true;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	139
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	140 octave_idx_type n = nfields ();
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	141 if (perm.length () != n)
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	142 perm.clear (1, n);
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	143
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	144 return equal_up_to_order (other, perm.fortran_vec ());
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	145 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	146
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	147 string_vector
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	148 octave_fields::fieldnames (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	149 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	150 octave_idx_type n = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	151 string_vector retval(n);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	152
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	153 for (iterator p = begin (); p != end (); p++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	154 retval.xelem(p->second) = p->first;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	155
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	156 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	157 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	158
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	159 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	160 octave_scalar_map::getfield (const std::string& k) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	161 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	162 octave_idx_type idx = xkeys.getfield (k);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	163 return (idx >= 0) ? xvals[idx] : octave_value ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	164 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	165
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	166 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	167 octave_scalar_map::setfield (const std::string& k, const octave_value& val)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	168 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	169 octave_idx_type idx = xkeys.getfield (k);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	170 if (idx < static_cast<octave_idx_type> (xvals.size ()))
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	171 xvals[idx] = val;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	172 else
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	173 xvals.push_back (val);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	174 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	175
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	176 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	177 octave_scalar_map::rmfield (const std::string& k)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	178 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	179 octave_idx_type idx = xkeys.rmfield (k);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	180 if (idx >= 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	181 xvals.erase (xvals.begin () + idx);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	182 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	183
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	184 octave_scalar_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	185 octave_scalar_map::orderfields (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	186 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	187 Array<octave_idx_type> perm;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	188 return orderfields (perm);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	189 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	190
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	191 octave_scalar_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	192 octave_scalar_map::orderfields (Array<octave_idx_type>& perm) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	193 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	194 octave_scalar_map retval (xkeys);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	195 retval.xkeys.orderfields (perm);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	196
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	197 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	198 for (octave_idx_type i = 0; i < nf; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	199 retval.xvals[i] = xvals[perm.xelem(i)];
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	200
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	201 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	202 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	203
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	204 octave_scalar_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	205 octave_scalar_map::orderfields (const octave_scalar_map& other,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	206 Array<octave_idx_type>& perm) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	207 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	208 if (xkeys.is_same (other.xkeys))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	209 return *this;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	210 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	211 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	212 octave_scalar_map retval (other.xkeys);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	213 if (other.xkeys.equal_up_to_order (xkeys, perm))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	214 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	215 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	216 for (octave_idx_type i = 0; i < nf; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	217 retval.xvals[i] = xvals[perm.xelem(i)];
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	218 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	219 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	220 error ("orderfields: structs must have same fields up to order");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	221
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	222 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	223 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	224 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	225
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	226 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	227 octave_scalar_map::contents (const std::string& k) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	228 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	229 return getfield (k);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	230 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	231
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	232 octave_value&
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	233 octave_scalar_map::contents (const std::string& k)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	234 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	235 octave_idx_type idx = xkeys.getfield (k);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	236 if (idx >= static_cast<octave_idx_type> (xvals.size ()))
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	237 xvals.resize (idx);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	238 return xvals[idx];
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	239 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	240
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	241 octave_map::octave_map (const octave_scalar_map& m)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	242 : xkeys (m.xkeys), xvals (), dimensions (1, 1)
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	243 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	244 octave_idx_type nf = m.nfields ();
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	245 xvals.reserve (nf);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	246 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	247 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	248 xvals.push_back (Cell (dimensions));
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	249 xvals[i].xelem(0) = m.xvals[i];
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	250 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	251 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	252
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	253 octave_map::octave_map (const Octave_map& m)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	254 : xkeys (m.keys ()), xvals (m.nfields ()), dimensions (m.dims ())
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	255 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	256 for (iterator p = begin (); p != end (); p++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	257 contents(p) = m.contents (key (p));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	258
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	259 optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	260 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	261
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	262 Cell
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	263 octave_map::getfield (const std::string& k) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	264 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	265 octave_idx_type idx = xkeys.getfield (k);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	266 return (idx >= 0) ? xvals[idx] : Cell ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	267 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	268
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	269 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	270 octave_map::setfield (const std::string& k, const Cell& val)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	271 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	272 if (nfields () == 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	273 dimensions = val.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	274
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	275 if (val.dims () == dimensions)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	276 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	277 octave_idx_type idx = xkeys.getfield (k);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	278 if (idx < static_cast<octave_idx_type> (xvals.size ()))
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	279 xvals[idx] = val;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	280 else
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	281 xvals.push_back (val);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	282 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	283 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	284 error ("octave_map::setfield: internal error");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	285 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	286
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	287 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	288 octave_map::rmfield (const std::string& k)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	289 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	290 octave_idx_type idx = xkeys.rmfield (k);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	291 if (idx >= 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	292 xvals.erase (xvals.begin () + idx);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	293 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	294
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	295 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	296 octave_map::orderfields (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	297 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	298 Array<octave_idx_type> perm;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	299 return orderfields (perm);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	300 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	301
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	302 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	303 octave_map::orderfields (Array<octave_idx_type>& perm) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	304 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	305 octave_map retval (xkeys);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	306 retval.xkeys.orderfields (perm);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	307
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	308 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	309 for (octave_idx_type i = 0; i < nf; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	310 retval.xvals[i] = xvals[perm.xelem(i)];
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	311
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	312 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	313 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	314
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	315 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	316 octave_map::orderfields (const octave_map& other,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	317 Array<octave_idx_type>& perm) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	318 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	319 if (xkeys.is_same (other.xkeys))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	320 return *this;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	321 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	322 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	323 octave_map retval (other.xkeys);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	324 if (other.xkeys.equal_up_to_order (xkeys, perm))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	325 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	326 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	327 for (octave_idx_type i = 0; i < nf; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	328 retval.xvals[i] = xvals[perm.xelem(i)];
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	329 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	330 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	331 error ("orderfields: structs must have same fields up to order");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	332
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	333 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	334 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	335 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	336
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	337 Cell
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	338 octave_map::contents (const std::string& k) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	339 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	340 return getfield (k);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	341 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	342
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	343 Cell&
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	344 octave_map::contents (const std::string& k)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	345 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	346 octave_idx_type idx = xkeys.getfield (k);
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	347 if (idx >= static_cast<octave_idx_type> (xvals.size ()))
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	348 xvals.push_back (Cell (dimensions)); // auto-set correct dims.
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	349 return xvals[idx];
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	350 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	351
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	352 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	353 octave_map::extract_scalar (octave_scalar_map& dest,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	354 octave_idx_type idx) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	355 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	356 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	357 for (octave_idx_type i = 0; i < nf; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	358 dest.xvals[i] = xvals[i](idx);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	359 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	360
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	361 octave_scalar_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	362 octave_map::checkelem (octave_idx_type n) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	363 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	364 octave_scalar_map retval (xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	365
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	366 // Optimize this so that there is just one check.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	367 extract_scalar (retval, compute_index (n, dimensions));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	368
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	369 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	370 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	371
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	372 octave_scalar_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	373 octave_map::checkelem (octave_idx_type i, octave_idx_type j) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	374 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	375 octave_scalar_map retval (xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	376
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	377 // Optimize this so that there is just one check.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	378 extract_scalar (retval, compute_index (i, j, dimensions));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	379
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	380 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	381 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	382
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	383 octave_scalar_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	384 octave_map::checkelem (const Array<octave_idx_type>& ra_idx) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	385 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	386 octave_scalar_map retval (xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	387
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	388 // Optimize this so that there is just one check.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	389 extract_scalar (retval, compute_index (ra_idx, dimensions));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	390
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	391 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	392 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	393
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	394 octave_scalar_map
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	395 octave_map::fast_elem_extract (octave_idx_type n) const
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	396 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	397 octave_scalar_map retval (xkeys);
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	398
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	399 extract_scalar (retval, n);
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	400
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	401 return retval;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	402 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	403
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	404 bool
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	405 octave_map::fast_elem_insert (octave_idx_type n,
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	406 const octave_scalar_map& rhs)
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	407 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	408 bool retval = false;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	409
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	410 octave_idx_type nf = nfields ();
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	411 if (rhs.xkeys.is_same (xkeys))
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	412 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	413 for (octave_idx_type i = 0; i < nf; i++)
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	414 xvals[i](n) = rhs.xvals[i];
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	415
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	416 retval = true;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	417 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	418 else
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	419 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	420 OCTAVE_LOCAL_BUFFER (octave_idx_type, perm, nf);
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	421 if (xkeys.equal_up_to_order (rhs.xkeys, perm))
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	422 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	423 for (octave_idx_type i = 0; i < nf; i++)
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	424 xvals[i](n) = rhs.xvals[perm[i]];
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	425
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	426 retval = true;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	427 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	428 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	429
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	430 return retval;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	431 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10755 diff changeset	432
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	433 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	434 octave_map::squeeze (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	435 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	436 octave_map retval (*this);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	437 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	438
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	439 retval.dimensions = dimensions.squeeze ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	440
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	441 for (octave_idx_type i = 0; i < nf; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	442 retval.xvals[i] = xvals[i].squeeze ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	443
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	444 retval.optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	445
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	446 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	447 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	448
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	449 /*
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	450 %!# test preservation of xkeys by squeeze
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	451 %!test
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	452 %! x(1,1,1,1).d = 10; x(3,5,1,7).a = "b"; x(2,4,1,7).f = 27;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	453 %! assert (fieldnames (squeeze (x)), {"d"; "a"; "f"});
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	454 */
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	455
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	456 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	457 octave_map::permute (const Array<int>& vec, bool inv) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	458 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	459 octave_map retval (xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	460 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	461
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	462 for (octave_idx_type i = 0; i < nf; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	463 retval.xvals[i] = xvals[i].permute (vec, inv);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	464
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	465 // FIXME:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	466 // There is no dim_vector::permute for technical reasons.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	467 // We pick the dim vector from results if possible, otherwise use a dummy
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	468 // array to get it. Need (?) a better solution to this problem.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	469 if (nf > 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	470 retval.dimensions = retval.xvals[0].dims ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	471 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	472 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	473 Array<char> dummy (dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	474 dummy = dummy.permute (vec, inv);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	475 retval.dimensions = dummy.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	476 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	477
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	478 retval.optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	479
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	480 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	481 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	482
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	483 /*
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	484 %!# test preservation of key order by permute
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	485 %!test
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	486 %! x(1,1,1,1).d = 10; x(3,5,1,7).a = "b"; x(2,4,1,7).f = 27;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	487 %! assert (fieldnames (permute (x, [3, 4, 1, 2])), {"d"; "a"; "f"});
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	488 */
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	489
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	490 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	491 octave_map::transpose (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	492 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	493 assert (ndims () == 2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	494
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	495 octave_map retval (xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	496
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	497 retval.dimensions = dim_vector (dimensions (1), dimensions (0));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	498
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	499 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	500 for (octave_idx_type i = 0; i < nf; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	501 retval.xvals[i] = xvals[i].transpose ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	502
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	503 retval.optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	504
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	505 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	506 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	507
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	508 /*
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	509 %!# test preservation of key order by transpose
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	510 %!test
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	511 %! x(1,1).d = 10; x(3,5).a = "b"; x(2,4).f = 27;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	512 %! assert (fieldnames (transpose (x)), {"d"; "a"; "f"});
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	513 %! assert (fieldnames (x'), {"d"; "a"; "f"});
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	514 %! assert (fieldnames (x.'), {"d"; "a"; "f"});
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	515 */
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	516
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	517 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	518 octave_map::reshape (const dim_vector& dv) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	519 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	520 octave_map retval (xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	521 retval.dimensions = dv;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	522
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	523 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	524 if (nf > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	525 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	526 retval.xvals.reserve (nf);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	527 for (octave_idx_type i = 0; i < nf; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	528 retval.xvals[i] = xvals[i].reshape (dv);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	529 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	530 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	531 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	532 // FIXME: Do it with a dummy array, to reuse error message.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	533 // Need (?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	534 Array<char> dummy (dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	535 dummy.reshape (dv);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	536 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	537
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	538 retval.optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	539
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	540 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	541 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	542
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	543 /*
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	544 %!# test preservation of key order by reshape
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	545 %!test
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	546 %! x(1,1).d = 10; x(4,6).a = "b"; x(2,4).f = 27;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	547 %! assert (fieldnames (reshape (x, 3, 8)), {"d"; "a"; "f"});
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	548 */
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	549
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	550 void
10743 cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	551 octave_map::resize (const dim_vector& dv, bool fill)
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	552 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	553 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	554 if (nf > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	555 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	556 for (octave_idx_type i = 0; i < nf; i++)
10743 cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	557 {
cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	558 if (fill)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	559 xvals[i].resize (dv, Cell::resize_fill_value ());
10743 cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	560 else
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	561 xvals[i].resize (dv);
10743 cb3ed842bd30 make the new interface more backward compatible Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	562 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	563 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	564 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	565 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	566 // FIXME: Do it with a dummy array, to reuse error message.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	567 // Need (?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	568 Array<char> dummy (dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	569 dummy.resize (dv);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	570 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	571
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	572 dimensions = dv;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	573 optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	574 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	575
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	576 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	577 octave_map::do_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: 10649 diff changeset	578 octave_map& retval)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	579 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	580 octave_idx_type nf = retval.nfields ();
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	581 retval.xvals.reserve (nf);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	582
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	583 dim_vector& rd = retval.dimensions;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	584 rd.resize (dim+1, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	585 rd(0) = rd(1) = 1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	586 rd(dim) = n;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	587
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	588 for (octave_idx_type j = 0; j < nf; j++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	589 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	590 retval.xvals.push_back (Cell (rd));
93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	591 assert (retval.xvals[j].numel () == n);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	592 for (octave_idx_type i = 0; i < n; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	593 retval.xvals[j].xelem(i) = map_list[i].xvals[j];
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	594 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	595 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	596
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	597 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	598 octave_map::do_cat (int dim, octave_idx_type n, const octave_map *map_list,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	599 octave_map& retval)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	600 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	601 octave_idx_type nf = retval.nfields ();
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	602 retval.xvals.reserve (nf);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	603
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	604 OCTAVE_LOCAL_BUFFER (Array<octave_value>, field_list, n);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	605
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	606 for (octave_idx_type j = 0; j < nf; j++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	607 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	608 for (octave_idx_type i = 0; i < n; i++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	609 field_list[i] = map_list[i].xvals[j];
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	610
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	611 retval.xvals.push_back (Array<octave_value>::cat (dim, n, field_list));
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	612 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	613 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	614
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	615 template <class map>
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	616 static void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	617 permute_to_correct_order (octave_idx_type n, octave_idx_type nf,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	618 const map map_list, map new_map_list)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	619 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	620 new_map_list[0] = map_list[0];
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	621
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	622 Array<octave_idx_type> perm (1, nf);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	623
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	624 for (octave_idx_type i = 1; i < n; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	625 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	626 new_map_list[i] = map_list[i].orderfields (map_list[0], perm);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	627
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	628 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	629 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	630 // Use liboctave exception to be consistent.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	631 (*current_liboctave_error_handler)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	632 ("cat: field names mismatch in concatenating structs");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	633 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	634 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	635 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	636 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	637
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	638
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	639 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	640 octave_map::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: 10649 diff changeset	641 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	642 octave_map retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	643 if (n > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	644 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	645 retval.xkeys = map_list[0].xkeys;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	646 octave_idx_type nf = map_list[0].nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	647 if (nf > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	648 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	649 // Try the fast case.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	650 bool all_same = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	651 for (octave_idx_type i = 1; i < n; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	652 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	653 all_same = map_list[0].xkeys.is_same (map_list[i].xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	654 if (! all_same)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	655 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	656 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	657
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	658 if (all_same)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	659 do_cat (dim, n, map_list, retval);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	660 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	661 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	662 // permute all structures to common order.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	663 OCTAVE_LOCAL_BUFFER (octave_scalar_map, new_map_list, n);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	664
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	665 permute_to_correct_order (n, nf, map_list, new_map_list);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	666
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	667 do_cat (dim, n, new_map_list, retval);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	668 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	669
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	670 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	671 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	672 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	673 dim_vector& rd = retval.dimensions;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	674 rd.resize (dim+1, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	675 rd(0) = rd(1) = 1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	676 rd(dim) = n;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	677 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	678
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	679 retval.optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	680 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	681
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	682 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	683 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	684
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	685 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	686 octave_map::cat (int dim, octave_idx_type n, const octave_map *map_list)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	687 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	688 octave_map retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	689 if (n > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	690 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	691 retval.xkeys = map_list[0].xkeys;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	692 octave_idx_type nf = map_list[0].nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	693
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	694 // Try the fast case.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	695 bool all_same = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	696 for (octave_idx_type i = 1; i < n; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	697 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	698 all_same = map_list[0].xkeys.is_same (map_list[i].xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	699 if (! all_same)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	700 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	701 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	702
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	703 if (all_same)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	704 do_cat (dim, n, map_list, retval);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	705 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	706 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	707 // permute all structures to correct order.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	708 OCTAVE_LOCAL_BUFFER (octave_map, new_map_list, n);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	709
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	710 permute_to_correct_order (n, nf, map_list, new_map_list);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	711
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	712 if (nf > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	713 do_cat (dim, n, new_map_list, retval);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	714 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	715 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	716 // Use dummy arrays. FIXME: Need(?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	717 OCTAVE_LOCAL_BUFFER (Array<char>, dummy, n);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	718 for (octave_idx_type i = 0; i < n; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	719 dummy[i].clear (map_list[0].dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	720 Array<char>::cat (dim, n, dummy);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	721 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	722 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	723
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	724 retval.optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	725 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	726
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	727 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	728 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	729
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	730 /*
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	731 %!# test preservation of key order by concatenation
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	732 %!test
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	733 %! x(1, 1).d = 10; x(4, 6).a = "b"; x(2, 4).f = 27;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	734 %! y(1, 6).f = 11; y(1, 6).a = "c"; y(1, 6).d = 33;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	735 %! assert (fieldnames ([x; y]), {"d"; "a"; "f"});
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	736 */
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	737
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	738 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	739 octave_map::index (const idx_vector& i, bool resize_ok) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	740 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	741 octave_map retval (xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	742 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	743
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	744 for (octave_idx_type k = 0; k < nf; k++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	745 retval.xvals[k] = xvals[k].index (i, resize_ok);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	746
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	747 if (nf > 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	748 retval.dimensions = retval.xvals[0].dims ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	749 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	750 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	751 // Use dummy array. FIXME: Need(?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	752 Array<char> dummy (dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	753 dummy = dummy.index (i, resize_ok);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	754 retval.dimensions = dummy.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	755 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	756
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	757 retval.optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	758
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	759 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	760 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	761
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	762 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	763 octave_map::index (const idx_vector& i, const idx_vector& j,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	764 bool resize_ok) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	765 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	766 octave_map retval (xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	767 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	768
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	769 for (octave_idx_type k = 0; k < nf; k++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	770 retval.xvals[k] = xvals[k].index (i, j, resize_ok);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	771
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	772 if (nf > 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	773 retval.dimensions = retval.xvals[0].dims ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	774 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	775 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	776 // Use dummy array. FIXME: Need(?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	777 Array<char> dummy (dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	778 dummy = dummy.index (i, j, resize_ok);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	779 retval.dimensions = dummy.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	780 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	781
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	782 retval.optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	783
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	784 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	785 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	786
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	787 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	788 octave_map::index (const Array<idx_vector>& ia, bool resize_ok) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	789 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	790 octave_map retval (xkeys);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	791 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	792
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	793 for (octave_idx_type k = 0; k < nf; k++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	794 retval.xvals[k] = xvals[k].index (ia, resize_ok);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	795
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	796 if (nf > 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	797 retval.dimensions = retval.xvals[0].dims ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	798 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	799 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	800 // Use dummy array. FIXME: Need(?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	801 Array<char> dummy (dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	802 dummy = dummy.index (ia, resize_ok);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	803 retval.dimensions = dummy.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	804 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	805
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	806 retval.optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	807
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	808 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	809 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	810
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	811 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	812 octave_map::index (const octave_value_list& idx, bool resize_ok) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	813 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	814 octave_idx_type n_idx = idx.length ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	815 octave_map retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	816
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	817 switch (n_idx)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	818 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	819 case 1:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	820 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	821 idx_vector i = idx(0).index_vector ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	822
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	823 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	824 retval = index (i, resize_ok);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	825 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	826 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	827
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	828 case 2:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	829 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	830 idx_vector i = idx(0).index_vector ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	831
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	832 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	833 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	834 idx_vector j = idx(1).index_vector ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	835
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	836 retval = index (i, j, resize_ok);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	837 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	838 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	839 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	840
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	841 default:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	842 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	843 Array<idx_vector> ia (n_idx, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	844
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	845 for (octave_idx_type i = 0; i < n_idx; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	846 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	847 ia(i) = idx(i).index_vector ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	848
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	849 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	850 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	851 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	852
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	853 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	854 retval = index (ia, resize_ok);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	855 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	856 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	857 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	858
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	859 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	860 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	861
10755 6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	862 // Perhaps one day these will be optimized. Right now, they just call index.
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	863 octave_map
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	864 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	865 {
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	866 return index (idx_vector::colon, k);
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	867 }
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	868
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	869 octave_map
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	870 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	871 {
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	872 static Array<idx_vector> ia (3, 1, idx_vector::colon);
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	873
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	874 ia(2) = k;
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	875 return index (ia);
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	876 }
6ba7937a6fa4 more array-like methods in octave_map Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	877
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	878 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	879 octave_map::assign (const idx_vector& i, const octave_map& rhs)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	880 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	881 if (rhs.xkeys.is_same (xkeys))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	882 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	883 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	884
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	885 for (octave_idx_type k = 0; k < nf; k++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	886 xvals[k].assign (i, rhs.xvals[k]);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	887
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	888 if (nf > 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	889 dimensions = xvals[0].dims ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	890 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	891 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	892 // Use dummy array. FIXME: Need(?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	893 Array<char> dummy (dimensions), rhs_dummy (rhs.dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	894 dummy.assign (i, rhs_dummy);;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	895 dimensions = dummy.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	896 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	897
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	898 optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	899 }
10753 bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	900 else if (nfields () == 0)
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	901 {
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	902 octave_map tmp (dimensions, rhs.xkeys);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	903 tmp.assign (i, rhs);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	904 *this = tmp;
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	905 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	906 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	907 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	908 Array<octave_idx_type> perm;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	909 octave_map rhs1 = rhs.orderfields (*this, perm);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	910 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	911 {
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	912 assert (rhs1.xkeys.is_same (xkeys));
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	913 assign (i, rhs1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	914 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	915 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	916 error ("incompatible fields in struct assignment");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	917 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	918 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	919
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	920 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	921 octave_map::assign (const idx_vector& i, const idx_vector& j,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	922 const octave_map& rhs)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	923 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	924 if (rhs.xkeys.is_same (xkeys))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	925 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	926 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	927
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	928 for (octave_idx_type k = 0; k < nf; k++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	929 xvals[k].assign (i, j, rhs.xvals[k]);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	930
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	931 if (nf > 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	932 dimensions = xvals[0].dims ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	933 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	934 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	935 // Use dummy array. FIXME: Need(?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	936 Array<char> dummy (dimensions), rhs_dummy (rhs.dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	937 dummy.assign (i, j, rhs_dummy);;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	938 dimensions = dummy.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	939 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	940
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	941 optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	942 }
10753 bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	943 else if (nfields () == 0)
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	944 {
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	945 octave_map tmp (dimensions, rhs.xkeys);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	946 tmp.assign (i, j, rhs);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	947 *this = tmp;
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	948 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	949 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	950 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	951 Array<octave_idx_type> perm;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	952 octave_map rhs1 = rhs.orderfields (*this, perm);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	953 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	954 {
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	955 assert (rhs1.xkeys.is_same (xkeys));
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	956 assign (i, j, rhs1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	957 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	958 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	959 error ("incompatible fields in struct assignment");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	960 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	961 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	962
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	963 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	964 octave_map::assign (const Array<idx_vector>& ia,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	965 const octave_map& rhs)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	966 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	967 if (rhs.xkeys.is_same (xkeys))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	968 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	969 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	970
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	971 for (octave_idx_type k = 0; k < nf; k++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	972 xvals[k].assign (ia, rhs.xvals[k]);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	973
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	974 if (nf > 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	975 dimensions = xvals[0].dims ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	976 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	977 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	978 // Use dummy array. FIXME: Need(?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	979 Array<char> dummy (dimensions), rhs_dummy (rhs.dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	980 dummy.assign (ia, rhs_dummy);;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	981 dimensions = dummy.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	982 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	983
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	984 optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	985 }
10753 bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	986 else if (nfields () == 0)
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	987 {
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	988 octave_map tmp (dimensions, rhs.xkeys);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	989 tmp.assign (ia, rhs);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	990 *this = tmp;
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10750 diff changeset	991 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	992 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	993 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	994 Array<octave_idx_type> perm;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	995 octave_map rhs1 = rhs.orderfields (*this, perm);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	996 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	997 {
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	998 assert (rhs1.xkeys.is_same (xkeys));
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	999 assign (ia, rhs1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1000 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1001 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1002 error ("incompatible fields in struct assignment");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1003 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1004 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1005
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1006 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1007 octave_map::assign (const octave_value_list& idx, const octave_map& rhs)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1008 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1009 octave_idx_type n_idx = idx.length ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1010
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1011 switch (n_idx)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1012 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1013 case 1:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1014 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1015 idx_vector i = idx(0).index_vector ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1016
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1017 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1018 assign (i, rhs);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1019 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1020 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1021
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1022 case 2:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1023 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1024 idx_vector i = idx(0).index_vector ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1025
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1026 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1027 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1028 idx_vector j = idx(1).index_vector ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1029
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1030 assign (i, j, rhs);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1031 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1032 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1033 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1034
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1035 default:
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1036 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1037 Array<idx_vector> ia (n_idx, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1038
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1039 for (octave_idx_type i = 0; i < n_idx; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1040 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1041 ia(i) = idx(i).index_vector ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1042
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1043 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1044 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1045 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1046
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1047 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1048 assign (ia, rhs);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1049 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1050 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1051 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1052 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1053
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1054 void
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1055 octave_map::assign (const octave_value_list& idx, const std::string& k,
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1056 const Cell& rhs)
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1057 {
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1058 Cell tmp;
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1059 iterator p = seek (k);
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1060 Cell& ref = p != end () ? contents (p) : tmp;
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1061
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1062 if (&ref == &tmp)
10750 f75e827649a5 struct rewrite: 4 failures remaining Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	1063 ref = Cell (dimensions);
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1064
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1065 ref.assign (idx, rhs);
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1066
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1067 if (! error_state && ref.dims () != dimensions)
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1068 {
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1069 dimensions = ref.dims ();
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1070
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1071 octave_idx_type nf = nfields ();
10750 f75e827649a5 struct rewrite: 4 failures remaining Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	1072 for (octave_idx_type i = 0; i < nf; i++)
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1073 {
10750 f75e827649a5 struct rewrite: 4 failures remaining Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	1074 if (&xvals[i] != &ref)
f75e827649a5 struct rewrite: 4 failures remaining Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	1075 xvals[i].resize (dimensions, Cell::resize_fill_value ());
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1076 }
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1077
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1078 optimize_dimensions ();
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1079 }
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1080
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1081 if (! error_state && &ref == &tmp)
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1082 setfield (k, tmp);
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1083 }
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1084
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10746 diff changeset	1085 void
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1086 octave_map::delete_elements (const idx_vector& i)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1087 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1088 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1089 for (octave_idx_type k = 0; k < nf; k++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	1090 xvals[k].delete_elements (i);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1091
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1092 if (nf > 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	1093 dimensions = xvals[0].dims ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1094 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1095 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1096 // Use dummy array. FIXME: Need(?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1097 Array<char> dummy (dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1098 dummy.delete_elements (i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1099 dimensions = dummy.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1100 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1101
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1102 optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1103 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1104
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1105 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1106 octave_map::delete_elements (int dim, const idx_vector& i)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1107 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1108 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1109 for (octave_idx_type k = 0; k < nf; k++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	1110 xvals[k].delete_elements (dim, i);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1111
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1112 if (nf > 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	1113 dimensions = xvals[0].dims ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1114 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1115 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1116 // Use dummy array. FIXME: Need(?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1117 Array<char> dummy (dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1118 dummy.delete_elements (dim, i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1119 dimensions = dummy.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1120 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1121
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1122 optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1123 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1124
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1125 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1126 octave_map::delete_elements (const Array<idx_vector>& ia)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1127 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1128 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1129 for (octave_idx_type k = 0; k < nf; k++)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	1130 xvals[k].delete_elements (ia);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1131
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1132 if (nf > 0)
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	1133 dimensions = xvals[0].dims ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1134 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1135 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1136 // Use dummy array. FIXME: Need(?) a better solution.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1137 Array<char> dummy (dimensions);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1138 dummy.delete_elements (ia);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1139 dimensions = dummy.dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1140 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1141
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1142 optimize_dimensions ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1143 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1144
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1145 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1146 octave_map::delete_elements (const octave_value_list& idx)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1147 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1148 octave_idx_type n_idx = idx.length ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1149
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1150 Array<idx_vector> ia (n_idx, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1151
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1152 for (octave_idx_type i = 0; i < n_idx; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1153 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1154 ia(i) = idx(i).index_vector ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1155
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1156 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1157 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1158 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1159
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1160 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1161 delete_elements (ia);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1162 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1163
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1164 /*
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1165 %!# test preservation of key order by indexing
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1166 %!test
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1167 %! x(1, 1).d = 10; x(4, 6).a = "b"; x(2, 4).f = 27;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1168 %! assert (fieldnames (x([1, 2], [2:5])), {"d"; "a"; "f"});
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1169 */
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1170
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1171 octave_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1172 octave_map::concat (const octave_map& rb, const Array<octave_idx_type>& ra_idx)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1173 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1174 if (nfields () == rb.nfields ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1175 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1176 for (const_iterator pa = begin (); pa != end (); pa++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1177 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1178 const_iterator pb = rb.seek (key(pa));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1179
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1180 if (pb == rb.end ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1181 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1182 error ("field name mismatch in structure concatenation");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1183 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1184 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1185
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1186 contents(pa).insert (rb.contents(pb), ra_idx);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1187 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1188 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1189 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1190 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1191 dim_vector dv = dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1192
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1193 if (dv.all_zero ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1194 *this = rb;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1195 else if (! rb.dims ().all_zero ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1196 error ("invalid structure concatenation");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1197 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1198
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1199 return *this;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1200 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1201
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1202 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1203 octave_map::optimize_dimensions (void)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1204 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1205 octave_idx_type nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1206
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1207 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1208 {
10746 93422177b697 more octave_map compatibility Jaroslav Hajek <highegg@gmail.com> parents: 10744 diff changeset	1209 if (! xvals[i].optimize_dimensions (dimensions))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1210 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1211 error ("internal error: dimension mismatch across fields in struct");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1212 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1213 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1214 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1215
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1216 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1217
6959 47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe] jwe parents: 6946 diff changeset	1218 Octave_map::Octave_map (const dim_vector& dv, const Cell& key_vals)
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1219 : map (), key_list (), dimensions (dv)
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1220 {
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1221 Cell c (dv);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1222
6959 47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe] jwe parents: 6946 diff changeset	1223 if (key_vals.is_cellstr ())
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1224 {
6959 47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe] jwe parents: 6946 diff changeset	1225 for (octave_idx_type i = 0; i < key_vals.numel (); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1226 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1227 std::string k = key_vals(i).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1228 map[k] = c;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1229 key_list.push_back (k);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1230 }
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1231 }
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6639 diff changeset	1232 else
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6639 diff changeset	1233 error ("Octave_map: expecting keys to be cellstr");
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1234 }
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1235
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1236 Octave_map::Octave_map (const octave_map& m)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1237 : map (), key_list (), dimensions (m.dims ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1238 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1239 for (octave_map::const_iterator p = m.begin (); p != m.end (); p++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1240 map[m.key (p)] = m.contents (p);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1241 const string_vector mkeys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1242 for (octave_idx_type i = 0; i < mkeys.numel (); i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1243 key_list.push_back (mkeys(i));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1244 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10649 diff changeset	1245
7046 fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1246 Octave_map
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1247 Octave_map::squeeze (void) const
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1248 {
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1249 Octave_map retval (dims ().squeeze ());
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1250
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1251 for (const_iterator pa = begin (); pa != end (); pa++)
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1252 {
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1253 Cell tmp = contents (pa).squeeze ();
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1254
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1255 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1256 break;
7046 fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1257
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1258 retval.assign (key (pa), tmp);
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1259 }
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1260
9379 d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1261 // Preserve order of keys.
d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1262 retval.key_list = key_list;
d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1263
7046 fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1264 return retval;
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1265 }
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1266
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1267 Octave_map
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1268 Octave_map::permute (const Array<int>& vec, bool inv) const
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1269 {
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1270 Octave_map retval (dims ());
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1271
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1272 for (const_iterator pa = begin (); pa != end (); pa++)
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1273 {
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1274 Cell tmp = contents (pa).permute (vec, inv);
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1275
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1276 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1277 break;
7046 fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1278
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1279 retval.assign (key (pa), tmp);
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1280 }
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1281
9379 d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1282 // Preserve order of keys.
d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1283 retval.key_list = key_list;
d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1284
7046 fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1285 return retval;
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1286 }
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1287
5328 322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe] jwe parents: 5307 diff changeset	1288 Cell&
322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe] jwe parents: 5307 diff changeset	1289 Octave_map::contents (const std::string& k)
322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe] jwe parents: 5307 diff changeset	1290 {
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1291 maybe_add_to_key_list (k);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1292
5328 322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe] jwe parents: 5307 diff changeset	1293 return map[k];
322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe] jwe parents: 5307 diff changeset	1294 }
322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe] jwe parents: 5307 diff changeset	1295
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4219 diff changeset	1296 Cell
4675 f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1297 Octave_map::contents (const std::string& k) const
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1298 {
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4567 diff changeset	1299 const_iterator p = seek (k);
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1300
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4219 diff changeset	1301 return p != end () ? p->second : Cell ();
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1302 }
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1303
5156 7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1304 int
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1305 Octave_map::intfield (const std::string& k, int def_val) const
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1306 {
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1307 int retval = def_val;
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1308
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1309 Cell c = contents (k);
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1310
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1311 if (! c.is_empty ())
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1312 retval = c(0).int_value ();
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1313
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1314 return retval;
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1315 }
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1316
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1317 std::string
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1318 Octave_map::stringfield (const std::string& k,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1319 const std::string& def_val) const
5156 7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1320 {
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1321 std::string retval = def_val;
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1322
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1323 Cell c = contents (k);
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1324
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1325 if (! c.is_empty ())
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1326 retval = c(0).string_value ();
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1327
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1328 return retval;
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1329 }
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe] jwe parents: 5105 diff changeset	1330
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	1331 string_vector
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1332 Octave_map::keys (void) const
1278 606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	1333 {
6639 ed74670db09b [project @ 2007-05-21 19:47:22 by jwe] jwe parents: 6609 diff changeset	1334 assert (nfields () == key_list.size ());
5881 70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe] jwe parents: 5880 diff changeset	1335
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1336 return string_vector (key_list);
1278 606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	1337 }
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe] jwe parents: diff changeset	1338
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1339 Octave_map
5571 9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1340 Octave_map::transpose (void) const
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1341 {
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1342 assert (ndims () == 2);
5593 edaf21425386 [project @ 2006-01-12 20:57:27 by jwe] jwe parents: 5592 diff changeset	1343
5571 9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1344 dim_vector dv = dims ();
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1345
5593 edaf21425386 [project @ 2006-01-12 20:57:27 by jwe] jwe parents: 5592 diff changeset	1346 octave_idx_type nr = dv(0);
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe] jwe parents: 5592 diff changeset	1347 octave_idx_type nc = dv(1);
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe] jwe parents: 5592 diff changeset	1348
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe] jwe parents: 5592 diff changeset	1349 dim_vector new_dims (nc, nr);
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe] jwe parents: 5592 diff changeset	1350
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe] jwe parents: 5592 diff changeset	1351 Octave_map retval (new_dims);
5571 9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1352
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1353 for (const_iterator p = begin (); p != end (); p++)
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1354 retval.assign (key(p), Cell (contents(p).transpose ()));
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1355
9379 d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1356 // Preserve order of keys.
d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1357 retval.key_list = key_list;
d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1358
5571 9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1359 return retval;
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1360 }
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1361
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe] jwe parents: 5539 diff changeset	1362 Octave_map
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1363 Octave_map::reshape (const dim_vector& new_dims) const
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1364 {
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1365 Octave_map retval;
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1366
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1367 if (new_dims != dims ())
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1368 {
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1369 for (const_iterator p = begin (); p != end (); p++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1370 retval.assign (key(p), contents(p).reshape (new_dims));
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1371
4936 e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1372 retval.dimensions = new_dims;
9379 d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1373
d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1374 // Preserve order of keys.
d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1375 retval.key_list = key_list;
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1376 }
4936 e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1377 else
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1378 retval = *this;
4567 fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1379
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1380 return retval;
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1381 }
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe] jwe parents: 4563 diff changeset	1382
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5731 diff changeset	1383 void
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5731 diff changeset	1384 Octave_map::resize (const dim_vector& dv, bool fill)
4936 e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1385 {
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1386 if (dv != dims ())
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1387 {
6639 ed74670db09b [project @ 2007-05-21 19:47:22 by jwe] jwe parents: 6609 diff changeset	1388 if (nfields () == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1389 dimensions = dv;
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1390 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1391 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1392 for (const_iterator p = begin (); p != end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1393 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1394 Cell tmp = contents(p);
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5731 diff changeset	1395
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1396 if (fill)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1397 tmp.resize (dv, Cell::resize_fill_value ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1398 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1399 tmp.resize (dv);
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5731 diff changeset	1400
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1401 dimensions = dv;
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5731 diff changeset	1402
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1403 assign (key(p), tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1404 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1405 }
4936 e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1406 }
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1407 }
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1408
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	1409 Octave_map
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5156 diff changeset	1410 Octave_map::concat (const Octave_map& rb, const Array<octave_idx_type>& ra_idx)
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4730 diff changeset	1411 {
4937 4cf211c83158 [project @ 2004-08-06 16:21:20 by jwe] jwe parents: 4936 diff changeset	1412 Octave_map retval;
4936 e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1413
6639 ed74670db09b [project @ 2007-05-21 19:47:22 by jwe] jwe parents: 6609 diff changeset	1414 if (nfields () == rb.nfields ())
4936 e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1415 {
5881 70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe] jwe parents: 5880 diff changeset	1416 for (const_iterator pa = begin (); pa != end (); pa++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1417 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1418 const_iterator pb = rb.seek (key(pa));
4937 4cf211c83158 [project @ 2004-08-06 16:21:20 by jwe] jwe parents: 4936 diff changeset	1419
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1420 if (pb == rb.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1421 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1422 error ("field name mismatch in structure concatenation");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1423 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1424 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1425
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1426 retval.assign (key(pa),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1427 contents(pa).insert (rb.contents(pb), ra_idx));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1428 }
9379 d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1429
d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1430 // Preserve order of keys.
d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1431 retval.key_list = key_list;
4936 e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe] jwe parents: 4915 diff changeset	1432 }
4937 4cf211c83158 [project @ 2004-08-06 16:21:20 by jwe] jwe parents: 4936 diff changeset	1433 else
7959 a73b80cd1f10 allow empty matrix by cell (or struct) concatentation John W. Eaton <jwe@octave.org> parents: 7046 diff changeset	1434 {
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation John W. Eaton <jwe@octave.org> parents: 7046 diff changeset	1435 dim_vector dv = dims ();
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation John W. Eaton <jwe@octave.org> parents: 7046 diff changeset	1436
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation John W. Eaton <jwe@octave.org> parents: 7046 diff changeset	1437 if (dv.all_zero ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1438 retval = rb;
7959 a73b80cd1f10 allow empty matrix by cell (or struct) concatentation John W. Eaton <jwe@octave.org> parents: 7046 diff changeset	1439 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1440 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1441 dv = rb.dims ();
7959 a73b80cd1f10 allow empty matrix by cell (or struct) concatentation John W. Eaton <jwe@octave.org> parents: 7046 diff changeset	1442
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1443 if (dv.all_zero ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1444 retval = *this;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1445 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1446 error ("invalid structure concatenation");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1447 }
7959 a73b80cd1f10 allow empty matrix by cell (or struct) concatentation John W. Eaton <jwe@octave.org> parents: 7046 diff changeset	1448 }
4937 4cf211c83158 [project @ 2004-08-06 16:21:20 by jwe] jwe parents: 4936 diff changeset	1449
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4806 diff changeset	1450 return retval;
4806 d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4730 diff changeset	1451 }
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe] jwe parents: 4730 diff changeset	1452
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1453 static bool
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1454 keys_ok (const Octave_map& a, const Octave_map& b, string_vector& keys)
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1455 {
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1456 bool retval = false;
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1457
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1458 keys = string_vector ();
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1459
6639 ed74670db09b [project @ 2007-05-21 19:47:22 by jwe] jwe parents: 6609 diff changeset	1460 if (a.nfields () == 0)
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1461 {
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1462 keys = b.keys ();
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1463 retval = true;
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1464 }
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1465 else
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1466 {
8503 8ba2ee57c594 remove qsort in favor of sort Jaroslav Hajek <highegg@gmail.com> parents: 8294 diff changeset	1467 string_vector a_keys = a.keys().sort ();
8ba2ee57c594 remove qsort in favor of sort Jaroslav Hajek <highegg@gmail.com> parents: 8294 diff changeset	1468 string_vector b_keys = b.keys().sort ();
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1469
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1470 octave_idx_type a_len = a_keys.length ();
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1471 octave_idx_type b_len = b_keys.length ();
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1472
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1473 if (a_len == b_len)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1474 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1475 for (octave_idx_type i = 0; i < a_len; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1476 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1477 if (a_keys[i] != b_keys[i])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1478 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1479 }
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1480
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1481 keys = a_keys;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1482 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1483 }
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1484 }
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1485
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1486 done:
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1487 return retval;
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1488 }
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1489
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1490 Octave_map&
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1491 Octave_map::maybe_delete_elements (const octave_value_list& idx)
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1492 {
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1493 string_vector t_keys = keys();
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1494 octave_idx_type len = t_keys.length ();
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1495
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1496 if (len > 0)
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1497 {
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1498 for (octave_idx_type i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1499 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1500 std::string k = t_keys[i];
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1501
10649 64472dd48517 cosmetic changes in Cell interface Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	1502 contents(k).delete_elements (idx);
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1503
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1504 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1505 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1506 }
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1507
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1508 if (!error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1509 dimensions = contents(t_keys[0]).dims();
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1510 }
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1511
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1512 return *this;
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1513 }
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1514
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5571 diff changeset	1515 Octave_map&
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4219 diff changeset	1516 Octave_map::assign (const octave_value_list& idx, const Octave_map& rhs)
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1517 {
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1518 string_vector t_keys;
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1519
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1520 if (keys_ok (*this, rhs, t_keys))
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1521 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5156 diff changeset	1522 octave_idx_type len = t_keys.length ();
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1523
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1524 if (len == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1525 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1526 Cell tmp_lhs (dims ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1527 Cell tmp_rhs (rhs.dims ());
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1528
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1529 tmp_lhs.assign (idx, tmp_rhs, Matrix ());
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1530
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1531 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1532 resize (tmp_lhs.dims ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1533 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1534 error ("size mismatch in structure assignment");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1535 }
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1536 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1537 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1538 for (octave_idx_type i = 0; i < len; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1539 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1540 std::string k = t_keys[i];
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1541
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1542 Cell t_rhs = rhs.contents (k);
6609 30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe] jwe parents: 5900 diff changeset	1543
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1544 assign (idx, k, t_rhs);
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1545
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1546 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1547 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1548 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1549 }
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1550 }
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1551 else
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1552 error ("field name mismatch in structure assignment");
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1553
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1554 return *this;
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1555 }
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	1556
3932 2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1557 Octave_map&
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4567 diff changeset	1558 Octave_map::assign (const octave_value_list& idx, const std::string& k,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1559 const Cell& rhs)
3932 2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1560 {
5881 70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe] jwe parents: 5880 diff changeset	1561 Cell tmp;
70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe] jwe parents: 5880 diff changeset	1562
70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe] jwe parents: 5880 diff changeset	1563 if (contains (k))
70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe] jwe parents: 5880 diff changeset	1564 tmp = map[k];
9127 5ec4dc52c131 fix empty struct indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1565 else
5ec4dc52c131 fix empty struct indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1566 tmp = Cell (dimensions);
3932 2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1567
9127 5ec4dc52c131 fix empty struct indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1568 tmp.assign (idx, rhs);
3932 2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1569
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1570 if (! error_state)
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1571 {
9127 5ec4dc52c131 fix empty struct indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1572 dim_vector tmp_dims = tmp.dims ();
3932 2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1573
9127 5ec4dc52c131 fix empty struct indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1574 if (tmp_dims != dimensions)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1575 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1576 for (iterator p = begin (); p != end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1577 contents(p).resize (tmp_dims, Cell::resize_fill_value ());
9127 5ec4dc52c131 fix empty struct indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1578
5ec4dc52c131 fix empty struct indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	1579 dimensions = tmp_dims;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1580 }
3932 2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1581
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1582 maybe_add_to_key_list (k);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1583
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4567 diff changeset	1584 map[k] = tmp;
3932 2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1585 }
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1586
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1587 return *this;
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1588 }
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3931 diff changeset	1589
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1590 Octave_map&
4675 f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1591 Octave_map::assign (const std::string& k, const octave_value& rhs)
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1592 {
6639 ed74670db09b [project @ 2007-05-21 19:47:22 by jwe] jwe parents: 6609 diff changeset	1593 if (nfields () == 0)
4675 f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1594 {
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1595 maybe_add_to_key_list (k);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1596
4675 f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1597 map[k] = Cell (rhs);
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1598
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1599 dimensions = dim_vector (1, 1);
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1600 }
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1601 else
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1602 {
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1603 dim_vector dv = dims ();
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1604
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1605 if (dv.all_ones ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1606 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1607 maybe_add_to_key_list (k);
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1608
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1609 map[k] = Cell (rhs);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1610 }
4675 f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1611 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1612 error ("invalid structure assignment");
4675 f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1613 }
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1614
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1615 return *this;
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1616 }
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1617
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe] jwe parents: 4625 diff changeset	1618 Octave_map&
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4567 diff changeset	1619 Octave_map::assign (const std::string& k, const Cell& rhs)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1620 {
6639 ed74670db09b [project @ 2007-05-21 19:47:22 by jwe] jwe parents: 6609 diff changeset	1621 if (nfields () == 0)
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4562 diff changeset	1622 {
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1623 maybe_add_to_key_list (k);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1624
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4567 diff changeset	1625 map[k] = rhs;
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4562 diff changeset	1626
4730 c88afb778c41 [project @ 2004-02-02 18:31:09 by jwe] jwe parents: 4675 diff changeset	1627 dimensions = rhs.dims ();
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4562 diff changeset	1628 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1629 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1630 {
4562 4699bdb4c362 [project @ 2003-10-28 21:14:07 by jwe] jwe parents: 4561 diff changeset	1631 if (dims () == rhs.dims ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1632 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1633 maybe_add_to_key_list (k);
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5781 diff changeset	1634
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1635 map[k] = rhs;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1636 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1637 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1638 error ("invalid structure assignment");
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1639 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1640
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1641 return *this;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1642 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1643
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1644 Octave_map
7046 fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7017 diff changeset	1645 Octave_map::index (const octave_value_list& idx, bool resize_ok) const
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1646 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1647 Octave_map retval;
9379 d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1648
8682 38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1649 octave_idx_type n_idx = idx.length ();
9379 d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1650
8682 38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1651 if (n_idx > 0)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1652 {
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1653 Array<idx_vector> ra_idx (n_idx, 1);
9379 d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1654
8682 38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1655 for (octave_idx_type i = 0; i < n_idx; i++)
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1656 {
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1657 ra_idx(i) = idx(i).index_vector ();
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1658 if (error_state)
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1659 break;
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1660 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1661
8682 38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1662 if (! error_state)
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1663 {
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1664 for (const_iterator p = begin (); p != end (); p++)
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1665 {
9379 d77fa87c47d8 oct-map.cc: preserve key order John W. Eaton <jwe@octave.org> parents: 9127 diff changeset	1666 Cell tmp = contents (p);
8682 38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1667
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9392 diff changeset	1668 tmp = tmp.Array<octave_value>::index (ra_idx, resize_ok);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1669
8682 38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1670 if (error_state)
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1671 break;
8294 b2a6309b2d87 oct-map.cc: copy key_list in indexing functions John W. Eaton <jwe@octave.org> parents: 8175 diff changeset	1672
8682 38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1673 retval.assign (key(p), tmp);
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1674 }
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1675
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1676 // Preserve order of keys.
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1677 retval.key_list = key_list;
38968f09f7ca optimize Octave_map::index Jaroslav Hajek <highegg@gmail.com> parents: 8679 diff changeset	1678 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1679 }
5435 66ad03c58880 [project @ 2005-08-31 20:41:47 by jwe] jwe parents: 5329 diff changeset	1680 else
5539 b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5435 diff changeset	1681 retval = *this;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1682
5539 b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5435 diff changeset	1683 return retval;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	1684 }

Mercurial > hg > octave-nkf

annotate src/oct-map.cc @ 10760:76079e505f9d