further adressed linting

Author: Feelx234

pyproject.toml

@@ -84,12 +84,13 @@ omit = [ # Regexes for lines to exclude from consideration
     "*/io.py",
     "*/long_refinement_graphs.py",
     "*/visualization.py",
+    "*wl.py",
 ]
 
 
 [tool.flake8]
 # Some sane defaults for the code style checker flake8
-max_line_length = 125
+max_line_length = 200
 extend_ignore = ["E203", "W503", "E741"]
 # ^  Black-compatible
 #    E203 and W503 have edge cases handled by black
@@ -112,17 +113,20 @@ good-names = [
     "A",
     "F",
     "H",
-    "F_vals",
-    "F_val",
+    "E",
+    "E2",
     "H_vals",
     "M",
     "SMALL_VAL",
     "LARGE_VAL",
-    "MicroaggWilberCalculator_edu",
-    "N_vals",
-    "N",
+    "Gnp_row_first",
+    "_Gnp_row_first",
+    "SBM",
     "setUp",
     "tearDown",
+    "P",
+    "G_str",
+    "G_fg",
 ]
 
 # Good variable names regexes, separated by a comma. If names match any regex,

scripts/convergence_helper.py

@@ -51,7 +51,7 @@ def range_over_samples(self):
         the_range = range(self.number_of_samples)
         if self.tqdm:
             try:
-                from tqdm.auto import tqdm
+                from tqdm.auto import tqdm  # pylint: disable=import-outside-toplevel
 
                 the_range = tqdm(the_range, leave=False, desc="samples")
             except ModuleNotFoundError:
@@ -62,7 +62,7 @@ def wl_range(self, wl_iterations):
         the_range = range(wl_iterations - 1, -1, -1)
         if self.tqdm:
             try:
-                from tqdm.auto import tqdm
+                from tqdm.auto import tqdm  # pylint: disable=import-outside-toplevel
 
                 the_range = tqdm(the_range, desc="wl_rounds", leave=False)
             except ModuleNotFoundError:

src/nestmodel/ERGM_experiments.py

@@ -77,6 +77,8 @@ def rewire(self, n_steps, phi, seed):
         target_p = self.target_p.copy()
         A_work = self.A0.copy()
         rew_t0 = time.process_time()
+        result_p = None
+        ratio = None
         if self.kind == "adjacency":
             result_p, ratio = edge_flip_ergm_pagerank_adjacency(
                 A_work, target_p, n_steps, phi, seed

src/nestmodel/fast_graph.py

@@ -18,6 +18,9 @@
     get_block_indices,
     dir_sample_source_only_direct,
 )
+from nestmodel.fast_rewire2 import (
+    fg_rewire_nest,
+)
 
 
 def ensure_is_numpy_or_none(arr, dtype=np.int64):
@@ -209,7 +212,9 @@ def load_npz(file):
             G.wl_iterations = npzfile["wl_iterations"]
             G.edges_classes = npzfile["edges_classes"]
 
-            from nestmodel.fast_rewire import create_mono_from_arrs
+            from nestmodel.fast_rewire import (
+                create_mono_from_arrs,
+            )  # pylint: disable=import-outside-toplevel
 
             G.is_mono = []
             for i in range(npzfile["mono_len"]):
@@ -379,10 +384,6 @@ def rewire(self, depth, method, **kwargs):
             res = None
         elif method == 2:
 
-            from nestmodel.fast_rewire2 import (
-                fg_rewire_nest,
-            )  # pylint: disable=import-outside-toplevel
-
             res = fg_rewire_nest(self, depth, kwargs["n_rewire"], kwargs["seed"])
         elif method == 3:
             source_only = kwargs.get("source_only", False)

tests/test_fast_rewire.py

@@ -4,12 +4,11 @@
 # faulthandler.enable()
 import unittest
 import numpy as np
+from numpy.testing import assert_array_equal
 
 # from nestmodel.load_datasets import *
 from nestmodel.fast_rewire import sort_edges
 
-from numpy.testing import assert_array_equal
-
 
 def safe_diff(arr1, arr2):
     return np.maximum(arr1, arr2) - np.minimum(arr1, arr2)