Skip to content

Proposed fix for the string heuristics issue. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jim-rafferty wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Proposed fix for the string heuristics issue. #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 7 additions & 20 deletions mat73_to_pickle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,10 @@ def recursive_dict(f, root=None, name='root'):
return np.array(f, dtype=dtype).squeeze()
elif f.dtype.name in ['uint16']: # this may be a string for Matlab
add_dtype_name(f, name)
try:
if 'MATLAB_int_decode' in f.attrs.keys(): # this key is only present if f is a string
return string(f)
except ValueError: # it wasn't...
print "WARNING:", name, ":"
print "\t", f
print "\t CONVERSION TO STRING FAILED, USING ARRAY!"
tmp = np.array(f).squeeze()
print "\t", tmp
return tmp
pass
else:
return np.array(f, dtype=np.uint16).squeeze() # otherwise it's a uint16
elif f.dtype.name=='object': # this is a 2D array of HDF5 object references or just objects
add_dtype_name(f, name)
container = []
Expand Down Expand Up @@ -155,17 +149,10 @@ def __recursive(self, f, root):
raise MemoryError
return np.array(f, dtype=dtype).squeeze()
elif f.dtype.name in ['uint16']: # this may be a string for Matlab
# print "STRING!"
try:
return string(f)
except ValueError: # it wasn't...
print "WARNING:", self.__name, ":"
print "\t", f
print "\t CONVERSION TO STRING FAILED, USING ARRAY!"
tmp = np.array(f).squeeze()
print "\t", tmp
return tmp
pass
if 'MATLAB_int_decode' in f.attrs.keys():
return string(f)
else:
return np.array(f, dtype=np.uint16).squeeze()
elif f.dtype.name=='object': # this is a 2D array of HDF5 object references or just objects
# print "OBJECT!"
container = []
Expand Down