Skip to content

Commit 20b29e0

Browse files
dsehnaldsehnal
committed
encoder tests
1 parent a415c28 commit 20b29e0

File tree

9 files changed

+42
-53
lines changed

9 files changed

+42
-53
lines changed

‎ciftools/bin/encoder.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import math
22
import sys
3-
from typing import Any, List, Union
3+
from typing import Any, List, Protocol, Union
44

55
import numpy as np
66
from ciftools.bin.data_types import DataType, DataTypeEnum
@@ -17,8 +17,12 @@
1717
)
1818

1919

20-
class BinaryCIFEncoder:
21-
def __init__(self, encoders: List["BinaryCIFEncoder"]):
20+
class BinaryCIFEncoder(Protocol):
21+
def encode(self, data: Any) -> EncodedCIFData:
22+
...
23+
24+
class Compose(BinaryCIFEncoder):
25+
def __init__(self, *encoders: List["BinaryCIFEncoder"]):
2226
self.encoders = encoders
2327

2428
def encode(self, data: Any) -> EncodedCIFData:
@@ -289,8 +293,8 @@ def encode(self, data: np.ndarray) -> EncodedCIFData:
289293

290294

291295
# TODO: use classifier once implemented
292-
_OFFSET_ENCODER = BinaryCIFEncoder([DELTA, INTEGER_PACKING])
293-
_DATA_ENCODER = BinaryCIFEncoder([DELTA, RUN_LENGTH, INTEGER_PACKING])
296+
_OFFSET_ENCODER = Compose(DELTA, INTEGER_PACKING)
297+
_DATA_ENCODER = Compose(DELTA, RUN_LENGTH, INTEGER_PACKING)
294298

295299

296300
class StringArray(BinaryCIFEncoder):

‎tests/_run_all_tests.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"interval_quantization",
99
"run_length",
1010
"string_array",
11-
"_decoding",
12-
"_encoding",
11+
# "_decoding",
12+
# "_encoding",
1313
]
1414

1515
suite = unittest.TestSuite()

‎tests/byte_array.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
import msgpack
44
import numpy as np
5-
from ciftools.binary.decoder import decode_cif_data
6-
from ciftools.binary.encoding.data_types import DataTypeEnum
7-
from ciftools.binary.encoding.impl.binary_cif_encoder import BinaryCIFEncoder
8-
from ciftools.binary.encoding.impl.encoders.byte_array import BYTE_ARRAY_CIF_ENCODER
5+
from ciftools.bin.decoder import decode_cif_data
6+
from ciftools.bin.data_types import DataTypeEnum
7+
from ciftools.bin.encoder import BYTE_ARRAY
98

109

1110
# noinspection PyTypedDict
@@ -31,8 +30,7 @@ def test(self):
3130
]
3231

3332
for test_arr, expected_type in test_suite:
34-
encoder = BinaryCIFEncoder([BYTE_ARRAY_CIF_ENCODER])
35-
encoded = encoder.encode_cif_data(test_arr)
33+
encoded = BYTE_ARRAY.encode(test_arr)
3634

3735
msgpack.loads(msgpack.dumps(encoded))
3836

‎tests/delta.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@
22

33
import msgpack
44
import numpy as np
5-
from ciftools.binary.decoder import decode_cif_data
6-
from ciftools.binary.encoding.impl.binary_cif_encoder import BinaryCIFEncoder
7-
from ciftools.binary.encoding.impl.encoders.byte_array import BYTE_ARRAY_CIF_ENCODER
8-
from ciftools.binary.encoding.impl.encoders.delta import DELTA_CIF_ENCODER
5+
from ciftools.bin.decoder import decode_cif_data
6+
from ciftools.bin.encoder import BYTE_ARRAY, DELTA, Compose
97

108

119
class TestEncodings_Delta(unittest.TestCase):
1210
def test(self):
1311
test_arr = np.array([1, 1, 2, 2, 10, -10])
1412

15-
encoder = BinaryCIFEncoder([DELTA_CIF_ENCODER, BYTE_ARRAY_CIF_ENCODER])
13+
encoder = Compose(DELTA, BYTE_ARRAY)
1614

17-
encoded = encoder.encode_cif_data(test_arr)
15+
encoded = encoder.encode(test_arr)
1816
msgpack.loads(msgpack.dumps(encoded))
1917
decoded = decode_cif_data(encoded)
2018

‎tests/fixed_point.py‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22

33
import msgpack
44
import numpy as np
5-
from ciftools.binary.decoder import decode_cif_data
6-
from ciftools.binary.encoding.impl.binary_cif_encoder import BinaryCIFEncoder
7-
from ciftools.binary.encoding.impl.encoders.byte_array import BYTE_ARRAY_CIF_ENCODER
8-
from ciftools.binary.encoding.impl.encoders.delta import DELTA_CIF_ENCODER
9-
from ciftools.binary.encoding.impl.encoders.fixed_point import FixedPointCIFEncoder
5+
from ciftools.bin.decoder import decode_cif_data
6+
from ciftools.bin.encoder import BYTE_ARRAY, DELTA, FixedPoint, Compose
107

118

129
class TestEncodings_FixedPoint(unittest.TestCase):
@@ -20,8 +17,8 @@ def test(self):
2017
]
2118

2219
for test_arr, e in test_suite:
23-
encoder = BinaryCIFEncoder([FixedPointCIFEncoder(10**e), BYTE_ARRAY_CIF_ENCODER])
24-
encoded = encoder.encode_cif_data(test_arr)
20+
encoder = Compose(FixedPoint(10**e), BYTE_ARRAY)
21+
encoded = encoder.encode(test_arr)
2522
decoded = decode_cif_data(encoded)
2623

