Skip to content

Commit f776ffd

Browse files
committed
Reformat codebase for newer PEP8 imports guidance
1 parent dbd9210 commit f776ffd

18 files changed

+101
-73
lines changed

tests/shared_testing_functions.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import igraph as ig
21
from math import isnan
3-
from modularitypruning.partition_utilities import num_communities
42
from random import randint, random, uniform
53

4+
import igraph as ig
5+
from modularitypruning.partition_utilities import num_communities
6+
67

78
def generate_connected_ER(n, m, directed):
89
G = ig.Graph.Erdos_Renyi(n=n, m=m, directed=directed)

tests/test_champ_coefficients_2D.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
from .shared_testing_functions import generate_connected_ER, generate_random_values, generate_random_partitions, \
2-
generate_igraph_famous
1+
import unittest
2+
from random import seed
3+
34
from modularitypruning.champ_utilities import partition_coefficients_2D
45
from modularitypruning.leiden_utilities import leiden_part_with_membership, repeated_leiden_from_gammas
5-
from random import seed
6-
import unittest
6+
7+
from .shared_testing_functions import generate_connected_ER, generate_random_values, generate_random_partitions, \
8+
generate_igraph_famous
79

810

911
class TestCHAMPCoefficients2D(unittest.TestCase):

tests/test_champ_coefficients_3D.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
from .shared_testing_functions import generate_connected_multilayer_ER, generate_random_partitions
1+
import unittest
2+
from random import seed
3+
24
from modularitypruning.champ_utilities import partition_coefficients_3D
35
from modularitypruning.leiden_utilities import multilayer_leiden_part_with_membership, leiden_part_with_membership
4-
from random import seed
5-
import unittest
6+
7+
from .shared_testing_functions import generate_connected_multilayer_ER, generate_random_partitions
68

79

810
class TestCHAMPCoefficients3D(unittest.TestCase):

tests/test_champ_usage_2D.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
from .shared_testing_functions import generate_connected_ER, generate_random_values, generate_random_partitions, \
2-
generate_igraph_famous
1+
import unittest
2+
from random import seed
3+
34
from modularitypruning.champ_utilities import CHAMP_2D
45
from modularitypruning.leiden_utilities import leiden_part_with_membership, repeated_leiden_from_gammas
5-
from random import seed
6-
import unittest
6+
7+
from .shared_testing_functions import generate_connected_ER, generate_random_values, generate_random_partitions, \
8+
generate_igraph_famous
79

810

911
class TestCHAMP2D(unittest.TestCase):

tests/test_champ_usage_3D.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
from .shared_testing_functions import generate_connected_multilayer_ER, generate_random_values, \
2-
generate_random_partitions
1+
import unittest
2+
from random import seed
3+
34
from modularitypruning.champ_utilities import CHAMP_3D
45
from modularitypruning.leiden_utilities import multilayer_leiden_part_with_membership
56
from numpy import mean
6-
from random import seed
7-
import unittest
7+
8+
from .shared_testing_functions import generate_connected_multilayer_ER, generate_random_values, \
9+
generate_random_partitions
810

911

1012
def point_is_inside_champ_domain(gamma, omega, domain_vertices):

tests/test_deprecated_louvain_names.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import pytest
21
import unittest
32

3+
import pytest
4+
45

56
class TestDeprecatedLouvainNames(unittest.TestCase):
67
def test_deprecated_louvain_module(self):

