Mercurial > octave-nkf

annotate src/oct-map.cc @ 10350:12884915a8e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge MArray classes & improve Array interface
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 23 Jan 2010 21:41:03 +0100
parents 57a59eae83cc
children 64472dd48517
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
1278
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
5
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
6 This file is part of Octave.
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
7
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
8 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
9 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6959
diff changeset
10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6959
diff changeset
11 option) any later version.
1278
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
12
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
13 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
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
15 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
16 for more details.
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
17
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6959
diff changeset
19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6959
diff changeset
20 <http://www.gnu.org/licenses/>.
1278
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
21
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 #ifdef HAVE_CONFIG_H
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
25 #include <config.h>
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
26 #endif
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
27
3932
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
28 #include "error.h"
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1742
diff changeset
29 #include "str-vec.h"
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1742
diff changeset
30
1278
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
31 #include "oct-map.h"
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
32 #include "utils.h"
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
33
6959
47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe]
jwe
parents: 6946
diff changeset
34 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
35 : map (), key_list (), dimensions (dv)
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
36 {
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
37 Cell c (dv);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
38
6959
47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe]
jwe
parents: 6946
diff changeset
39 if (key_vals.is_cellstr ())
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
40 {
6959
47f4f4e88166 [project @ 2007-10-04 20:43:32 by jwe]
jwe
parents: 6946
diff changeset
41 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
42 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
43 std::string k = key_vals(i).string_value ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
44 map[k] = c;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
45 key_list.push_back (k);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
46 }
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
47 }
6946
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe]
jwe
parents: 6639
diff changeset
48 else
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe]
jwe
parents: 6639
diff changeset
49 error ("Octave_map: expecting keys to be cellstr");
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
50 }
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
51
7046
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
52 Octave_map
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
53 Octave_map::squeeze (void) const
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
54 {
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
55 Octave_map retval (dims ().squeeze ());
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
56
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
57 for (const_iterator pa = begin (); pa != end (); pa++)
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
58 {
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
59 Cell tmp = contents (pa).squeeze ();
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
60
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
61 if (error_state)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
62 break;
7046
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
63
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
64 retval.assign (key (pa), tmp);
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
65 }
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
66
9379
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
67 // Preserve order of keys.
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
68 retval.key_list = key_list;
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
69
7046
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
70 return retval;
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
71 }
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
72
9392
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
73 /*
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
74 %!# test preservation of keys by squeeze
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
75 %!test
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
76 %! x(1,1,1,1).d = 10; x(3,5,1,7).a = "b"; x(2,4,1,7).f = 27;
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
77 %! assert (fieldnames (squeeze (x)), {"d"; "a"; "f"});
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
78 */
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
79
7046
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
80 Octave_map
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
81 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
82 {
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
83 Octave_map retval (dims ());
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
84
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
85 for (const_iterator pa = begin (); pa != end (); pa++)
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
86 {
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
87 Cell tmp = contents (pa).permute (vec, inv);
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
88
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
89 if (error_state)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
90 break;
7046
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
91
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
92 retval.assign (key (pa), tmp);
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
93 }
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
94
9379
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
95 // Preserve order of keys.
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
96 retval.key_list = key_list;
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
97
7046
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
98 return retval;
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
99 }
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
100
9392
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
101 /*
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
102 %!# test preservation of key order by permute
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
103 %!test
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
104 %! x(1,1,1,1).d = 10; x(3,5,1,7).a = "b"; x(2,4,1,7).f = 27;
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
105 %! assert (fieldnames (permute (x, [3, 4, 1, 2])), {"d"; "a"; "f"});
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
106 */
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
107
5328
322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe]
jwe
parents: 5307
diff changeset
108 Cell&
322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe]
jwe
parents: 5307
diff changeset
109 Octave_map::contents (const std::string& k)
322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe]
jwe
parents: 5307
diff changeset
110 {
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
111 maybe_add_to_key_list (k);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
112
5328
322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe]
jwe
parents: 5307
diff changeset
113 return map[k];
322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe]
jwe
parents: 5307
diff changeset
114 }
322ab0da00f8 [project @ 2005-05-02 10:48:43 by jwe]
jwe
parents: 5307
diff changeset
115
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4219
diff changeset
116 Cell
4675
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
117 Octave_map::contents (const std::string& k) const
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
118 {
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4567
diff changeset
119 const_iterator p = seek (k);
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
120
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4219
diff changeset
121 return p != end () ? p->second : Cell ();
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
122 }
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
123
5156
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
124 int
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
125 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
126 {
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
127 int retval = def_val;
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
128
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
129 Cell c = contents (k);
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
130
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
131 if (! c.is_empty ())
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
132 retval = c(0).int_value ();
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
133
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
134 return retval;
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
135 }
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
136
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
137 std::string
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
138 Octave_map::stringfield (const std::string& k,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
139 const std::string& def_val) const
5156
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
140 {
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
141 std::string retval = def_val;
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
142
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
143 Cell c = contents (k);
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
144
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
145 if (! c.is_empty ())
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
146 retval = c(0).string_value ();
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
147
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
148 return retval;
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
149 }
7c3b22bafedc [project @ 2005-02-22 17:42:15 by jwe]
jwe
parents: 5105
diff changeset
150
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1742
diff changeset
151 string_vector
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
152 Octave_map::keys (void) const
1278
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
153 {
6639
ed74670db09b [project @ 2007-05-21 19:47:22 by jwe]
jwe
parents: 6609
diff changeset
154 assert (nfields () == key_list.size ());
5881
70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe]
jwe
parents: 5880
diff changeset
155
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
156 return string_vector (key_list);
1278
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
157 }
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
158
4567
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
159 Octave_map
5571
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
160 Octave_map::transpose (void) const
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
161 {
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
162 assert (ndims () == 2);
5593
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe]
jwe
parents: 5592
diff changeset
163
5571
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
164 dim_vector dv = dims ();
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
165
5593
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe]
jwe
parents: 5592
diff changeset
166 octave_idx_type nr = dv(0);
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe]
jwe
parents: 5592
diff changeset
167 octave_idx_type nc = dv(1);
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe]
jwe
parents: 5592
diff changeset
168
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe]
jwe
parents: 5592
diff changeset
169 dim_vector new_dims (nc, nr);
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe]
jwe
parents: 5592
diff changeset
170
edaf21425386 [project @ 2006-01-12 20:57:27 by jwe]
jwe
parents: 5592
diff changeset
171 Octave_map retval (new_dims);
5571
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
172
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
173 for (const_iterator p = begin (); p != end (); p++)
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
174 retval.assign (key(p), Cell (contents(p).transpose ()));
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
175
9379
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
176 // Preserve order of keys.
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
177 retval.key_list = key_list;
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
178
5571
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
179 return retval;
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
180 }
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
181
9392
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
182 /*
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
183 %!# test preservation of key order by transpose
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
184 %!test
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
185 %! x(1,1).d = 10; x(3,5).a = "b"; x(2,4).f = 27;
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
186 %! assert (fieldnames (transpose (x)), {"d"; "a"; "f"});
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
187 %! assert (fieldnames (x'), {"d"; "a"; "f"});
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
188 %! assert (fieldnames (x.'), {"d"; "a"; "f"});
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
189 */
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
190
5571
9fc532d861d4 [project @ 2005-12-12 20:45:16 by jwe]
jwe
parents: 5539
diff changeset
191 Octave_map
4567
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
192 Octave_map::reshape (const dim_vector& new_dims) const
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
193 {
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
194 Octave_map retval;
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
195
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
196 if (new_dims != dims ())
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
197 {
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
198 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
199 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
200
4936
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
201 retval.dimensions = new_dims;
9379
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
202
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
203 // Preserve order of keys.
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
204 retval.key_list = key_list;
4567
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
205 }
4936
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
206 else
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
207 retval = *this;
4567
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
208
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
209 return retval;
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
210 }
fc30061d01da [project @ 2003-10-29 20:11:15 by jwe]
jwe
parents: 4563
diff changeset
211
9392
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
212 /*
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
213 %!# test preservation of key order by reshape
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
214 %!test
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
215 %! x(1,1).d = 10; x(4,6).a = "b"; x(2,4).f = 27;
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
216 %! assert (fieldnames (reshape (x, 3, 8)), {"d"; "a"; "f"});
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
217 */
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
218
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5731
diff changeset
219 void
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5731
diff changeset
220 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
221 {
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
222 if (dv != dims ())
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
223 {
6639
ed74670db09b [project @ 2007-05-21 19:47:22 by jwe]
jwe
parents: 6609
diff changeset
224 if (nfields () == 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
225 dimensions = dv;
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
226 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
227 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
228 for (const_iterator p = begin (); p != end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
229 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
230 Cell tmp = contents(p);
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5731
diff changeset
231
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
232 if (fill)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
233 tmp.resize (dv, Cell::resize_fill_value ());
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
234 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
235 tmp.resize (dv);
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5731
diff changeset
236
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
237 dimensions = dv;
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5731
diff changeset
238
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
239 assign (key(p), tmp);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
240 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
241 }
4936
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
242 }
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
243 }
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
244
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4806
diff changeset
245 Octave_map
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5156
diff changeset
246 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
247 {
4937
4cf211c83158 [project @ 2004-08-06 16:21:20 by jwe]
jwe
parents: 4936
diff changeset
248 Octave_map retval;
4936
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
249
6639
ed74670db09b [project @ 2007-05-21 19:47:22 by jwe]
jwe
parents: 6609
diff changeset
250 if (nfields () == rb.nfields ())
4936
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
251 {
5881
70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe]
jwe
parents: 5880
diff changeset
252 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
253 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
254 const_iterator pb = rb.seek (key(pa));
4937
4cf211c83158 [project @ 2004-08-06 16:21:20 by jwe]
jwe
parents: 4936
diff changeset
255
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
256 if (pb == rb.end ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
257 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
258 error ("field name mismatch in structure concatenation");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
259 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
260 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
261
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
262 retval.assign (key(pa),
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
263 contents(pa).insert (rb.contents(pb), ra_idx));
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
264 }
9379
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
265
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
266 // Preserve order of keys.
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
267 retval.key_list = key_list;
4936
e63617efbd3f [project @ 2004-08-06 16:18:17 by jwe]
jwe
parents: 4915
diff changeset
268 }
4937
4cf211c83158 [project @ 2004-08-06 16:21:20 by jwe]
jwe
parents: 4936
diff changeset
269 else
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7046
diff changeset
270 {
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7046
diff changeset
271 dim_vector dv = dims ();
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7046
diff changeset
272
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7046
diff changeset
273 if (dv.all_zero ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
274 retval = rb;
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7046
diff changeset
275 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
276 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
277 dv = rb.dims ();
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7046
diff changeset
278
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
279 if (dv.all_zero ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
280 retval = *this;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
281 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
282 error ("invalid structure concatenation");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
283 }
7959
a73b80cd1f10 allow empty matrix by cell (or struct) concatentation
John W. Eaton <jwe@octave.org>
parents: 7046
diff changeset
284 }
4937
4cf211c83158 [project @ 2004-08-06 16:21:20 by jwe]
jwe
parents: 4936
diff changeset
285
4915
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe]
jwe
parents: 4806
diff changeset
286 return retval;
4806
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4730
diff changeset
287 }
d3bd9c04147f [project @ 2004-03-02 05:12:32 by jwe]
jwe
parents: 4730
diff changeset
288
9392
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
289 /*
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
290 %!# test preservation of key order by concatenation
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
291 %!test
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
292 %! x(1, 1).d = 10; x(4, 6).a = "b"; x(2, 4).f = 27;
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
293 %! y(1, 6).f = 11; y(1, 6).a = "c"; y(1, 6).d = 33;
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
294 %! assert (fieldnames ([x; y]), {"d"; "a"; "f"});
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
295 */
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
296
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
297 static bool
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
298 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
299 {
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
300 bool retval = false;
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
301
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
302 keys = string_vector ();
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
303
6639
ed74670db09b [project @ 2007-05-21 19:47:22 by jwe]
jwe
parents: 6609
diff changeset
304 if (a.nfields () == 0)
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
305 {
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
306 keys = b.keys ();
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
307 retval = true;
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
308 }
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
309 else
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
310 {
8503
8ba2ee57c594 remove qsort in favor of sort
Jaroslav Hajek <highegg@gmail.com>
parents: 8294
diff changeset
311 string_vector a_keys = a.keys().sort ();
8ba2ee57c594 remove qsort in favor of sort
Jaroslav Hajek <highegg@gmail.com>
parents: 8294
diff changeset
312 string_vector b_keys = b.keys().sort ();
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
313
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
314 octave_idx_type a_len = a_keys.length ();
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
315 octave_idx_type b_len = b_keys.length ();
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
316
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
317 if (a_len == b_len)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
318 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
319 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
320 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
321 if (a_keys[i] != b_keys[i])
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
322 goto done;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
323 }
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
324
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
325 keys = a_keys;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
326 retval = true;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
327 }
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
328 }
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
329
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
330 done:
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
331 return retval;
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
332 }
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
333
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
334 Octave_map&
5592
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
335 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
336 {
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
337 string_vector t_keys = keys();
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
338 octave_idx_type len = t_keys.length ();
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
339
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
340 if (len > 0)
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
341 {
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
342 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
343 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
344 std::string k = t_keys[i];
5592
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
345
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
346 map[k] = contents(k).delete_elements (idx);
5592
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
347
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
348 if (error_state)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
349 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
350 }
5592
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
351
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
352 if (!error_state)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
353 dimensions = contents(t_keys[0]).dims();
5592
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
354 }
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
355
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
356 return *this;
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
357 }
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
358
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman]
dbateman
parents: 5571
diff changeset
359 Octave_map&
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4219
diff changeset
360 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
361 {
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
362 string_vector t_keys;
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
363
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
364 if (keys_ok (*this, rhs, t_keys))
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
365 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5156
diff changeset
366 octave_idx_type len = t_keys.length ();
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
367
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
368 if (len == 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
369 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
370 Cell tmp_lhs (dims ());
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
371 Cell tmp_rhs (rhs.dims ());
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
372
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
373 tmp_lhs.assign (idx, tmp_rhs, Matrix ());
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
374
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
375 if (! error_state)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
376 resize (tmp_lhs.dims ());
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
377 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
378 error ("size mismatch in structure assignment");
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
379 }
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
380 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
381 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
382 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
383 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
384 std::string k = t_keys[i];
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
385
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
386 Cell t_rhs = rhs.contents (k);
6609
30891d1d0c86 [project @ 2007-05-09 02:12:04 by jwe]
jwe
parents: 5900
diff changeset
387
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
388 assign (idx, k, t_rhs);
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
389
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
390 if (error_state)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
391 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
392 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
393 }
4197
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
394 }
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
395 else
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
396 error ("field name mismatch in structure assignment");
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
397
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
398 return *this;
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
399 }
40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe]
jwe
parents: 4192
diff changeset
400
3932
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
401 Octave_map&
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4567
diff changeset
402 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
403 const Cell& rhs)
3932
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
404 {
5881
70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe]
jwe
parents: 5880
diff changeset
405 Cell tmp;
70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe]
jwe
parents: 5880
diff changeset
406
70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe]
jwe
parents: 5880
diff changeset
407 if (contains (k))
70b3f8f1a793 [project @ 2006-07-08 03:54:17 by jwe]
jwe
parents: 5880
diff changeset
408 tmp = map[k];
9127
5ec4dc52c131 fix empty struct indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
409 else
5ec4dc52c131 fix empty struct indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
410 tmp = Cell (dimensions);
3932
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
411
9127
5ec4dc52c131 fix empty struct indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
412 tmp.assign (idx, rhs);
3932
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
413
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
414 if (! error_state)
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
415 {
9127
5ec4dc52c131 fix empty struct indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
416 dim_vector tmp_dims = tmp.dims ();
3932
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
417
9127
5ec4dc52c131 fix empty struct indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
418 if (tmp_dims != dimensions)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
419 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
420 for (iterator p = begin (); p != end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
421 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
422
5ec4dc52c131 fix empty struct indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
423 dimensions = tmp_dims;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
424 }
3932
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
425
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
426 maybe_add_to_key_list (k);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
427
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4567
diff changeset
428 map[k] = tmp;
3932
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
429 }
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
430
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
431 return *this;
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
432 }
2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe]
jwe
parents: 3931
diff changeset
433
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
434 Octave_map&
4675
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
435 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
436 {
6639
ed74670db09b [project @ 2007-05-21 19:47:22 by jwe]
jwe
parents: 6609
diff changeset
437 if (nfields () == 0)
4675
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
438 {
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
439 maybe_add_to_key_list (k);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
440
4675
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
441 map[k] = Cell (rhs);
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
442
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
443 dimensions = dim_vector (1, 1);
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
444 }
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
445 else
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
446 {
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
447 dim_vector dv = dims ();
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
448
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
449 if (dv.all_ones ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
450 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
451 maybe_add_to_key_list (k);
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
452
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
453 map[k] = Cell (rhs);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
454 }
4675
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
455 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
456 error ("invalid structure assignment");
4675
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
457 }
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
458
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
459 return *this;
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
460 }
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
461
f6d6335c08f6 [project @ 2003-12-16 05:11:26 by jwe]
jwe
parents: 4625
diff changeset
462 Octave_map&
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4567
diff changeset
463 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
464 {
6639
ed74670db09b [project @ 2007-05-21 19:47:22 by jwe]
jwe
parents: 6609
diff changeset
465 if (nfields () == 0)
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4562
diff changeset
466 {
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
467 maybe_add_to_key_list (k);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
468
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4567
diff changeset
469 map[k] = rhs;
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4562
diff changeset
470
4730
c88afb778c41 [project @ 2004-02-02 18:31:09 by jwe]
jwe
parents: 4675
diff changeset
471 dimensions = rhs.dims ();
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4562
diff changeset
472 }
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
473 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
474 {
4562
4699bdb4c362 [project @ 2003-10-28 21:14:07 by jwe]
jwe
parents: 4561
diff changeset
475 if (dims () == rhs.dims ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
476 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
477 maybe_add_to_key_list (k);
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5781
diff changeset
478
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
479 map[k] = rhs;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
480 }
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
481 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
482 error ("invalid structure assignment");
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
483 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
484
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
485 return *this;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
486 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
487
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
488 Octave_map
7046
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman]
dbateman
parents: 7017
diff changeset
489 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
490 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
491 Octave_map retval;
9379
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
492
8682
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
493 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
494
8682
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
495 if (n_idx > 0)
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
496 {
10350
12884915a8e4 merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
497 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
498
8682
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
499 for (octave_idx_type i = 0; i < n_idx; i++)
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
500 {
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
501 ra_idx(i) = idx(i).index_vector ();
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
502 if (error_state)
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
503 break;
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
504 }
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
505
8682
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
506 if (! error_state)
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
507 {
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
508 for (const_iterator p = begin (); p != end (); p++)
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
509 {
9379
d77fa87c47d8 oct-map.cc: preserve key order
John W. Eaton <jwe@octave.org>
parents: 9127
diff changeset
510 Cell tmp = contents (p);
8682
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
511
9732
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 9392
diff changeset
512 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
513
8682
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
514 if (error_state)
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
515 break;
8294
b2a6309b2d87 oct-map.cc: copy key_list in indexing functions
John W. Eaton <jwe@octave.org>
parents: 8175
diff changeset
516
8682
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
517 retval.assign (key(p), tmp);
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
518 }
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
519
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
520 // Preserve order of keys.
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
521 retval.key_list = key_list;
38968f09f7ca optimize Octave_map::index
Jaroslav Hajek <highegg@gmail.com>
parents: 8679
diff changeset
522 }
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
523 }
5435
66ad03c58880 [project @ 2005-08-31 20:41:47 by jwe]
jwe
parents: 5329
diff changeset
524 else
5539
b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe]
jwe
parents: 5435
diff changeset
525 retval = *this;
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
526
5539
b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe]
jwe
parents: 5435
diff changeset
527 return retval;
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
528 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3932
diff changeset
529
1278
606361d34c74 [project @ 1995-04-26 17:40:24 by jwe]
jwe
parents:
diff changeset
530 /*
9392
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
531 %!# test preservation of key order by indexing
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
532 %!test
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
533 %! x(1, 1).d = 10; x(4, 6).a = "b"; x(2, 4).f = 27;
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
534 %! assert (fieldnames (x([1, 2], [2:5])), {"d"; "a"; "f"});
26c72e899228 Add tests for preservation of key order
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9380
diff changeset
535 */