annotate src/ov-cell.cc @ 5846:db0598f94c0f

[project @ 2006-06-07 18:16:16 by jwe]
author jwe
date Wed, 07 Jun 2006 18:16:16 +0000
parents 22e23bee74c8
children 426b94346d70
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
1 /*
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
2
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
3 Copyright (C) 1999 John W. Eaton
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
4
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
6
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
9 Free Software Foundation; either version 2, or (at your option) any
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
10 later version.
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
11
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
15 for more details.
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
16
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
18 along with Octave; see the file COPYING. If not, write to the Free
5307
4c8a2e4e0717 [project @ 2005-04-26 19:24:27 by jwe]
jwe
parents: 5275
diff changeset
19 Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
4c8a2e4e0717 [project @ 2005-04-26 19:24:27 by jwe]
jwe
parents: 5275
diff changeset
20 02110-1301, USA.
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
21
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
22 */
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
23
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
24 #ifdef HAVE_CONFIG_H
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
25 #include <config.h>
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
26 #endif
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
27
3503
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 3448
diff changeset
28 #include <iostream>
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5760
diff changeset
29 #include <sstream>
5164
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe]
jwe
parents: 5157
diff changeset
30 #include <vector>
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
31
5360
33adb987c033 [project @ 2005-05-23 16:19:56 by jwe]
jwe
parents: 5351
diff changeset
32 #include "Array-util.h"
33adb987c033 [project @ 2005-05-23 16:19:56 by jwe]
jwe
parents: 5351
diff changeset
33 #include "byte-swap.h"
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
34 #include "lo-utils.h"
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4066
diff changeset
35 #include "quit.h"
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
36
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
37 #include "defun.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
38 #include "error.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
39 #include "ov-cell.h"
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
40 #include "oct-obj.h"
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
41 #include "unwind-prot.h"
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
42 #include "utils.h"
3928
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3538
diff changeset
43 #include "ov-base-mat.h"
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3538
diff changeset
44 #include "ov-base-mat.cc"
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3538
diff changeset
45 #include "ov-re-mat.h"
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3538
diff changeset
46 #include "ov-scalar.h"
5360
33adb987c033 [project @ 2005-05-23 16:19:56 by jwe]
jwe
parents: 5351
diff changeset
47 #include "pr-output.h"
33adb987c033 [project @ 2005-05-23 16:19:56 by jwe]
jwe
parents: 5351
diff changeset
48 #include "ov-scalar.h"
3928
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3538
diff changeset
49
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
50 #include "ls-oct-ascii.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
51 #include "ls-oct-binary.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
52 #include "ls-hdf5.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
53 #include "ls-utils.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
54
3928
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3538
diff changeset
55 template class octave_base_matrix<Cell>;
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
56
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
57 DEFINE_OCTAVE_ALLOCATOR (octave_cell);
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
58
4612
d44675070f1a [project @ 2003-11-14 19:49:56 by jwe]
jwe
parents: 4610
diff changeset
59 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_cell, "cell", "cell");
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
60
4994
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
61 octave_value_list
4247
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe]
jwe
parents: 4243
diff changeset
62 octave_cell::subsref (const std::string& type,
4994
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
63 const std::list<octave_value_list>& idx, int nargout)
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
64 {
4994
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
65 octave_value_list retval;
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
66
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
67 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
68 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
69 case '(':
4994
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
70 retval(0) = do_index_op (idx.front ());
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
71 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
72
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
73 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
74 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
75 octave_value tmp = do_index_op (idx.front ());
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
76
4582
db5a24d54915 [project @ 2003-10-31 15:11:45 by jwe]
jwe
parents: 4563
diff changeset
77 if (! error_state)
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
78 {
4582
db5a24d54915 [project @ 2003-10-31 15:11:45 by jwe]
jwe
parents: 4563
diff changeset
79 Cell tcell = tmp.cell_value ();
db5a24d54915 [project @ 2003-10-31 15:11:45 by jwe]
jwe
parents: 4563
diff changeset
80
db5a24d54915 [project @ 2003-10-31 15:11:45 by jwe]
jwe
parents: 4563
diff changeset
81 if (tcell.length () == 1)
4994
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
82 retval(0) = tcell(0,0);
4582
db5a24d54915 [project @ 2003-10-31 15:11:45 by jwe]
jwe
parents: 4563
diff changeset
83 else
db5a24d54915 [project @ 2003-10-31 15:11:45 by jwe]
jwe
parents: 4563
diff changeset
84 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
85 octave_idx_type n = tcell.numel ();
4705
a1b165f5e934 [project @ 2004-01-22 04:26:19 by jwe]
jwe
parents: 4699
diff changeset
86
a1b165f5e934 [project @ 2004-01-22 04:26:19 by jwe]
jwe
parents: 4699
diff changeset
87 octave_value_list lst (n, octave_value ());
a1b165f5e934 [project @ 2004-01-22 04:26:19 by jwe]
jwe
parents: 4699
diff changeset
88
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
89 for (octave_idx_type i = 0; i < n; i++)
4705
a1b165f5e934 [project @ 2004-01-22 04:26:19 by jwe]
jwe
parents: 4699
diff changeset
90 {
a1b165f5e934 [project @ 2004-01-22 04:26:19 by jwe]
jwe
parents: 4699
diff changeset
91 OCTAVE_QUIT;
a1b165f5e934 [project @ 2004-01-22 04:26:19 by jwe]
jwe
parents: 4699
diff changeset
92 lst(i) = tcell(i);
a1b165f5e934 [project @ 2004-01-22 04:26:19 by jwe]
jwe
parents: 4699
diff changeset
93 }
a1b165f5e934 [project @ 2004-01-22 04:26:19 by jwe]
jwe
parents: 4699
diff changeset
94
4994
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
95 retval(0) = octave_value (lst, true);
4582
db5a24d54915 [project @ 2003-10-31 15:11:45 by jwe]
jwe
parents: 4563
diff changeset
96 }
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
97 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
98 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
99 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
100
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
101 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
102 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
103 std::string nm = type_name ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
104 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
105 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
106 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
107
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
108 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
109 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
110 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
111
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5765
diff changeset
112 // FIXME -- perhaps there should be an
4994
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
113 // octave_value_list::next_subsref member function? See also
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
114 // octave_user_function::subsref.
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
115
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
116 if (idx.size () > 1)
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
117 retval = retval(0).next_subsref (nargout, type, idx);
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
118
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe]
jwe
parents: 4944
diff changeset
119 return retval;
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
120 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
121
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
122 octave_value
4247
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe]
jwe
parents: 4243
diff changeset
123 octave_cell::subsasgn (const std::string& type,
4219
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe]
jwe
parents: 4192
diff changeset
124 const std::list<octave_value_list>& idx,
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
125 const octave_value& rhs)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
126 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
127 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
128
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
129 int n = type.length ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
130
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
131 octave_value t_rhs = rhs;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
132
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
133 if (n > 1)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
134 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
135 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
136 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
137 case '(':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
138 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
139 octave_value tmp = do_index_op (idx.front (), true);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
140
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
141 if (! tmp.is_defined ())
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
142 tmp = octave_value::empty_conv (type.substr (1), rhs);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
143
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
144 if (! error_state)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
145 {
4219
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe]
jwe
parents: 4192
diff changeset
146 std::list<octave_value_list> next_idx (idx);
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
147
4219
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe]
jwe
parents: 4192
diff changeset
148 next_idx.erase (next_idx.begin ());
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
149
4362
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
150 tmp.make_unique ();
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
151
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
152 t_rhs = tmp.subsasgn (type.substr (1), next_idx, rhs);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
153 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
154 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
155 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
156
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
157 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
158 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
159 octave_value tmp = do_index_op (idx.front (), true);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
160
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
161 if (! tmp.is_defined ())
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
162 tmp = octave_value::empty_conv (type.substr (1), rhs);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
163
4362
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
164 if (! error_state)
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
165 {
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
166 Cell tcell = tmp.cell_value ();
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
167
4362
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
168 if (! error_state && tcell.length () == 1)
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
169 {
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
170 tmp = tcell(0,0);
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
171
4362
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
172 std::list<octave_value_list> next_idx (idx);
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
173
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
174 next_idx.erase (next_idx.begin ());
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
175
4362
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
176 tmp.make_unique ();
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
177
4519
8e1c04e506ce [project @ 2003-09-24 17:11:46 by jwe]
jwe
parents: 4513
diff changeset
178 if (! tmp.is_defined () || tmp.is_empty ())
8e1c04e506ce [project @ 2003-09-24 17:11:46 by jwe]
jwe
parents: 4513
diff changeset
179 tmp = octave_value::empty_conv (type.substr (1), rhs);
8e1c04e506ce [project @ 2003-09-24 17:11:46 by jwe]
jwe
parents: 4513
diff changeset
180
8e1c04e506ce [project @ 2003-09-24 17:11:46 by jwe]
jwe
parents: 4513
diff changeset
181 if (! error_state)
8e1c04e506ce [project @ 2003-09-24 17:11:46 by jwe]
jwe
parents: 4513
diff changeset
182 t_rhs = tmp.subsasgn (type.substr (1), next_idx, rhs);
4362
0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe]
jwe
parents: 4358
diff changeset
183 }
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
184 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
185 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
186 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
187
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
188 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
189 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
190 std::string nm = type_name ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
191 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
192 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
193 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
194
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
195 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
196 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
197 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
198 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
199
3940
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
200 if (! error_state)
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
201 {
3940
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
202 switch (type[0])
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
203 {
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
204 case '(':
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
205 {
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
206 octave_value_list i = idx.front ();
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
207
3940
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
208 if (t_rhs.is_cell ())
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
209 octave_base_matrix<Cell>::assign (i, t_rhs.cell_value ());
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
210 else
4941
6af62cc045f7 [project @ 2004-08-25 16:37:30 by jwe]
jwe
parents: 4933
diff changeset
211 if (t_rhs.is_empty ())
6af62cc045f7 [project @ 2004-08-25 16:37:30 by jwe]
jwe
parents: 4933
diff changeset
212 octave_base_matrix<Cell>::assign (i, Cell());
6af62cc045f7 [project @ 2004-08-25 16:37:30 by jwe]
jwe
parents: 4933
diff changeset
213 else
6af62cc045f7 [project @ 2004-08-25 16:37:30 by jwe]
jwe
parents: 4933
diff changeset
214 octave_base_matrix<Cell>::assign (i, Cell (t_rhs));
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
215
5759
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe]
jwe
parents: 5717
diff changeset
216 count++;
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe]
jwe
parents: 5717
diff changeset
217 retval = octave_value (this);
3940
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
218 }
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
219 break;
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
220
3940
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
221 case '{':
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
222 {
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
223 octave_value_list i = idx.front ();
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
224
5846
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
225 if (t_rhs.is_cs_list ())
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
226 {
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
227 Cell tmp_cell = Cell (t_rhs.list_value ());
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
228
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
229 // FIXME -- shouldn't care if the dimensions of the
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
230 // RHS don't match the dimensions of the subscripted
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
231 // LHS.
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
232
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
233 octave_base_matrix<Cell>::assign (i, tmp_cell);
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
234 }
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
235 else
db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe]
jwe
parents: 5828
diff changeset
236 octave_base_matrix<Cell>::assign (i, Cell (t_rhs));
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
237
5759
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe]
jwe
parents: 5717
diff changeset
238 count++;
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe]
jwe
parents: 5717
diff changeset
239 retval = octave_value (this);
3940
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
240 }
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
241 break;
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
242
3940
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
243 case '.':
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
244 {
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
245 std::string nm = type_name ();
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
246 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
247 }
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
248 break;
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
249
3940
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
250 default:
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
251 panic_impossible ();
1b58576bdaa6 [project @ 2002-05-16 18:11:50 by jwe]
jwe
parents: 3933
diff changeset
252 }
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
253 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
254
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
255 return retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
256 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
257
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
258 void
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
259 octave_cell::assign (const octave_value_list& idx, const octave_value& rhs)
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
260 {
3928
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3538
diff changeset
261 if (rhs.is_cell ())
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3538
diff changeset
262 octave_base_matrix<Cell>::assign (idx, rhs.cell_value ());
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
263 else
3928
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3538
diff changeset
264 octave_base_matrix<Cell>::assign (idx, Cell (rhs));
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
265 }
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
266
4791
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4764
diff changeset
267 size_t
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4764
diff changeset
268 octave_cell::byte_size (void) const
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4764
diff changeset
269 {
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4764
diff changeset
270 size_t retval = 0;
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4764
diff changeset
271
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
272 for (octave_idx_type i = 0; i < numel (); i++)
4791
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4764
diff changeset
273 retval += matrix(i).byte_size ();
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4764
diff changeset
274
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4764
diff changeset
275 return retval;
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4764
diff changeset
276 }
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4764
diff changeset
277
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
278 octave_value_list
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
279 octave_cell::list_value (void) const
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
280 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
281 octave_value_list retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
282
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
283 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
284 octave_idx_type nc = columns ();
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
285
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
286 if (nr == 1 && nc > 0)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
287 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
288 retval.resize (nc);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
289
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
290 for (octave_idx_type i = 0; i < nc; i++)
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
291 retval(i) = matrix(0,i);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
292 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
293 else if (nc == 1 && nr > 0)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
294 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
295 retval.resize (nr);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
296
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
297 for (octave_idx_type i = 0; i < nr; i++)
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
298 retval(i) = matrix(i,0);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
299 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
300 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
301 error ("invalid conversion from cell array to list");
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
302
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
303 return retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
304 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
305
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
306 string_vector
5715
edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe]
jwe
parents: 5707
diff changeset
307 octave_cell::all_strings (bool pad) const
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
308 {
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
309 string_vector retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
310
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
311 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
312 octave_idx_type nc = columns ();
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
313
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
314 int n_elts = 0;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
315
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
316 octave_idx_type max_len = 0;
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
317
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
318 for (octave_idx_type j = 0; j < nc; j++)
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
319 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
320 for (octave_idx_type i = 0; i < nr; i++)
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
321 {
4722
8f892ca5851d [project @ 2004-01-23 14:22:37 by jwe]
jwe
parents: 4705
diff changeset
322 string_vector s = matrix(i,j).all_strings ();
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
323
4722
8f892ca5851d [project @ 2004-01-23 14:22:37 by jwe]
jwe
parents: 4705
diff changeset
324 if (error_state)
8f892ca5851d [project @ 2004-01-23 14:22:37 by jwe]
jwe
parents: 4705
diff changeset
325 return retval;
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
326
4722
8f892ca5851d [project @ 2004-01-23 14:22:37 by jwe]
jwe
parents: 4705
diff changeset
327 n_elts += s.length ();
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
328
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
329 octave_idx_type s_max_len = s.max_length ();
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
330
4722
8f892ca5851d [project @ 2004-01-23 14:22:37 by jwe]
jwe
parents: 4705
diff changeset
331 if (s_max_len > max_len)
8f892ca5851d [project @ 2004-01-23 14:22:37 by jwe]
jwe
parents: 4705
diff changeset
332 max_len = s_max_len;
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
333 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
334 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
335
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
336 retval.resize (n_elts);
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
337
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
338 octave_idx_type k = 0;
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
339
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
340 for (octave_idx_type j = 0; j < nc; j++)
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
341 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
342 for (octave_idx_type i = 0; i < nr; i++)
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
343 {
4358
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
344 string_vector s = matrix(i,j).all_strings ();
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
345
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe]
jwe
parents: 4247
diff changeset
346 int n = s.length ();
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
347
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
348 for (octave_idx_type ii = 0; ii < n; ii++)
5715
edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe]
jwe
parents: 5707
diff changeset
349 {
edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe]
jwe
parents: 5707
diff changeset
350 std::string t = s[ii];
edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe]
jwe
parents: 5707
diff changeset
351 int t_len = t.length ();
edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe]
jwe
parents: 5707
diff changeset
352
edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe]
jwe
parents: 5707
diff changeset
353 if (pad && max_len > t_len)
edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe]
jwe
parents: 5707
diff changeset
354 t += std::string (max_len - t_len, ' ');
edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe]
jwe
parents: 5707
diff changeset
355
edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe]
jwe
parents: 5707
diff changeset
356 retval[k++] = t;
edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe]
jwe
parents: 5707
diff changeset
357 }
4243
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
358 }
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
359 }
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
360
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
361 return retval;
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
362 }
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe]
jwe
parents: 4219
diff changeset
363
4604
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe]
jwe
parents: 4587
diff changeset
364 bool
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe]
jwe
parents: 4587
diff changeset
365 octave_cell::print_as_scalar (void) const
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe]
jwe
parents: 4587
diff changeset
366 {
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe]
jwe
parents: 4587
diff changeset
367 return (ndims () > 2 || numel () == 0);
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe]
jwe
parents: 4587
diff changeset
368 }
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe]
jwe
parents: 4587
diff changeset
369
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
370 void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
371 octave_cell::print (std::ostream& os, bool) const
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
372 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
373 print_raw (os);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
374 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
375
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
376 void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
377 octave_cell::print_raw (std::ostream& os, bool) const
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
378 {
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4582
diff changeset
379 int nd = matrix.ndims ();
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
380
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4582
diff changeset
381 if (nd == 2)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
382 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
383 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
384 octave_idx_type nc = columns ();
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
385
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
386 if (nr > 0 && nc > 0)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
387 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
388 indent (os);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
389 os << "{";
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
390 newline (os);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
391
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
392 increment_indent_level ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
393
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
394 for (octave_idx_type j = 0; j < nc; j++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
395 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
396 for (octave_idx_type i = 0; i < nr; i++)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
397 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
398 OCTAVE_QUIT;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
399
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5760
diff changeset
400 std::ostringstream buf;
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5760
diff changeset
401 buf << "[" << i+1 << "," << j+1 << "]";
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
402
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
403 octave_value val = matrix(i,j);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
404
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5760
diff changeset
405 val.print_with_name (os, buf.str ());
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
406 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
407 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
408
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
409 decrement_indent_level ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
410
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
411 indent (os);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
412 os << "}";
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
413 newline (os);
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
414 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
415 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
416 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
417 os << "{}";
5360
33adb987c033 [project @ 2005-05-23 16:19:56 by jwe]
jwe
parents: 5351
diff changeset
418 if (Vprint_empty_dimensions)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
419 os << "(" << nr << "x" << nc << ")";
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
420 os << "\n";
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
421 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
422 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
423 else
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
424 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
425 indent (os);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4457
diff changeset
426 dim_vector dv = matrix.dims ();
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4582
diff changeset
427 os << "{" << dv.str () << " Cell Array}";
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
428 newline (os);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
429 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
430 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
431
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
432 #define CELL_ELT_TAG "<cell-element>"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
433
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
434 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
435 octave_cell::save_ascii (std::ostream& os, bool& infnan_warned,
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
436 bool strip_nan_and_inf)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
437 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
438 dim_vector d = dims ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
439 if (d.length () > 2)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
440 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
441 os << "# ndims: " << d.length () << "\n";
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
442
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
443 for (int i = 0; i < d.length (); i++)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
444 os << " " << d (i);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
445 os << "\n";
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
446
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
447 Cell tmp = cell_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
448
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
449 for (octave_idx_type i = 0; i < d.numel (); i++)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
450 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
451 octave_value o_val = tmp.elem (i);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
452
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
453 // Recurse to print sub-value.
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
454 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, infnan_warned,
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
455 strip_nan_and_inf, 0, 0);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
456
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
457 if (! b)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
458 return os;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
459 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
460 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
461 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
462 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
463 // Keep this case, rather than use generic code above for backward
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
464 // compatiability. Makes load_ascii much more complex!!
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
465 os << "# rows: " << rows () << "\n"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
466 << "# columns: " << columns () << "\n";
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
467
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
468 Cell tmp = cell_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
469
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
470 for (octave_idx_type j = 0; j < tmp.cols (); j++)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
471 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
472 for (octave_idx_type i = 0; i < tmp.rows (); i++)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
473 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
474 octave_value o_val = tmp.elem (i, j);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
475
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
476 // Recurse to print sub-value.
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
477 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG,
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
478 infnan_warned,
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
479 strip_nan_and_inf, 0, 0);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
480
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
481 if (! b)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
482 return os;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
483 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
484
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
485 os << "\n";
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
486 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
487 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
488
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
489 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
490 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
491
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
492 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
493 octave_cell::load_ascii (std::istream& is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
494 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
495 bool success = true;
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
496
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
497 string_vector keywords(2);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
498
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
499 keywords[0] = "ndims";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
500 keywords[1] = "rows";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
501
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
502 std::string kw;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
503 octave_idx_type val = 0;
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
504
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
505 if (extract_keyword (is, keywords, kw, val, true))
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
506 {
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
507 if (kw == "ndims")
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
508 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
509 int mdims = static_cast<int> (val);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
510
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
511 if (mdims >= 0)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
512 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
513 dim_vector dv;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
514 dv.resize (mdims);
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
515
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
516 for (int i = 0; i < mdims; i++)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
517 is >> dv(i);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
518
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
519 Cell tmp(dv);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
520
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
521 for (octave_idx_type i = 0; i < dv.numel (); i++)
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
522 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
523 octave_value t2;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
524 bool dummy;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
525
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
526 // recurse to read cell elements
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
527 std::string nm = read_ascii_data (is, std::string (),
5759
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe]
jwe
parents: 5717
diff changeset
528 dummy, t2, i);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
529
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
530 if (nm == CELL_ELT_TAG)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
531 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
532 if (is)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
533 tmp.elem (i) = t2;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
534 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
535 else
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
536 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
537 error ("load: cell array element had unexpected name");
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
538 success = false;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
539 break;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
540 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
541 }
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
542
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
543 if (is)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
544 matrix = tmp;
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
545 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
546 {
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
547 error ("load: failed to load matrix constant");
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
548 success = false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
549 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
550 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
551 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
552 {
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
553 error ("load: failed to extract number of rows and columns");
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
554 success = false;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
555 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
556 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
557 else if (kw == "rows")
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
558 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
559 octave_idx_type nr = val;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
560 octave_idx_type nc = 0;
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
561
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
562 if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
563 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
564 if (nr > 0 && nc > 0)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
565 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
566 Cell tmp (nr, nc);
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
567
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
568 for (octave_idx_type j = 0; j < nc; j++)
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
569 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
570 for (octave_idx_type i = 0; i < nr; i++)
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
571 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
572 octave_value t2;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
573 bool dummy;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
574
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
575 // recurse to read cell elements
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
576 std::string nm = read_ascii_data (is, std::string (),
5759
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe]
jwe
parents: 5717
diff changeset
577 dummy, t2, i);
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
578
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
579 if (nm == CELL_ELT_TAG)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
580 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
581 if (is)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
582 tmp.elem (i, j) = t2;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
583 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
584 else
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
585 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
586 error ("load: cell array element had unexpected name");
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
587 success = false;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
588 goto cell_read_error;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
589 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
590 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
591 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
592
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
593 cell_read_error:
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
594
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
595 if (is)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
596 matrix = tmp;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
597 else
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
598 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
599 error ("load: failed to load cell element");
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
600 success = false;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
601 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
602 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
603 else if (nr == 0 || nc == 0)
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
604 matrix = Cell (nr, nc);
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
605 else
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
606 panic_impossible ();
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
607 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
608 else
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
609 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
610 error ("load: failed to extract number of rows and columns for cell array");
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
611 success = false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
612 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
613 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
614 else
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
615 panic_impossible ();
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
616 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
617 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
618 {
5099
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
619 error ("load: failed to extract number of rows and columns");
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe]
jwe
parents: 5060
diff changeset
620 success = false;
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
621 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
622
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
623 return success;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
624 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
625
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
626 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
627 octave_cell::save_binary (std::ostream& os, bool& save_as_floats)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
628 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
629 dim_vector d = dims ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
630 if (d.length () < 1)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
631 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
632
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
633 // Use negative value for ndims
5828
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe]
jwe
parents: 5823
diff changeset
634 int32_t di = - d.length();
5760
8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe]
jwe
parents: 5759
diff changeset
635 os.write (reinterpret_cast<char *> (&di), 4);
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
636 for (int i = 0; i < d.length (); i++)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
637 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
638 di = d(i);
5760
8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe]
jwe
parents: 5759
diff changeset
639 os.write (reinterpret_cast<char *> (&di), 4);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
640 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
641
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
642 Cell tmp = cell_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
643
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
644 for (octave_idx_type i = 0; i < d.numel (); i++)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
645 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
646 octave_value o_val = tmp.elem (i);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
647
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
648 // Recurse to print sub-value.
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
649 bool b = save_binary_data (os, o_val, CELL_ELT_TAG, "", 0,
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
650 save_as_floats);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
651
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
652 if (! b)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
653 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
654 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
655
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
656 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
657 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
658
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
659 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
660 octave_cell::load_binary (std::istream& is, bool swap,
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
661 oct_mach_info::float_format fmt)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
662 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
663 bool success = true;
5828
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe]
jwe
parents: 5823
diff changeset
664 int32_t mdims;
5760
8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe]
jwe
parents: 5759
diff changeset
665 if (! is.read (reinterpret_cast<char *> (&mdims), 4))
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
666 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
667 if (swap)
4944
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe]
jwe
parents: 4941
diff changeset
668 swap_bytes<4> (&mdims);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
669 if (mdims >= 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
670 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
671
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
672 mdims = -mdims;
5828
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe]
jwe
parents: 5823
diff changeset
673 int32_t di;
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
674 dim_vector dv;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
675 dv.resize (mdims);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
676
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
677 for (int i = 0; i < mdims; i++)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
678 {
5760
8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe]
jwe
parents: 5759
diff changeset
679 if (! is.read (reinterpret_cast<char *> (&di), 4))
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
680 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
681 if (swap)
4944
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe]
jwe
parents: 4941
diff changeset
682 swap_bytes<4> (&di);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
683 dv(i) = di;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
684 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
685
5157
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
686 // Convert an array with a single dimension to be a row vector.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
687 // Octave should never write files like this, other software
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
688 // might.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
689
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
690 if (mdims == 1)
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
691 {
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
692 mdims = 2;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
693 dv.resize (mdims);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
694 dv(1) = dv(0);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
695 dv(0) = 1;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
696 }
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe]
jwe
parents: 5105
diff changeset
697
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
698 octave_idx_type nel = dv.numel ();
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
699 Cell tmp(dv);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
700
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
701 for (octave_idx_type i = 0; i < nel; i++)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
702 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
703 octave_value t2;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
704 bool dummy;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
705 std::string doc;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
706
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
707 // recurse to read cell elements
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
708 std::string nm = read_binary_data (is, swap, fmt, std::string (),
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
709 dummy, t2, doc);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
710
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
711 if (nm == CELL_ELT_TAG)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
712 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
713 if (is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
714 tmp.elem (i) = t2;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
715 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
716 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
717 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
718 error ("load: cell array element had unexpected name");
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
719 success = false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
720 break;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
721 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
722 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
723
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
724 if (is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
725 matrix = tmp;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
726 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
727 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
728 error ("load: failed to load matrix constant");
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
729 success = false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
730 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
731
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
732 return success;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
733 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
734
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
735 #if defined (HAVE_HDF5)
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
736
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
737 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
738 octave_cell::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
739 {
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
740 dim_vector dv = dims ();
4837
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
741 int empty = save_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
742 if (empty)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
743 return (empty > 0);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
744
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
745 hsize_t rank = dv.length ();
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
746 hid_t space_hid = -1, data_hid = -1, size_hid = -1;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
747
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
748 data_hid = H5Gcreate (loc_id, name, 0);
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
749
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
750 if (data_hid < 0)
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
751 return false;
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
752
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
753 // Have to save cell array shape, since can't have a
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
754 // dataset of groups....
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
755
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
756 space_hid = H5Screate_simple (1, &rank, 0);
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
757
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
758 if (space_hid < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
759 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
760 H5Gclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
761 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
762 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
763
5351
05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman]
dbateman
parents: 5307
diff changeset
764 OCTAVE_LOCAL_BUFFER (octave_idx_type, hdims, rank);
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
765
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
766 // Octave uses column-major, while HDF5 uses row-major ordering
4933
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe]
jwe
parents: 4837
diff changeset
767 for (hsize_t i = 0; i < rank; i++)
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
768 hdims[i] = dv(rank-i-1);
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
769
5351
05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman]
dbateman
parents: 5307
diff changeset
770 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid,
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
771 H5P_DEFAULT);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
772 if (size_hid < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
773 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
774 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
775 H5Gclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
776 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
777 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
778
5351
05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman]
dbateman
parents: 5307
diff changeset
779 if (! H5Dwrite (size_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL,
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
780 H5P_DEFAULT, hdims) < 0)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
781 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
782 H5Dclose (size_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
783 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
784 H5Gclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
785 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
786 }
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
787
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
788 H5Dclose (size_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
789 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
790
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
791 // Recursively add each element of the cell to this group.
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
792
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
793 Cell tmp = cell_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
794
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
795 for (octave_idx_type i = 0; i < dv.numel (); i++)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
796 {
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5760
diff changeset
797 std::ostringstream buf;
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5760
diff changeset
798 buf << "_" << i;
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5760
diff changeset
799 std::string s = buf.str ();
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
800
5717
34cda7d94c08 [project @ 2006-03-27 22:26:18 by jwe]
jwe
parents: 5715
diff changeset
801 if (! add_hdf5_data(data_hid, tmp.elem (i), s.c_str (), "", false,
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
802 save_as_floats))
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
803 {
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
804 H5Gclose (data_hid);
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
805 return false;
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
806 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
807 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
808
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
809 H5Gclose (data_hid);
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
810
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
811 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
812 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
813
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
814 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
815 octave_cell::load_hdf5 (hid_t loc_id, const char *name,
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
816 bool have_h5giterate_bug)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
817 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
818 bool retval = false;
4837
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
819
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
820 dim_vector dv;
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
821 int empty = load_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
822 if (empty > 0)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
823 matrix.resize(dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
824 if (empty)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
825 return (empty > 0);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
826
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
827 hid_t group_id = H5Gopen (loc_id, name);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
828
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
829 if (group_id < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
830 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
831
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
832 hid_t data_hid = H5Dopen (group_id, "dims");
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
833 hid_t space_hid = H5Dget_space (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
834 hsize_t rank = H5Sget_simple_extent_ndims (space_hid);
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
835 if (rank != 1)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
836 {
4837
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
837 H5Dclose (data_hid);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
838 H5Gclose (group_id);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
839 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
840 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
841
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
842 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
843 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
844
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
845 H5Sget_simple_extent_dims (space_hid, hdims, maxdims);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
846
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
847 // Octave uses column-major, while HDF5 uses row-major ordering.
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
848
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
849 dv.resize (hdims[0]);
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
850
5351
05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman]
dbateman
parents: 5307
diff changeset
851 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, hdims[0]);
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
852
5351
05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman]
dbateman
parents: 5307
diff changeset
853 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL,
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
854 H5P_DEFAULT, tmp) < 0)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
855 {
4837
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
856 H5Dclose (data_hid);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe]
jwe
parents: 4817
diff changeset
857 H5Gclose (group_id);
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
858 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
859 }
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
860
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
861 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
862 H5Gclose (group_id);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
863
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
864 for (hsize_t i = 0, j = hdims[0] - 1; i < hdims[0]; i++, j--)
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
865 dv(j) = tmp[i];
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
866
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
867 hdf5_callback_data dsub;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
868
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
869 herr_t retval2 = -1;
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
870
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
871 Cell m (dv);
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
872
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
873 int current_item = 0;
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
874
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
875 if (have_h5giterate_bug)
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
876 current_item = 1; // Skip dims items in group.
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
877
4696
fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe]
jwe
parents: 4687
diff changeset
878 #ifdef HAVE_H5GGET_NUM_OBJS
fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe]
jwe
parents: 4687
diff changeset
879 hsize_t num_obj = 0;
5060
34a904ac130d [project @ 2004-11-02 03:08:10 by jwe]
jwe
parents: 4994
diff changeset
880 group_id = H5Gopen (loc_id, name);
34a904ac130d [project @ 2004-11-02 03:08:10 by jwe]
jwe
parents: 4994
diff changeset
881 H5Gget_num_objs (group_id, &num_obj);
34a904ac130d [project @ 2004-11-02 03:08:10 by jwe]
jwe
parents: 4994
diff changeset
882 H5Gclose (group_id);
4696
fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe]
jwe
parents: 4687
diff changeset
883 #endif
fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe]
jwe
parents: 4687
diff changeset
884
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
885 for (octave_idx_type i = 0; i < dv.numel (); i++)
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
886 {
4696
fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe]
jwe
parents: 4687
diff changeset
887
fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe]
jwe
parents: 4687
diff changeset
888 #ifdef HAVE_H5GGET_NUM_OBJS
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
889 if (current_item >= static_cast<int> (num_obj))
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
890 retval2 = -1;
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
891 else
4696
fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe]
jwe
parents: 4687
diff changeset
892 #endif
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
893 retval2 = H5Giterate (loc_id, name, &current_item,
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
894 hdf5_read_next_data, &dsub);
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
895
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
896 if (retval2 <= 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
897 break;
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
898
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
899 octave_value ov = dsub.tc;
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
900 m.elem (i) = ov;
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
901
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
902 if (have_h5giterate_bug)
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
903 current_item++; // H5Giterate returned the last index processed.
4814
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe]
jwe
parents: 4791
diff changeset
904
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
905 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
906
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
907 if (retval2 >= 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
908 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
909 matrix = m;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
910 retval = true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
911 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
912
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
913 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
914 }
4815
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe]
jwe
parents: 4814
diff changeset
915
4687
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
916 #endif
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe]
jwe
parents: 4612
diff changeset
917
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
918 DEFUN (iscell, args, ,
3448
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
919 "-*- texinfo -*-\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
920 @deftypefn {Built-in Function} {} iscell (@var{x})\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
921 Return true if @var{x} is a cell array object. Otherwise, return\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
922 false.\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
923 @end deftypefn")
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
924 {
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
925 octave_value retval;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
926
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
927 if (args.length () == 1)
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
928 retval = args(0).is_cell ();
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
929 else
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5805
diff changeset
930 print_usage ();
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
931
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
932 return retval;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
933 }
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
934
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
935 DEFUN (cell, args, ,
3448
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
936 "-*- texinfo -*-\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
937 @deftypefn {Built-in Function} {} cell (@var{x})\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
938 @deftypefnx {Built-in Function} {} cell (@var{n}, @var{m})\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
939 Create a new cell array object. If invoked with a single scalar\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
940 argument, @code{cell} returns a square cell array with the dimension\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
941 specified. If you supply two scalar arguments, @code{cell} takes\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
942 them to be the number of rows and columns. If given a vector with two\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
943 elements, @code{cell} uses the values of the elements as the number of\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
944 rows and columns, respectively.\n\
0fb75d95b14f [project @ 2000-01-17 20:38:31 by jwe]
jwe
parents: 3354
diff changeset
945 @end deftypefn")
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
946 {
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
947 octave_value retval;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
948
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
949 int nargin = args.length ();
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
950
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
951 dim_vector dims;
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
952
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
953 switch (nargin)
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
954 {
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
955 case 0:
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
956 dims = dim_vector (0, 0);
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
957 break;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
958
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
959 case 1:
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
960 get_dimensions (args(0), "cell", dims);
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
961 break;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
962
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
963 default:
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
964 {
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
965 dims.resize (nargin);
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
966
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
967 for (int i = 0; i < nargin; i++)
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
968 {
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
969 dims(i) = args(i).is_empty () ? 0 : args(i).nint_value ();
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
970
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
971 if (error_state)
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
972 {
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
973 error ("cell: expecting scalar arguments");
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
974 break;
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
975 }
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
976 }
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
977 }
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
978 break;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
979 }
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
980
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
981 if (! error_state)
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
982 {
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
983 int ndim = dims.length ();
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
984
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
985 check_dimensions (dims, "cell");
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
986
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
987 if (! error_state)
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
988 {
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
989 switch (ndim)
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
990 {
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
991 case 1:
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
992 retval = Cell (dims(0), dims(0), Matrix ());
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
993 break;
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
994
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
995 default:
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
996 retval = Cell (dims, Matrix ());
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
997 break;
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
998 }
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
999 }
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
1000 }
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4519
diff changeset
1001
3354
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
1002 return retval;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
1003 }
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe]
jwe
parents: 3353
diff changeset
1004
4610
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1005 DEFUN (iscellstr, args, ,
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1006 "-*- texinfo -*-\n\
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1007 @deftypefn {Built-in Function} {} iscellstr (@var{cell})\n\
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1008 Return true if every element of the cell array @var{cell} is a\n\
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1009 character string\n\
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1010 @end deftypefn")
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1011 {
4699
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe]
jwe
parents: 4696
diff changeset
1012 octave_value retval;
4610
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1013
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1014 if (args.length () == 1)
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1015 {
4699
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe]
jwe
parents: 4696
diff changeset
1016 retval = true;
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe]
jwe
parents: 4696
diff changeset
1017
4610
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1018 octave_value arg = args (0);
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1019
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1020 if (arg.is_cell ())
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1021 {
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1022 Cell c = args(0).cell_value ();
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1023
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1024 if (! error_state)
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1025 {
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1026 for (int i = 0; i < c.length (); i++)
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1027 {
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1028 if (! c(i).is_string ())
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1029 {
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1030 retval = false;
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1031 break;
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1032 }
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1033 }
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1034 }
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1035 else
4817
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1036 retval = false;
4610
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1037 }
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1038 else
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1039 retval = false;
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1040 }
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1041 else
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5805
diff changeset
1042 print_usage ();
4610
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1043
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1044 return retval;
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1045 }
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe]
jwe
parents: 4604
diff changeset
1046
4817
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1047 // Note that since Fcellstr calls Fiscellstr, we need to have
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1048 // Fiscellstr defined first (to provide a declaration) and also we
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1049 // should keep it in the same file (so we don't have to provide a
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1050 // declaration) and so we don't have to use feval to call it.
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1051
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1052 DEFUN (cellstr, args, ,
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1053 "-*- texinfo -*-\n\
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1054 @deftypefn {Built-in Function} {} cellstr (@var{string})\n\
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1055 Create a new cell array object from the elements of the string\n\
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1056 array @var{string}.\n\
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1057 @end deftypefn")
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1058 {
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1059 octave_value retval;
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1060
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1061 if (args.length () == 1)
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1062 {
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1063 octave_value_list tmp = Fiscellstr (args, 1);
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1064
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1065 if (tmp(0).is_true ())
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1066 retval = args(0);
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1067 else
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1068 {
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1069 string_vector s = args(0).all_strings ();
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1070
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1071 if (! error_state)
5805
5bfb24f90bdd [project @ 2006-05-10 21:15:37 by jwe]
jwe
parents: 5775
diff changeset
1072 retval = Cell (s, true);
4817
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1073 else
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1074 error ("cellstr: expecting argument to be a 2-d character array");
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1075 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1076 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1077 else
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5805
diff changeset
1078 print_usage ();
4817
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1079
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1080 return retval;
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1081 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe]
jwe
parents: 4815
diff changeset
1082
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1083 DEFUN (struct2cell, args, ,
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1084 "-*- texinfo -*-\n\
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1085 @deftypefn {Built-in Function} {} struct2cell (@var{S})\n\
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1086 Create a new cell array from the objects stored in the struct object.\n\
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1087 If @var{f} is the number of fields in the structure, the resulting\n\
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1088 cell array will have a dimension vector corresponding to\n\
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1089 @code{[@var{F} size(@var{S})]}.\n\
5642
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe]
jwe
parents: 5360
diff changeset
1090 @seealso{cell2struct, fieldnames}\n\
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe]
jwe
parents: 5360
diff changeset
1091 @end deftypefn")
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1092 {
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1093 octave_value retval;
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1094
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1095 int nargin = args.length ();
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1096
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1097 if (nargin == 1)
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1098 {
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1099 Octave_map m = args(0).map_value ();
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1100
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1101 if (! error_state)
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1102 {
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1103 dim_vector m_dv = m.dims ();
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1104
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1105 string_vector keys = m.keys ();
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1106
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
1107 octave_idx_type fields_numel = keys.length ();
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1108
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1109 // The resulting dim_vector should have dimensions:
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1110 // [numel(fields) size(struct)]
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1111
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1112 dim_vector result_dv;
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1113 result_dv.resize (m_dv.length () + 1); // Add 1 for the fields.
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1114
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1115 result_dv(0) = fields_numel;
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1116
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1117 for (int i = 1; i < result_dv.length (); i++)
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1118 result_dv(i) = m_dv(i-1);
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1119
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1120 // Squeeze to be sure that a (3,1) vector doesn't get turned
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1121 // into a (3,3,1) vector.
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1122
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1123 result_dv = result_dv.squeeze ();
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1124
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1125 Cell c (result_dv);
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1126
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1127 // Use ra_idx both for counting and for assignments, so
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1128 // ra_idx(0) will both contain fields_numel for each call to
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1129 // increment_index and j for each assignment.
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1130
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
1131 Array<octave_idx_type> ra_idx (result_dv.length (), 0);
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1132 ra_idx(0) = fields_numel;
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1133
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
1134 for (octave_idx_type i = 0; i < m_dv.numel (); i++)
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1135 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5164
diff changeset
1136 for (octave_idx_type j = 0; j < fields_numel; j++)
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1137 {
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1138 ra_idx(0) = j;
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1139
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1140 Cell c_tmp = m.contents (keys(j));
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1141
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1142 if (c_tmp.length () > 1) // Is a cell.
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1143 c(ra_idx) = c_tmp;
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1144 else if (c_tmp.length () == 1) // Get octave_value.
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1145 c(ra_idx) = c_tmp(0);
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1146 else
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1147 c(ra_idx) = Cell ();
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1148
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1149 ra_idx(0) = fields_numel;
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1150 }
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1151
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1152 increment_index (ra_idx, result_dv);
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1153 }
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1154
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1155 retval = c;
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1156 }
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1157 else
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1158 error ("struct2cell: expecting argument to be a cell array");
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1159 }
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1160 else
5823
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe]
jwe
parents: 5805
diff changeset
1161 print_usage ();
4764
86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe]
jwe
parents: 4762
diff changeset
1162
4762
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1163 return retval;
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1164 }
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe]
jwe
parents: 4722
diff changeset
1165
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
1166 /*
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
1167 ;;; Local Variables: ***
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
1168 ;;; mode: C++ ***
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
1169 ;;; End: ***
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
1170 */