Skip to content

Commit 26c90f5

Browse files
authored
...
1 parent cfca79d commit 26c90f5

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

Funz/inst/Funz/Funz.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -856,12 +856,15 @@ def Funz_Run_results(runshell, out_filter):
856856
"state","duration","calc"
857857
])
858858
results = _JMapToPMap(jresults, out_filter)
859-
ios = _Funz_Last_run['output_expressions']+list(_Funz_Last_run['input_variables'])
860-
if not ios is None:
861-
for io in ios:# Try to cast I/O values to R numeric
862-
try:
863-
results[io] = numpy.float_(results[io])
864-
except: pass
859+
ios = list()
860+
if _Funz_Last_run['output_expressions'] is not None:
861+
ios = ios+list(_Funz_Last_run['output_expressions'])
862+
if _Funz_Last_run['input_variables'] is not None:
863+
ios = ios+list(_Funz_Last_run['input_variables'])
864+
for io in ios:# Try to cast I/O values to R numeric
865+
try:
866+
results[io] = numpy.float_(results[io])
867+
except: pass
865868
_Funz_Last_run['results'] = results
866869

867870
return(results)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setuptools.setup(
44
name='Funz',
5-
version='1.15-4',
5+
version='1.15-5',
66
scripts=['Funz/client.py','Funz/calculator.py','Funz/install.py','Funz/inst/Funz/Funz.py'] ,
77
author="Yann Richet",
88
author_email="[email protected]",

0 commit comments

Comments
 (0)