Skip to content

Commit bf80e71

Browse files
committed
PL: fix style regressions
1 parent 2082f76 commit bf80e71

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

nitransforms/surface.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
from nitransforms.base import (
1919
SurfaceMesh
2020
)
21-
import nibabel as nb
22-
from scipy.spatial import KDTree
23-
from scipy.spatial.distance import cdist
2421

2522

2623
class SurfaceTransformBase():
@@ -231,12 +228,11 @@ def __init__(self, reference, moving, interpolation_method='barycentric', mat=No
231228
# transform
232229
if mat is None:
233230
self.__calculate_mat()
234-
r_tree = KDTree(self.reference._coords)
235231
m_tree = KDTree(self.moving._coords)
236-
kmr_dists, kmr_closest = m_tree.query(self.reference._coords, k=10)
232+
_, kmr_closest = m_tree.query(self.reference._coords, k=10)
237233

238234
# invert the triangles to generate a lookup table from vertices to triangle index
239-
tri_lut = dict()
235+
tri_lut = {}
240236
for i, idxs in enumerate(self.moving._triangles):
241237
for x in idxs:
242238
if not x in tri_lut:
@@ -247,7 +243,7 @@ def __init__(self, reference, moving, interpolation_method='barycentric', mat=No
247243
# calculate the barycentric interpolation weights
248244
bc_weights = []
249245
enclosing = []
250-
for sidx, (point, kmrv) in enumerate(zip(self.reference._coords, kmr_closest)):
246+
for point, kmrv in zip(self.reference._coords, kmr_closest):
251247
close_tris = _find_close_tris(kmrv, tri_lut, self.moving)
252248
ww, ee = _find_weights(point, close_tris, m_tree)
253249
bc_weights.append(ww)

nitransforms/tests/test_surface.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import os
21
import tempfile
32

43
import numpy as np
@@ -12,10 +11,6 @@
1211
SurfaceResampler
1312
)
1413

15-
from nitransforms.base import SurfaceMesh
16-
from nitransforms.surface import SurfaceCoordinateTransform, SurfaceResampler
17-
18-
1914
# def test_surface_transform_npz():
2015
# mat = sparse.random(10, 10, density=0.5)
2116
# xfm = SurfaceCoordinateTransform(mat)
@@ -209,4 +204,3 @@ def test_SurfaceResampler(testdata_path, tmpdir):
209204
assert resampling3 == resampling
210205
resampled_thickness3 = resampling3.apply(subj_thickness.agg_data(), normalize='element')
211206
assert np.all(resampled_thickness3 == resampled_thickness)
212-

0 commit comments

Comments
 (0)