ANL-CEEESA/MIPLearn
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/MIPLearn.git synced 2025-12-06 01:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Sample: handle None in vectors

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-07-27 10:37:02 -05:00
parent 284ba15db6
commit 3da8d532a8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
miplearn/features/sample.py
View File

@@ -189,7 +189,9 @@ class Hdf5Sample(Sample):
assert len(ds.shape) == 1 assert len(ds.shape) == 1
print(ds.dtype) print(ds.dtype)
if h5py.check_string_dtype(ds.dtype): if h5py.check_string_dtype(ds.dtype):
return ds.asstr()[:].tolist() result = ds.asstr()[:].tolist()
result = [r if len(r) > 0 else None for r in result]
return result
else: else:
return ds[:].tolist() return ds[:].tolist()
@@ -218,7 +220,8 @@ class Hdf5Sample(Sample):
if value is None: if value is None:
return return
self._assert_is_vector(value) self._assert_is_vector(value)
self._put(key, value) modified = [v if v is not None else "" for v in value]
self._put(key, modified)
@overrides @overrides
def put_vector_list(self, key: str, value: VectorList) -> None: def put_vector_list(self, key: str, value: VectorList) -> None:

2
tests/features/test_sample.py
View File

@@ -24,7 +24,7 @@ def _test_sample(sample: Sample) -> None:
_assert_roundtrip_scalar(sample, 1.0) _assert_roundtrip_scalar(sample, 1.0)
# Vector # Vector
_assert_roundtrip_vector(sample, ["A", "BB", "CCC", "こんにちは"]) _assert_roundtrip_vector(sample, ["A", "BB", "CCC", "こんにちは", None])
_assert_roundtrip_vector(sample, [True, True, False]) _assert_roundtrip_vector(sample, [True, True, False])
_assert_roundtrip_vector(sample, [1, 2, 3]) _assert_roundtrip_vector(sample, [1, 2, 3])
_assert_roundtrip_vector(sample, [1.0, 2.0, 3.0]) _assert_roundtrip_vector(sample, [1.0, 2.0, 3.0])