tests/test_documentation_examples.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
44
Sometimes this is simply checking that the code produces the intended output or runs without errors.
55
"""
6+
import unittest
7+
from random import seed, random
8+
9+
import igraph as ig
10+
import matplotlib.pyplot as plt
11+
import numpy as np
612
from modularitypruning import prune_to_stable_partitions, prune_to_multilayer_stable_partitions
713
from modularitypruning.champ_utilities import CHAMP_2D, CHAMP_3D
814
from modularitypruning.leiden_utilities import (repeated_parallel_leiden_from_gammas,
@@ -11,11 +17,6 @@
1117
from modularitypruning.partition_utilities import num_communities
1218
from modularitypruning.plotting import (plot_2d_domains_with_estimates, plot_2d_domains, plot_2d_domains_with_ami,
1319
plot_2d_domains_with_num_communities, plot_estimates, plot_multiplex_community)
14-
from random import seed, random
15-
import igraph as ig
16-
import matplotlib.pyplot as plt
17-
import numpy as np
18-
import unittest
1920

2021

2122
class TestDocumentationExamples(unittest.TestCase):

tests/test_monolayer_parameter_estimation.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
from .shared_testing_functions import assert_almost_equal_or_both_none_or_nan, generate_igraph_famous, \
2-
generate_random_partition
3-
import igraph as ig
1+
import unittest
42
from math import log
5-
from numpy import mean
3+
from random import seed
4+
5+
import igraph as ig
66
from modularitypruning.parameter_estimation import iterative_monolayer_resolution_parameter_estimation
77
from modularitypruning.parameter_estimation_utilities import gamma_estimate
88
from modularitypruning.partition_utilities import all_degrees
9-
from random import seed
10-
import unittest
9+
from numpy import mean
10+
11+
from .shared_testing_functions import assert_almost_equal_or_both_none_or_nan, generate_igraph_famous, \
12+
generate_random_partition
1113

1214

1315
class TestMonolayerParameterEstimation(unittest.TestCase):

tests/test_multiplex_parameter_estimation.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
from .shared_testing_functions import assert_almost_equal_or_both_none_or_nan, generate_random_partition, \
2-
generate_multilayer_intralayer_SBM
3-
import igraph as ig
1+
import unittest
42
from math import log
5-
from numpy import mean
3+
from random import seed
4+
5+
import igraph as ig
66
from modularitypruning.leiden_utilities import repeated_leiden_from_gammas_omegas
77
from modularitypruning.parameter_estimation import iterative_multilayer_resolution_parameter_estimation
88
from modularitypruning.parameter_estimation_utilities import gamma_omega_estimate
99
from modularitypruning.partition_utilities import num_communities, all_degrees
10-
from random import seed
11-
import unittest
10+
from numpy import mean
11+
12+
from .shared_testing_functions import assert_almost_equal_or_both_none_or_nan, generate_random_partition, \
13+
generate_multilayer_intralayer_SBM
1214

1315

1416
class TestMultiplexParameterEstimation(unittest.TestCase):

tests/test_parallel_leiden_performance.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
from .shared_testing_functions import generate_connected_ER, generate_multilayer_intralayer_SBM
2-
from modularitypruning.leiden_utilities import (repeated_leiden_from_gammas, repeated_parallel_leiden_from_gammas,
3-
repeated_leiden_from_gammas_omegas,
4-
repeated_parallel_leiden_from_gammas_omegas)
1+
import functools
2+
import unittest
3+
import warnings
54
from multiprocessing import Pool, cpu_count
65
from random import seed
7-
from time import time, sleep
8-
import functools
6+
from time import time
7+
98
import igraph as ig
109
import numpy as np
1110
import psutil
1211
import pytest
13-
import unittest
14-
import warnings
12+
from modularitypruning.leiden_utilities import (repeated_leiden_from_gammas, repeated_parallel_leiden_from_gammas,
13+
repeated_leiden_from_gammas_omegas,
14+
repeated_parallel_leiden_from_gammas_omegas)
15+
16+
from .shared_testing_functions import generate_connected_ER, generate_multilayer_intralayer_SBM
1517

1618
# this set of tests ensures that we achieve >= 75% parallel performance compared to perfect scaling of
1719
# single-threaded jobs to multiple cores (with no memory contention). This threshold will be decreased in

tests/test_temporal_multilevel_parameter_estimation.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
from .shared_testing_functions import assert_almost_equal_or_both_none_or_nan, generate_random_partition, \
2-
generate_multilayer_intralayer_SBM
3-
import igraph as ig
1+
import unittest
42
from math import log
5-
from numpy import mean
3+
from random import seed
4+
5+
import igraph as ig
66
from modularitypruning.leiden_utilities import repeated_leiden_from_gammas_omegas
77
from modularitypruning.parameter_estimation import iterative_multilayer_resolution_parameter_estimation
88
from modularitypruning.parameter_estimation_utilities import gamma_omega_estimate
99
from modularitypruning.partition_utilities import num_communities, all_degrees
10-
from random import seed
11-
import unittest
10+
from numpy import mean
11+
12+
from .shared_testing_functions import assert_almost_equal_or_both_none_or_nan, generate_random_partition, \
13+
generate_multilayer_intralayer_SBM
1214

1315

1416
class TestTemporalAndMultilevelParameterEstimation(unittest.TestCase):

utilities/champ_utilities.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
from .partition_utilities import all_degrees, in_degrees, out_degrees, membership_to_communities, \
2-
membership_to_layered_communities
1+
import warnings
32
from collections import defaultdict
4-
import numpy as np
5-
from numpy.random import choice
63
from math import floor
74
from multiprocessing import Pool, cpu_count
8-
from scipy.spatial import HalfspaceIntersection
5+
6+
import numpy as np
7+
from numpy.random import choice
98
from scipy.linalg import LinAlgWarning
109
from scipy.optimize import linprog, OptimizeWarning
11-
import warnings
10+
from scipy.spatial import HalfspaceIntersection
11+
12+
from .partition_utilities import all_degrees, in_degrees, out_degrees, membership_to_communities, \
13+
membership_to_layered_communities
1214

1315

1416
def get_interior_point(halfspaces, initial_num_sampled=50, full_retry_limit=10):

utilities/leiden_utilities.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import functools
2+
from multiprocessing import Pool, cpu_count
3+
24
import igraph as ig
35
import leidenalg
4-
from math import ceil
5-
from multiprocessing import Pool, cpu_count
6-
from tqdm import tqdm
76
import numpy as np
8-
import psutil
7+
from tqdm import tqdm
98

109
LOW_MEMORY_THRESHOLD = 1e9 # 1 GB
1110

utilities/louvain_utilities.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
in ``modularitypruning.leiden_utilities`` (though it still contains the legacy multi-layer functions since they can be
77
faster in general -- leidenalg does not efficiently implement multilayer optimization).
88
"""
9-
from . import leiden_utilities
10-
from .leiden_utilities import sorted_tuple, LOW_MEMORY_THRESHOLD
11-
from .progress import Progress
9+
import warnings
1210
from math import ceil
1311
from multiprocessing import Pool, cpu_count
12+
1413
import numpy as np
1514
import psutil
16-
import warnings
15+
16+
from . import leiden_utilities
17+
from .leiden_utilities import sorted_tuple, LOW_MEMORY_THRESHOLD
18+
from .progress import Progress
1719

