Skip to content

Commit 3fb1d23

Browse files
hmacdoperichardjgowers
authored andcommitted
remove calc_
1 parent ab8ecb2 commit 3fb1d23

File tree

8 files changed

+254
-254
lines changed

8 files changed

+254
-254
lines changed

distopia/__init__.py

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11

22
from .pydistopia import (
3-
calc_distances_ortho,
4-
calc_distances_no_box,
5-
calc_distances_triclinic,
6-
calc_angles_no_box,
7-
calc_angles_ortho,
8-
calc_angles_triclinic,
9-
calc_dihedrals_no_box,
10-
calc_dihedrals_ortho,
11-
calc_dihedrals_triclinic,
12-
calc_distance_array_no_box,
13-
calc_distance_array_ortho,
14-
calc_distance_array_triclinic,
15-
calc_self_distance_array_no_box,
16-
calc_self_distance_array_ortho,
17-
calc_self_distance_array_triclinic,
3+
distances_ortho,
4+
distances_no_box,
5+
distances_triclinic,
6+
angles_no_box,
7+
angles_ortho,
8+
angles_triclinic,
9+
dihedrals_no_box,
10+
dihedrals_ortho,
11+
dihedrals_triclinic,
12+
distance_array_no_box,
13+
distance_array_ortho,
14+
distance_array_triclinic,
15+
self_distance_array_no_box,
16+
self_distance_array_ortho,
17+
self_distance_array_triclinic,
1818
)
1919

2020
__all__ = [
21-
'calc_distances_ortho',
22-
'calc_distances_no_box',
23-
'calc_distances_triclinic',
24-
'calc_angles_no_box',
25-
'calc_angles_ortho',
26-
'calc_angles_triclinic',
27-
'calc_dihedrals_no_box',
28-
'calc_dihedrals_ortho',
29-
'calc_dihedrals_triclinic',
30-
'calc_distance_array_no_box',
31-
'calc_distance_array_ortho',
32-
'calc_distance_array_triclinic',
33-
'calc_self_distance_array_no_box',
34-
'calc_self_distance_array_ortho',
35-
'calc_self_distance_array_triclinic',
21+
'distances_ortho',
22+
'distances_no_box',
23+
'distances_triclinic',
24+
'angles_no_box',
25+
'angles_ortho',
26+
'angles_triclinic',
27+
'dihedrals_no_box',
28+
'dihedrals_ortho',
29+
'dihedrals_triclinic',
30+
'distance_array_no_box',
31+
'distance_array_ortho',
32+
'distance_array_triclinic',
33+
'self_distance_array_no_box',
34+
'self_distance_array_ortho',
35+
'self_distance_array_triclinic',
3636
]
3737

3838
from importlib.metadata import version

distopia/pydistopia.pyx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def _check_shapes(*args):
168168

