Skip to content

Commit 9528cfd

Browse files
author
Max Imakaev
committed
isort
1 parent 7f9e6fb commit 9528cfd

39 files changed

+169
-126
lines changed

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
# -- Path setup --------------------------------------------------------------
88

9-
import sys
109
import os
1110
import re
1211
import shlex
12+
import sys
1313

1414
# If extensions (or modules to document with autodoc) are in another directory,
1515
# add these directories to sys.path here. If the directory is relative to the

docs/olddocs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# All configuration values have a default; values that are commented out
1212
# serve to show the default.
1313

14-
import sys
1514
import os
15+
import sys
1616

1717
# If extensions (or modules to document with autodoc) are in another directory,
1818
# add these directories to sys.path here. If the directory is relative to the

examples/customIntegrators/activeBD.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,19 @@
99
1010
"""
1111

12+
import os
13+
import sys
1214
import time
15+
from pathlib import Path
16+
1317
import numpy as np
14-
import os, sys
18+
import openmm
19+
from simtk import unit
20+
1521
import polychrom
16-
from polychrom import simulation, starting_conformations, forces, forcekits
22+
from polychrom import forcekits, forces, simulation, starting_conformations
1723
from polychrom.contrib.integrators import ActiveBrownianIntegrator
18-
import openmm
1924
from polychrom.hdf5_format import HDF5Reporter
20-
from simtk import unit
21-
from pathlib import Path
2225

2326
N = 1000 # 1000 monomers
2427
ids = np.ones(N) # aray of 1s and 0s assigning type A and type B comonomers

examples/customIntegrators/corr_noise.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,19 @@
1212
>>> python corr_noise.py [gpuid]
1313
1414
"""
15+
import os
16+
import sys
1517
import time
18+
from pathlib import Path
19+
1620
import numpy as np
17-
import os, sys
21+
import openmm
22+
from simtk import unit
23+
1824
import polychrom
19-
from polychrom import simulation, starting_conformations, forces, forcekits
25+
from polychrom import forcekits, forces, simulation, starting_conformations
2026
from polychrom.contrib.integrators import CorrelatedNoiseIntegrator
21-
import openmm
2227
from polychrom.hdf5_format import HDF5Reporter
23-
from simtk import unit
24-
from pathlib import Path
2528

2629
N = 100 # 100 monomers
2730

examples/example/example.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
"""
77

88

9-
import os, sys
10-
import polychrom
11-
from polychrom import simulation, starting_conformations, forces, forcekits
12-
import openmm
139
import os
10+
import sys
11+
12+
import openmm
13+
14+
import polychrom
15+
from polychrom import forcekits, forces, simulation, starting_conformations
1416
from polychrom.hdf5_format import HDF5Reporter
1517

1618
N = 10000

examples/loopExtrusion/LEF_Dynamics.pyx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
#cython: initializedcheck=True
55

66
import numpy as np
7-
cimport numpy as np
7+
8+
cimport numpy as np
9+
810
import cython
9-
cimport cython
11+
12+
cimport cython
1013

1114

1215
cdef extern from "<stdlib.h>":

examples/loopExtrusion/directionalModel/flagshipNormLifetime.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,25 @@
33

44
matplotlib.use("Agg")
55

6+
import ctypes
7+
import multiprocessing as mp
68
import os
7-
import numpy as np
9+
810
import matplotlib.pyplot as plt
11+
import numpy as np
912
import pandas as pd
10-
import ctypes
11-
from mirnylib.plotting import nicePlot
12-
import multiprocessing as mp
1313
import pyximport
14-
14+
from mirnylib.plotting import nicePlot
1515
from openmmlib import polymerutils
16-
1716
from openmmlib.polymerutils import scanBlocks
1817

1918
pyximport.install()
19+
import sys
20+
from contextlib import closing
21+
2022
from mirnylib.h5dict import h5dict
23+
from mirnylib.numutils import coarsegrain, completeIC, zoomArray
2124
from mirnylib.systemutils import fmap, setExceptionHook
22-
from mirnylib.numutils import coarsegrain, completeIC
23-
from mirnylib.numutils import zoomArray
24-
from contextlib import closing
25-
import sys
2625
from smcTranslocator import smcTranslocatorDirectional
2726

2827
filename = "/net/levsha/share/nezar/ctcf_sites/GM12878.ctcf_narrowPeak.loj.encodeMotif.rad21.txt"
@@ -245,9 +244,10 @@ def calculateAverageLoop():
245244

246245

247246
def doPolymerSimulation(steps, dens, stiff, folder):
247+
import time
248+
248249
from openmmlib.openmmlib import Simulation
249250
from openmmlib.polymerutils import grow_rw
250-
import time
251251

252252
SMCTran = initModel()
253253

examples/loopExtrusion/directionalModel/showContactmap.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
1-
import matplotlib
2-
3-
# matplotlib.use("Agg")
4-
5-
from mirnylib.plotting import nicePlot
61
import os
72
import pickle
8-
from openmmlib import contactmaps
9-
from mirnylib.numutils import zoomArray
10-
from openmmlib import polymerutils
113

4+
import matplotlib
125
import matplotlib.pyplot as plt
136
import numpy as np
14-
from mirnylib.h5dict import h5dict
7+
import pandas as pd
158
from mirnylib.genome import Genome
16-
from mirnylib.numutils import completeIC, coarsegrain
9+
from mirnylib.h5dict import h5dict
10+
from mirnylib.numutils import coarsegrain, completeIC, zoomArray
11+
from mirnylib.plotting import nicePlot
1712
from mirnylib.systemutils import setExceptionHook
13+
from openmmlib import contactmaps, polymerutils
1814
from openmmlib.contactmapManager import averageContacts
19-
import pandas as pd
20-
from mirnylib.numutils import coarsegrain
15+
16+
# matplotlib.use("Agg")
17+
18+
2119

2220
setExceptionHook()
2321

@@ -33,8 +31,8 @@ def __init__(self, i, forw, rev, blocks, steps):
3331
import pyximport
3432

3533
pyximport.install()
36-
from smcTranslocatorDirectional import smcTranslocator
3734
import numpy as np
35+
from smcTranslocatorDirectional import smcTranslocator
3836

3937
N = len(forw)
4038
birthArray = np.zeros(N, dtype=np.double) + 0.1

examples/loopExtrusion/newSimulatorCode.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
import pickle
21
import os
2+
import pickle
33
import time
4+
45
import numpy as np
6+
import pyximport
57
from openmmlib import polymerutils
6-
from openmmlib.polymerutils import scanBlocks
78
from openmmlib.openmmlib import Simulation
8-
from openmmlib.polymerutils import grow_rw
9-
10-
import pyximport
9+
from openmmlib.polymerutils import grow_rw, scanBlocks
1110

1211
pyximport.install()
1312
from smcTranslocator import smcTranslocatorDirectional
1413

15-
1614
# -------defining parameters----------
1715
# -- basic loop extrusion parameters
1816
SEPARATION = 200

polychrom/_polymer_math.pyx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# distutils: language=c++
22

3-
cimport cython
3+
cimport cython
44

55
import numpy as np
66

7+
78
cdef extern from "__polymer_math.h":
89
long int _getLinkingNumberCpp(int M, double *olddata, int N)
910
void _mutualSimplifyCpp (

polychrom/cli/dif

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,15 @@ you likely have mixed enough to reach some kind of equilibrium (and if you haven
2323
reached equilibrium).
2424
"""
2525
from __future__ import absolute_import, division, print_function
26+
27+
import os
2628
import sys
27-
import numpy as np
29+
30+
import numpy as np
2831
import scipy.optimize
29-
from polychrom.polymerutils import load, fetch_block
32+
3033
from polychrom.polymer_analyses import kabsch_msd
31-
import os
34+
from polychrom.polymerutils import fetch_block, load
3235