1820
try:
1921
import louvain # import louvain if possible

utilities/parameter_estimation.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import leidenalg
2+
13
from .leiden_utilities import singlelayer_leiden, multilayer_leiden
24
from .parameter_estimation_utilities import leiden_part_with_membership, estimate_singlelayer_SBM_parameters, \
35
gamma_estimate_from_parameters, omega_function_from_model, estimate_multilayer_SBM_parameters
46
from .partition_utilities import in_degrees
5-
import leidenalg
67

78

89
def iterative_monolayer_resolution_parameter_estimation(G, gamma=1.0, tol=1e-2, max_iter=25, verbose=False,

utilities/parameter_estimation_utilities.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
from .leiden_utilities import leiden_part_with_membership, sorted_tuple
2-
from .champ_utilities import CHAMP_2D, CHAMP_3D
3-
from .partition_utilities import num_communities
1+
import warnings
2+
from math import log
3+
44
import igraph as ig
55
import leidenalg
6-
from math import log
76
import numpy as np
87
from scipy.optimize import fsolve
9-
import warnings
8+
9+
from .champ_utilities import CHAMP_2D, CHAMP_3D
10+
from .leiden_utilities import leiden_part_with_membership, sorted_tuple
11+
from .partition_utilities import num_communities
1012

1113

1214
def estimate_singlelayer_SBM_parameters(G, partition, m=None):

utilities/partition_utilities.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from collections import defaultdict
2+
23
from sklearn.metrics import adjusted_mutual_info_score, normalized_mutual_info_score
34

45

utilities/plotting.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
from .partition_utilities import num_communities, ami
21
from collections import defaultdict
32
from random import sample, shuffle
4-
import numpy as np
3+
54
import matplotlib
6-
from matplotlib.patches import Polygon
7-
from matplotlib.collections import PatchCollection
85
import matplotlib.pyplot as plt
6+
import numpy as np
97
import seaborn as sbn
8+
from matplotlib.collections import PatchCollection
9+
from matplotlib.patches import Polygon
10+
11+
from .partition_utilities import num_communities, ami
1012

1113

1214
def plot_adjacency(adj):

0 commit comments

Comments
 (0)