Mercurial > pytave

annotate @pyobject/subsref.m @ 317:461f333daf67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix multi-indexing conversion to tuple * @pyobject/subsref.m: Fix indexing.
author Colin Macdonald <cbm@m.fsf.org>
date Wed, 10 Aug 2016 00:46:53 -0700
parents 6bba42371afa
children 1231dc878600
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
1 ## Copyright (C) 2016 Colin B. Macdonald
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
2 ##
246
4acc64f89d67 maint: fix copyright header comment blocks
Mike Miller <mtmiller@octave.org>
parents: 245
diff changeset
3 ## This file is part of Pytave
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
4 ##
246
4acc64f89d67 maint: fix copyright header comment blocks
Mike Miller <mtmiller@octave.org>
parents: 245
diff changeset
5 ## Pytave is free software; you can redistribute it and/or modify
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
6 ## it under the terms of the GNU General Public License as published
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
7 ## by the Free Software Foundation; either version 3 of the License,
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
8 ## or (at your option) any later version.
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
9 ##
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
10 ## This software is distributed in the hope that it will be useful,
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
11 ## but WITHOUT ANY WARRANTY; without even the implied warranty
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
12 ## of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
13 ## the GNU General Public License for more details.
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
14 ##
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
16 ## License along with this software; see the file COPYING.
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
17 ## If not, see <http://www.gnu.org/licenses/>.
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
18
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
19 ## -*- texinfo -*-
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
20 ## @documentencoding UTF-8
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
21 ## @defop Method @@pyobject subsref (@var{x}, @var{idx})
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
22 ## @defopx Operator @@pyobject {@var{x}.@var{property}} {}
238
c64435b14a6e Minor doc fix
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
23 ## @defopx Operator @@pyobject {@var{x}.@var{method}(@var{a}, @dots{})} {}
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
24 ## @defopx Operator @@pyobject {@var{x}@{@var{i}@}} {}
238
c64435b14a6e Minor doc fix
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
25 ## @defopx Operator @@pyobject {@var{x}@{@var{i}, @var{j}, @dots{}@}} {}
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
26 ## @defopx Operator @@pyobject {@var{x}(@var{a})} {}
238
c64435b14a6e Minor doc fix
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
27 ## @defopx Operator @@pyobject {@var{x}(@var{a}, @var{b}, @dots{})} {}
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
28 ## Call methods and access properties of a Python object.
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
29 ##
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
30 ##
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
31 ## @seealso{@@pyobject/subsasgn}
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
32 ## @end defop
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
33
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
34
244
46382ade33e4 maint: minor cosmetic fixes to cset 708715efa18e
Mike Miller <mtmiller@octave.org>
parents: 243
diff changeset
35 function varargout = subsref (x, idx)
240
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
36
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
37 t = idx(1);
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
38 switch t.type
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
39 case "()"
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
40 r = pycall (x, t.subs{:});
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
41
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
42 case "."
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
43 assert (ischar (t.subs))
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
44 r = pycall ("getattr", x, t.subs);
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
45
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
46 case "{}"
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
47 ## Subtract one from index: do this for lists, numpy arrays, etc
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
48 pyexec ("import collections")
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
49 pyexec ("import numpy")
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
50 x_is_list = pycall (pyeval (
262
0a8983533192 * @pyobject/subsref.m: Fix small lambda syntax error with Python 3.
Mike Miller <mtmiller@octave.org>
parents: 260
diff changeset
51 "lambda x: isinstance(x, (collections.Sequence, numpy.ndarray))"),
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
52 x);
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
53 for i = 1:length(t.subs)
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
54 j = t.subs{i};
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
55 if (isindex (j) && isnumeric (j) && x_is_list)
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
56 t.subs{i} = cast (j, class (sizemax ())) - 1;
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
57 endif
240
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
58 endfor
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
59
288
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
60 if (ischar (t.subs{1}) && strcmp (t.subs{1}, ":"))
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
61 is_map = pyeval ("lambda x: isinstance(x, collections.Mapping)");
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
62 if (pycall (is_map, x))
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
63 ind = ":";
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
64 else
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
65 ind = int32 ([1:length(x)] - 1);
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
66 endif
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
67 elseif (isscalar (t.subs))
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
68 ind = t.subs{1};
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
69 else
317
461f333daf67 Fix multi-indexing conversion to tuple
Colin Macdonald <cbm@m.fsf.org>
parents: 314
diff changeset
70 ind = pycall ("tuple", t.subs);
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
71 endif
288
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
72
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
73 gi = pycall ("getattr", x, "__getitem__"); # x.__getitem__
288
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
74 if (isnumeric (ind) && length (ind) > 1)
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
75 r = {};
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
76 for k = 1:length (ind)
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
77 r(end+1) = pycall (gi, ind(k));
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
78 endfor
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
79 else
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
80 r = pycall (gi, ind);
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
81 endif
240
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
82
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
83 otherwise
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
84 t
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
85 error ("@pyobject/subsref: not implemented")
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
86 endswitch
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
87
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
88 ## deal with additional indexing (might be recursive)
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
89 if (length (idx) > 1)
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
90 r = subsref (r, idx(2:end));
245
72a2f508f2d8 maint: Use Octave keywords for ending code blocks
Mike Miller <mtmiller@octave.org>
parents: 244
diff changeset
91 endif
240
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
92
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
93 ## unpack results, ensure "ans" works (see also pycall)
248
2e4c9ce0c83c maint: prefer Octave lowercase naming convention to camelCase
Mike Miller <mtmiller@octave.org>
parents: 246
diff changeset
94 is_none = pyeval ("lambda x: x is None");
274
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
95 if (nargout == 0 && ! pycall (is_none, r))
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
96 varargout{1} = r;
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
97 elseif (nargout == 1)
240
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
98 varargout{1} = r;
274
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
99 elseif (nargout >= 2)
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
100 assert (length (r) == nargout, ...
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
101 "pyobject/subsref: number of outputs must match")
288
f5282c87e5d5 Fix cell indexing for pyobject in subsref
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 275
diff changeset
102 [varargout{1:nargout}] = subsref (r, struct ("type", "{}", "subs", {{1:nargout}}));
245
72a2f508f2d8 maint: Use Octave keywords for ending code blocks
Mike Miller <mtmiller@octave.org>
parents: 244
diff changeset
103 endif
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
104 endfunction
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
105
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
106
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
107 %!test
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
108 %! % list indexing
312
d9f9156a13c9 Remove unncessary calls to fromPythonVarName
Colin Macdonald <cbm@m.fsf.org>
parents: 299
diff changeset
109 %! L = pyeval ("[10, 20]");
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
110 %! assert (L{1}, 10)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
111 %! assert (L{2}, 20)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
112
290
f2b4576879a6 Edit tests in subsref to use and verify cell indexing
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 288
diff changeset
113 %!test
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
114 %! % list indexing, slice
312
d9f9156a13c9 Remove unncessary calls to fromPythonVarName
Colin Macdonald <cbm@m.fsf.org>
parents: 299
diff changeset
115 %! L = pyeval ("[10, 20, [30, 40]]");
297
e7ee2c2e64e8 undo recent unnecessary change to slice test
Colin Macdonald <cbm@m.fsf.org>
parents: 290
diff changeset
116 %! L2 = L{:};
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
117 %! assert (L2{1}, 10)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
118 %! assert (L2{2}, 20)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
119 %! assert (L2{3}{1}, 30)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
120 %! assert (L2{3}{2}, 40)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
121
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
122 %!test
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
123 %! % list indexing, nested list
312
d9f9156a13c9 Remove unncessary calls to fromPythonVarName
Colin Macdonald <cbm@m.fsf.org>
parents: 299
diff changeset
124 %! L = pyeval ("[1, 2, [10, 11, 12]]");
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
125 %! assert (L{2}, 2)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
126 %! assert (L{3}{1}, 10)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
127 %! assert (L{3}{3}, 12)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
128
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
129 %!test
299
714d1bf1ef78 Add test of multivariable output from subsref
Colin Macdonald <cbm@m.fsf.org>
parents: 297
diff changeset
130 %! % list indexing, assign to vars
714d1bf1ef78 Add test of multivariable output from subsref
Colin Macdonald <cbm@m.fsf.org>
parents: 297
diff changeset
131 %! L = pyeval ("[1, 2, 'Octave']");
714d1bf1ef78 Add test of multivariable output from subsref
Colin Macdonald <cbm@m.fsf.org>
parents: 297
diff changeset
132 %! [a, b, c] = L{:};
714d1bf1ef78 Add test of multivariable output from subsref
Colin Macdonald <cbm@m.fsf.org>
parents: 297
diff changeset
133 %! assert (a, 1)
714d1bf1ef78 Add test of multivariable output from subsref
Colin Macdonald <cbm@m.fsf.org>
parents: 297
diff changeset
134 %! assert (b, 2)
714d1bf1ef78 Add test of multivariable output from subsref
Colin Macdonald <cbm@m.fsf.org>
parents: 297
diff changeset
135 %! assert (c, "Octave")
714d1bf1ef78 Add test of multivariable output from subsref
Colin Macdonald <cbm@m.fsf.org>
parents: 297
diff changeset
136
714d1bf1ef78 Add test of multivariable output from subsref
Colin Macdonald <cbm@m.fsf.org>
parents: 297
diff changeset
137 %!test
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
138 %! % 2D array indexing
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
139 %! pyexec ("import numpy")
312
d9f9156a13c9 Remove unncessary calls to fromPythonVarName
Colin Macdonald <cbm@m.fsf.org>
parents: 299
diff changeset
140 %! A = pyobject (pyeval ("numpy.array([[1, 2], [3, 4]])"));
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
141 %! assert (A{1, 1}, 1)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
142 %! assert (A{2, 1}, 3)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
143 %! assert (A{1, 2}, 2)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
144
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
145 %!test
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
146 %! % dict: str key access
312
d9f9156a13c9 Remove unncessary calls to fromPythonVarName
Colin Macdonald <cbm@m.fsf.org>
parents: 299
diff changeset
147 %! d = pyeval ("{'one':1, 5:5, 6:6}");
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
148 %! assert (d{"one"}, 1)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
149
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
150 %!test
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
151 %! % dict: integer key access
312
d9f9156a13c9 Remove unncessary calls to fromPythonVarName
Colin Macdonald <cbm@m.fsf.org>
parents: 299
diff changeset
152 %! d = pyeval ("{5:42, 6:42}");
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
153 %! assert (d{6}, 42)
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
154
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
155 %!test
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
156 %! % dict: integer key should not subtract one
312
d9f9156a13c9 Remove unncessary calls to fromPythonVarName
Colin Macdonald <cbm@m.fsf.org>
parents: 299
diff changeset
157 %! d = pyeval ("{5:40, 6:42}");
221
a76d75683455 pyobject: split subsref to its own file, reformat
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
158 %! assert (d{6}, 42)
240
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
159
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
160 %!test
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
161 %! % dict: floating point keys should work
312
d9f9156a13c9 Remove unncessary calls to fromPythonVarName
Colin Macdonald <cbm@m.fsf.org>
parents: 299
diff changeset
162 %! d = pyeval ("{5.5:'ok'}");
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
163 %! assert (d{5.5}, "ok")
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
164
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
165 %!test
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
166 %! % dict: make sure key ":" doesn't break anything
312
d9f9156a13c9 Remove unncessary calls to fromPythonVarName
Colin Macdonald <cbm@m.fsf.org>
parents: 299
diff changeset
167 %! d = pyeval ("{'a':1, ':':2}");
260
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
168 %! assert (d{'a'}, 1)
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
169 %! assert (d{':'}, 2)
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
170
daf1aff501f1 indexing: fix off-by-one with dicts (fixes issue #10)
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
171 %!test
240
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
172 %! % method call with args
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
173 %! s = pyeval ("set({1, 2})");
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
174 %! s.add (42)
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
175 %! assert (length (s) == 3)
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
176
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
177 %!test
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
178 %! % get a callable
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
179 %! s = pyeval ("set({1, 2})");
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
180 %! sa = s.add;
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
181 %! assert (isa (sa, "pyobject"))
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
182 %! % and then call it
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
183 %! sa (42)
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
184 %! assert (length (s) == 3)
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
185
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
186 %!test
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
187 %! % callable can return something
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
188 %! s = pyeval ("set({1, 2})");
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
189 %! v = s.pop ();
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
190 %! assert (length (s) == 1)
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
191 %! assert (v == 1 || v == 2)
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
192
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
193 %!test
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
194 %! % chain
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
195 %! pyexec ("import sys")
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
196 %! s = pyeval ("set({sys})");
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
197 %! ver = s.pop ().version;
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
198 %! assert (ischar (ver))
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
199
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
200 %!test
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
201 %! % don't set "ans" if no return value
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
202 %! s = pyeval ("set({1, 2})");
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
203 %! sa = s.add;
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
204 %! clear ans
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
205 %! sa (42)
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
206 %! assert (! exist ("ans", "var"))
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
207
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
208 %!test
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
209 %! % *do* set "ans" if return value
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
210 %! s = pyeval ("set({1, 2})");
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
211 %! clear ans
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
212 %! s.pop ();
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
213 %! assert (exist ("ans", "var"))
708715efa18e pyobject: support callables with arguments (fixes issue #18)
Colin Macdonald <cbm@m.fsf.org>
parents: 227
diff changeset
214 %! assert (length (s) == 1)
274
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
215
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
216 %!test
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
217 %! % multiple return values: can get all of them
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
218 %! f = pyeval ("lambda: (1, 2, 3)");
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
219 %! a = f ();
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
220 %! assert (length (a) == 3)
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
221
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
222 %!test
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
223 %! % multiple return values: separate them
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
224 %! f = pyeval ("lambda: (1, 2, 3)");
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
225 %! [a, b, c] = f ();
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
226 %! assert (a, 1)
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
227 %! assert (b, 2)
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
228 %! assert (c, 3)
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
229
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
230 %!test
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
231 %! % multiple return values: set ans
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
232 %! f = pyeval ("lambda: (1, 2, 3)");
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
233 %! f ();
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
234 %! assert (length (ans) == 3)
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
235
290
f2b4576879a6 Edit tests in subsref to use and verify cell indexing
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 288
diff changeset
236 %!test
f2b4576879a6 Edit tests in subsref to use and verify cell indexing
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 288
diff changeset
237 %! % ensure None is returned if nargout > 0
f2b4576879a6 Edit tests in subsref to use and verify cell indexing
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 288
diff changeset
238 %! L = pyeval ("[1, None, 3]");
f2b4576879a6 Edit tests in subsref to use and verify cell indexing
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 288
diff changeset
239 %! a = L{2};
f2b4576879a6 Edit tests in subsref to use and verify cell indexing
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 288
diff changeset
240 %! assert (char (a), "None")
f2b4576879a6 Edit tests in subsref to use and verify cell indexing
Abhinav Tripathi <genuinelucifer@gmail.com>
parents: 288
diff changeset
241
274
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
242 %!error <outputs must match>
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
243 %! % multiple return values: too many outputs
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
244 %! f = pyeval ("lambda: (1, 2)");
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
245 %! [a, b, c] = f ();
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
246
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
247 %!error <outputs must match>
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
248 %! % multiple return values: not enough outputs
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
249 %! f = pyeval ("lambda: (1, 2, 3)");
decd3bd7da7e Partial support for multiple outputs from callables
Colin Macdonald <cbm@m.fsf.org>
parents: 248
diff changeset
250 %! [a, b] = f ();