2724
self.assertTrue(np.allclose(test_arr, decoded, atol=10 ** (-e)))
@@ -39,8 +36,8 @@ def test(self):
3936
]
4037

4138
for test_arr, e in test_suite:
42-
encoder = BinaryCIFEncoder([FixedPointCIFEncoder(10**e), DELTA_CIF_ENCODER, BYTE_ARRAY_CIF_ENCODER])
43-
encoded = encoder.encode_cif_data(test_arr)
39+
encoder = Compose(FixedPoint(10**e), DELTA, BYTE_ARRAY)
40+
encoded = encoder.encode(test_arr)
4441
msgpack.loads(msgpack.dumps(encoded))
4542
decoded = decode_cif_data(encoded)
4643

‎tests/integer_packing.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import msgpack
44
import numpy as np
5-
from ciftools.binary.decoder import decode_cif_data
6-
from ciftools.binary.encoding.impl.binary_cif_encoder import BinaryCIFEncoder
7-
from ciftools.binary.encoding.impl.encoders.integer_packing import INTEGER_PACKING_CIF_ENCODER
5+
6+
from ciftools.bin.decoder import decode_cif_data
7+
from ciftools.bin.encoder import INTEGER_PACKING
88

99

1010
# noinspection PyTypedDict
@@ -18,8 +18,7 @@ def test(self):
1818
]
1919

2020
for test_arr, is_unsigned, byte_count in test_suite:
21-
encoder = BinaryCIFEncoder([INTEGER_PACKING_CIF_ENCODER])
22-
encoded = encoder.encode_cif_data(test_arr)
21+
encoded = INTEGER_PACKING.encode(test_arr)
2322
decoded = decode_cif_data(encoded)
2423
msgpack.loads(msgpack.dumps(encoded))
2524

‎tests/interval_quantization.py‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import msgpack
44
import numpy as np
5-
from ciftools.binary.decoder import decode_cif_data
6-
from ciftools.binary.encoding.data_types import DataTypeEnum
7-
from ciftools.binary.encoding.impl.binary_cif_encoder import BinaryCIFEncoder
8-
from ciftools.binary.encoding.impl.encoders.byte_array import BYTE_ARRAY_CIF_ENCODER
9-
from ciftools.binary.encoding.impl.encoders.interval_quantization import IntervalQuantizationCIFEncoder
5+
from ciftools.bin.decoder import decode_cif_data
6+
from ciftools.bin.data_types import DataTypeEnum
7+
from ciftools.bin.encoder import IntervalQuantization, BYTE_ARRAY, Compose
108

119

1210
class TestEncodings_IntervalQuantization(unittest.TestCase):
@@ -22,10 +20,8 @@ def test(self):
2220

2321
for test_arr, steps, dtype in test_suite:
2422
low, high = np.min(test_arr), np.max(test_arr)
25-
encoder = BinaryCIFEncoder(
26-
[IntervalQuantizationCIFEncoder(low, high, steps, dtype), BYTE_ARRAY_CIF_ENCODER]
27-
)
28-
encoded = encoder.encode_cif_data(test_arr)
23+
encoder = Compose(IntervalQuantization(low, high, steps, dtype), BYTE_ARRAY)
24+
encoded = encoder.encode(test_arr)
2925
msgpack.loads(msgpack.dumps(encoded))
3026
decoded = decode_cif_data(encoded)
3127

‎tests/run_length.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
import msgpack
44
import numpy as np
5-
from ciftools.binary.decoder import decode_cif_data
6-
from ciftools.binary.encoding.impl.binary_cif_encoder import BinaryCIFEncoder
7-
from ciftools.binary.encoding.impl.encoders.byte_array import BYTE_ARRAY_CIF_ENCODER
8-
from ciftools.binary.encoding.impl.encoders.run_length import RUN_LENGTH_CIF_ENCODER
5+
from ciftools.bin.decoder import decode_cif_data
6+
from ciftools.bin.encoder import RUN_LENGTH, BYTE_ARRAY, Compose
7+
98

109

1110
class TestEncodings_RunLength(unittest.TestCase):
@@ -14,8 +13,8 @@ def test(self):
1413
suite = [np.array([-3] * 9 + [1] * 10 + [2] * 11 + [3] * 12), np.arange(10)]
1514

1615
for test_arr in suite:
17-
encoder = BinaryCIFEncoder([RUN_LENGTH_CIF_ENCODER, BYTE_ARRAY_CIF_ENCODER])
18-
encoded = encoder.encode_cif_data(test_arr)
16+
encoder = Compose(RUN_LENGTH, BYTE_ARRAY)
17+
encoded = encoder.encode(test_arr)
1918
msgpack.loads(msgpack.dumps(encoded))
2019
decoded = decode_cif_data(encoded)
2120

‎tests/string_array.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
import msgpack
44
import numpy as np
5-
from ciftools.binary.decoder import decode_cif_data
6-
from ciftools.binary.encoding.impl.binary_cif_encoder import BinaryCIFEncoder
7-
from ciftools.binary.encoding.impl.encoders.string_array import STRING_ARRAY_CIF_ENCODER
5+
from ciftools.bin.decoder import decode_cif_data
6+
from ciftools.bin.encoder import STRING_ARRAY
87

98

109
class TestEncodings_StringArray(unittest.TestCase):
@@ -27,8 +26,7 @@ def test(self):
2726
"cat",
2827
]
2928

30-
encoder = BinaryCIFEncoder([STRING_ARRAY_CIF_ENCODER])
31-
encoded = encoder.encode_cif_data(test_arr)
29+
encoded = STRING_ARRAY.encode(test_arr)
3230
msgpack.loads(msgpack.dumps(encoded))
3331
decoded = decode_cif_data(encoded)
3432

0 commit comments

Comments
 (0)