florent/idefix
florent/idefix
1
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Florent Guiotte 2019-03-26 17:32:50 +01:00
commit dddd558aeb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
idefix/io.py
View File

@ -91,7 +91,7 @@ def load_txt(fname, header, delimiter=' '):
---------- ----------
fname : str, Path fname : str, Path
Path to the text file to load. Path to the text file to load.
header : array header : array, tuple
Names of the columns contained in the text point cloud file. Names of the columns contained in the text point cloud file.
delimiter : str, optional delimiter : str, optional
String used to separate values. The default is whitespace. String used to separate values. The default is whitespace.
@ -132,7 +132,7 @@ def load_txt(fname, header, delimiter=' '):
dtype=[('spatial', np.float, 3)]) dtype=[('spatial', np.float, 3)])
log.debug('Extract feature data') log.debug('Extract feature data')
header_c = header.copy() header_c = list(header)
for i in ('x', 'y', 'z'): for i in ('x', 'y', 'z'):
header_c.remove(i) header_c.remove(i)

5
test/test_io.py
View File

@ -66,6 +66,11 @@ def test_load_txt(datadir, fname, head, separator, exp_point_count, exp_field_co
except IOError: except IOError:
pytest.fail('Opening legit file without exception') pytest.fail('Opening legit file without exception')
try:
result = io.load_txt(fname, tuple(head), separator)
except Exception:
pytest.fail('Opening legit file with legit header')
assert result.size == exp_point_count, "Return correct point count" assert result.size == exp_point_count, "Return correct point count"
assert result['spatial'].shape[-1] == 3, "Return ndarray with spatial field" assert result['spatial'].shape[-1] == 3, "Return ndarray with spatial field"