Skip to content

Commit c27efc7

Browse files
committed
Lint fixes
1 parent 6dd4220 commit c27efc7

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

gdist.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def compute_gdist(
6262
number_of_target_indices,
6363
source_indices_array,
6464
target_indices_array,
65-
distance_limit
65+
distance_limit,
6666
):
6767
target_indices_size = target_indices_array.size
6868
distance = np.empty(target_indices_size, dtype=np.float64)
@@ -76,7 +76,7 @@ def compute_gdist(
7676
source_indices_array,
7777
target_indices_array,
7878
distance,
79-
distance_limit
79+
distance_limit,
8080
)
8181
return distance
8282

@@ -95,11 +95,14 @@ def local_gdist_matrix(
9595
vertices,
9696
triangles,
9797
ctypes.byref(sparse_matrix_size),
98-
max_distance
98+
max_distance,
9999
)
100100

101-
np_data = np.fromiter(data, dtype=np.float64,
102-
count=3 * sparse_matrix_size.value)
101+
np_data = np.fromiter(
102+
data,
103+
dtype=np.float64,
104+
count=3 * sparse_matrix_size.value,
105+
)
103106
lib.free_memory(data)
104107
return np_data
105108

@@ -126,15 +129,15 @@ def compute_gdist(
126129
number_of_target_indices=target_indices.size,
127130
source_indices_array=source_indices,
128131
target_indices_array=target_indices,
129-
distance_limit=max_distance
132+
distance_limit=max_distance,
130133
)
131134
return np.fromiter(distance, dtype=np.float64, count=target_indices.size)
132135

133136

134137
def local_gdist_matrix(
135138
vertices,
136139
triangles,
137-
max_distance=1e100
140+
max_distance=1e100,
138141
):
139142
vertices = vertices.ravel()
140143
triangles = triangles.ravel()
@@ -145,12 +148,12 @@ def local_gdist_matrix(
145148
triangles.size,
146149
vertices,
147150
triangles,
148-
max_distance
151+
max_distance,
149152
)
150153
sizes = data.size // 3
151154
rows = data[:sizes]
152-
columns = data[sizes: 2*sizes]
153-
data = data[2*sizes:]
155+
columns = data[sizes: 2 * sizes]
156+
data = data[2 * sizes:]
154157

155158
return scipy.sparse.csc_matrix(
156159
(data, (rows, columns)), shape=(vertices.size // 3, vertices.size // 3)

setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"""
4242

4343
import os
44-
import shutil
4544
import sys
4645
import setuptools
4746

@@ -61,7 +60,6 @@
6160
]
6261

6362
INCLUDE_DIRS = [
64-
# numpy.get_include(), # NumPy dtypes
6563
"geodesic_library", # geodesic distance, C++ library.
6664
]
6765

tests/test_gdist.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def test_flat_triangular_mesh(self):
3939
vertices = data[0:121].astype(np.float64)
4040
triangles = data[121:].astype(np.int32)
4141
distances = gdist.local_gdist_matrix(vertices, triangles)
42-
epsilon = 1e-6 # the default value used in `assert_array_almost_equal`
42+
epsilon = 1e-6 # the default value used in `assert_array_almost_equal`
4343
# test if the obtained matrix is symmetric
4444
assert (abs(distances - distances.T) > epsilon).nnz == 0
4545
np.testing.assert_array_almost_equal(distances.toarray()[1][0], 0.2)
@@ -54,7 +54,7 @@ def test_hedgehog_mesh(self):
5454
vertices = data[0:300].astype(np.float64)
5555
triangles = data[300:].astype(np.int32)
5656
distances = gdist.local_gdist_matrix(vertices, triangles)
57-
epsilon = 1e-6 # the default value used in `assert_array_almost_equal`
57+
epsilon = 1e-6 # the default value used in `assert_array_almost_equal`
5858
# test if the obtained matrix is symmetric
5959
assert (abs(distances - distances.T) > epsilon).nnz == 0
6060
np.testing.assert_array_almost_equal(

0 commit comments

Comments
 (0)