Skip to content

Commit 5ae1352

Browse files
authored
Merge pull request #3 from molstar/move-code-around
Refactoring
2 parents a026016 + 216bed1 commit 5ae1352

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+156
-156
lines changed
File renamed without changes.

README.md

Lines changed: 11 additions & 0 deletions

ciftools/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.
File renamed without changes.

ciftools/binary/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
from ciftools.binary.decoder import decode_cif_data
2+
from ciftools.binary.writer import BinaryCIFWriter

ciftools/src/binary/decoder.py renamed to ciftools/binary/decoder.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from typing import Union
22

33
import numpy as np
4-
from ciftools.src.binary.encoding.data_types import DataType
5-
from ciftools.src.binary.encoding.encodings import (
4+
from ciftools.binary.encoding.data_types import DataType
5+
from ciftools.binary.encoding.encodings import (
66
ByteArrayEncoding,
77
DeltaEncoding,
88
FixedPointEncoding,
@@ -11,9 +11,9 @@
1111
RunLengthEncoding,
1212
StringArrayEncoding,
1313
)
14-
from ciftools.src.binary.encoding.types import EncodedCIFColumn, EncodedCIFData
15-
from ciftools.src.cif_format.base import CIFColumnBase
16-
from ciftools.src.cif_format.binary.column import BinaryCIFColumn
14+
from ciftools.binary.encoding.types import EncodedCIFColumn, EncodedCIFData
15+
from ciftools.cif_format.base import CIFColumnBase
16+
from ciftools.cif_format.binary.column import BinaryCIFColumn
1717

1818

1919
def decode_cif_column(column: EncodedCIFColumn) -> CIFColumnBase:
@@ -115,7 +115,7 @@ def _decode_string_array(data: np.ndarray, encoding: StringArrayEncoding) -> lis
115115
strings = [""]
116116

117117
for i in range(1, len(offsets)):
118-
strings.append(string_data[offsets[i - 1]: offsets[i]]) # type: ignore
118+
strings.append(string_data[offsets[i - 1] : offsets[i]]) # type: ignore
119119

120120
return [strings[i + 1] for i in indices] # type: ignore
121121

File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import abc
2-
from ciftools.src.binary.encoding.types import EncodedCIFData
2+
3+
from ciftools.binary.encoding.types import EncodedCIFData
34

45

56
class BinaryCIFEncoderBase(abc.ABC):
67
@abc.abstractmethod
78
def encode_cif_data(self, data: any) -> EncodedCIFData:
89
pass
9-

ciftools/src/binary/encoding/base/cif_encoder_base.py renamed to ciftools/binary/encoding/base/cif_encoder_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import abc
22

3-
from ciftools.src.binary.encoding.types import EncodedCIFData
3+
from ciftools.binary.encoding.types import EncodedCIFData
44

55

66
class CIFEncoderBase(abc.ABC):

0 commit comments

Comments
 (0)