Skip to content

Commit b7689ed

Browse files
committed
[Bug fix] StructArray now passed as 1D list (#17)
1 parent 265bc5f commit b7689ed

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

spm/__wrapper__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def _cast_argin(arg):
186186
arg = arg._as_matlab_object()
187187
if isinstance(arg, dict):
188188
_, arg = Runtime._process_argin(**arg)
189-
elif isinstance(arg, (tuple, dict, list, set)):
189+
elif isinstance(arg, (tuple, list, set)):
190190
arg, _ = Runtime._process_argin(*arg)
191191
return arg
192192

@@ -298,7 +298,7 @@ def __init__(self, *structs):
298298
self._structs = structs
299299
self._objdict = dict(
300300
type__='structarray',
301-
size__=np.array(structs.shape),
301+
size__=np.array([[*structs.shape]]),
302302
data__=[]
303303
)
304304

@@ -327,7 +327,7 @@ def _as_matlab_object(self):
327327
)
328328
)]
329329
objdict = self._objdict
330-
objdict['data__'] = self._structs.tolist()
330+
objdict['data__'] = np.reshape(self._structs, (-1,), order='F').tolist()
331331
return objdict
332332

333333
def __repr__(self):

0 commit comments

Comments
 (0)