3336
filename = sys.argv[1]
3437
try:

polychrom/cli/show

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
#!/usr/bin/env python
22
from __future__ import absolute_import, division, print_function
3-
import os, tempfile, sys
4-
import numpy as np
5-
import joblib
63

4+
import os
5+
import sys
6+
import tempfile
7+
8+
import joblib
9+
import numpy as np
710

811
usage = """
912
Usage: show filename [start end step]
@@ -132,8 +135,7 @@ def showData(data):
132135
)
133136

134137

135-
from polychrom.polymerutils import load, fetch_block
136-
138+
from polychrom.polymerutils import fetch_block, load
137139

138140
filename = sys.argv[1]
139141

polychrom/cli/traj_convert.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,17 @@
8080
8181
"""
8282

83+
import glob
8384
import os
84-
import sys
85-
import shutil
86-
import click
8785
import pickle
88-
import glob
8986
import re
90-
import pandas as pd
87+
import shutil
88+
import sys
89+
90+
import click
9191
import numpy as np
92+
import pandas as pd
93+
9294
from polychrom.hdf5_format import HDF5Reporter, list_URIs, load_URI
9395
from polychrom.polymerutils import load
9496

polychrom/cli/xyz

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
#!/usr/bin/env python
22
from __future__ import absolute_import, division, print_function
3-
import os, tempfile, sys
4-
import numpy as np
5-
import joblib
3+
4+
import os
5+
import sys
6+
import tempfile
67
import textwrap
78

9+
import joblib
10+
import numpy as np
11+
812
usage = """
913
Usage: xyz filename [start end step]
1014
@@ -126,8 +130,7 @@ def showData(data):
126130
exit()
127131

128132

129-
from polychrom.polymerutils import load, fetch_block
130-
133+
from polychrom.polymerutils import fetch_block, load
131134

132135
filename = sys.argv[1]
133136

polychrom/contactmaps.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,15 @@
4848
4949
"""
5050

51-
import numpy as np
52-
import random
5351
import ctypes
5452
import multiprocessing as mp
55-
from contextlib import closing
56-
from . import polymerutils
53+
import random
5754
import warnings
58-
from . import polymer_analyses
55+
from contextlib import closing
56+
57+
import numpy as np
58+
59+
from . import polymer_analyses, polymerutils
5960

6061

6162
def indexing(smaller, larger, M):

polychrom/contrib/integrators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
3232
"""
3333
import numpy as np
34-
from simtk import unit
3534
import openmm as mm
3635
from openmmtools import utils
3736
from openmmtools.integrators import PrettyPrintableIntegrator
37+
from simtk import unit
3838

3939

4040
class ActiveBrownianIntegrator(utils.RestorableOpenMMObject, PrettyPrintableIntegrator, mm.CustomIntegrator):

polychrom/forcekits.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"""
1919

2020
import numpy as np
21+
2122
from . import forces
2223

2324

polychrom/forces.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
5555
"""
5656

57+
import itertools
5758
import re
5859
import warnings
59-
import itertools
6060
from collections.abc import Iterable
6161

6262
import numpy as np
@@ -65,6 +65,7 @@
6565
import openmm
6666
except Exception:
6767
import simtk.openmm as openmm
68+
6869
import simtk.unit
6970

7071

0 commit comments

Comments
 (0)