169169
@cython.boundscheck(False)
170170
@cython.wraparound(False)
171-
def calc_distances_no_box(floating[:, ::1] coords0,
171+
def distances_no_box(floating[:, ::1] coords0,
172172
floating[:, ::1] coords1,
173173
results=None):
174174
"""ulate pairwise distances between coords0 and coords1 with no periodic boundary conditions
@@ -210,7 +210,7 @@ def calc_distances_no_box(floating[:, ::1] coords0,
210210

211211
@cython.boundscheck(False)
212212
@cython.wraparound(False)
213-
def calc_distances_ortho(floating[:, ::1] coords0,
213+
def distances_ortho(floating[:, ::1] coords0,
214214
floating[:, ::1] coords1,
215215
floating[::1] box,
216216
floating[::1] results=None):
@@ -257,7 +257,7 @@ def calc_distances_ortho(floating[:, ::1] coords0,
257257

258258
@cython.boundscheck(False)
259259
@cython.wraparound(False)
260-
def calc_distances_triclinic(floating[:, ::1] coords0,
260+
def distances_triclinic(floating[:, ::1] coords0,
261261
floating[:, ::1] coords1,
262262
floating[:, ::1] box,
263263
floating[::1] results=None):
@@ -302,7 +302,7 @@ def calc_distances_triclinic(floating[:, ::1] coords0,
302302

303303
@cython.boundscheck(False)
304304
@cython.wraparound(False)
305-
def calc_angles_no_box(
305+
def angles_no_box(
306306
floating[:, ::1] coords0,
307307
floating[:, ::1] coords1,
308308
floating[:, ::1] coords2,
@@ -347,7 +347,7 @@ def calc_angles_no_box(
347347

348348
@cython.boundscheck(False)
349349
@cython.wraparound(False)
350-
def calc_angles_ortho(
350+
def angles_ortho(
351351
floating[:, ::1] coords0,
352352
floating[:, ::1] coords1,
353353
floating[:, ::1] coords2,
@@ -396,7 +396,7 @@ def calc_angles_ortho(
396396

397397
@cython.boundscheck(False)
398398
@cython.wraparound(False)
399-
def calc_angles_triclinic(
399+
def angles_triclinic(
400400
floating[:, ::1] coords0,
401401
floating[:, ::1] coords1,
402402
floating[:, ::1] coords2,
@@ -445,7 +445,7 @@ def calc_angles_triclinic(
445445

446446
@cython.boundscheck(False)
447447
@cython.wraparound(False)
448-
def calc_dihedrals_no_box(
448+
def dihedrals_no_box(
449449
floating[:, ::1] coords0,
450450
floating[:, ::1] coords1,
451451
floating[:, ::1] coords2,
@@ -492,7 +492,7 @@ def calc_dihedrals_no_box(
492492

493493
@cython.boundscheck(False)
494494
@cython.wraparound(False)
495-
def calc_dihedrals_ortho(
495+
def dihedrals_ortho(
496496
floating[:, ::1] coords0,
497497
floating[:, ::1] coords1,
498498
floating[:, ::1] coords2,
@@ -542,7 +542,7 @@ def calc_dihedrals_ortho(
542542

543543
@cython.boundscheck(False)
544544
@cython.wraparound(False)
545-
def calc_dihedrals_triclinic(
545+
def dihedrals_triclinic(
546546
floating[:, ::1] coords0,
547547
floating[:, ::1] coords1,
548548
floating[:, ::1] coords2,
@@ -593,7 +593,7 @@ def calc_dihedrals_triclinic(
593593

594594
@cython.boundscheck(False)
595595
@cython.wraparound(False)
596-
def calc_distance_array_no_box(
596+
def distance_array_no_box(
597597
floating[:, ::1] coords0,
598598
floating[:, ::1] coords1,
599599
floating[:, ::1] results=None):
@@ -641,7 +641,7 @@ def calc_distance_array_no_box(
641641

642642
@cython.boundscheck(False)
643643
@cython.wraparound(False)
644-
def calc_distance_array_ortho(
644+
def distance_array_ortho(
645645
floating[:, ::1] coords0,
646646
floating[:, ::1] coords1,
647647
floating[::1] box,
@@ -691,7 +691,7 @@ def calc_distance_array_ortho(
691691

692692
@cython.boundscheck(False)
693693
@cython.wraparound(False)
694-
def calc_distance_array_triclinic(
694+
def distance_array_triclinic(
695695
floating[:, ::1] coords0,
696696
floating[:, ::1] coords1,
697697
floating[:, ::1] box,
@@ -745,7 +745,7 @@ def calc_distance_array_triclinic(
745745

746746
@cython.boundscheck(False)
747747
@cython.wraparound(False)
748-
def calc_self_distance_array_no_box(
748+
def self_distance_array_no_box(
749749
floating[:, ::1] coords0,
750750
floating[::1] results=None):
751751
"""ulate self-pairwise distance matrix between coordinates with no periodic boundary conditions
@@ -797,7 +797,7 @@ def calc_self_distance_array_no_box(
797797

798798
@cython.boundscheck(False)
799799
@cython.wraparound(False)
800-
def calc_self_distance_array_ortho(
800+
def self_distance_array_ortho(
801801
floating[:, ::1] coords0,
802802
floating[::1] box,
803803
floating[::1] results=None):
@@ -852,7 +852,7 @@ def calc_self_distance_array_ortho(
852852

853853
@cython.boundscheck(False)
854854
@cython.wraparound(False)
855-
def calc_self_distance_array_triclinic(
855+
def self_distance_array_triclinic(
856856
floating[:, ::1] coords0,
857857
floating[:, ::1] box,
858858
floating[::1] results=None):

0 commit comments

Comments
 (0)