stash post run

neurodata · Mar 10, 2023 · 4358996 · 4358996
1 parent cc46f18
commit 4358996
Show file tree

Hide file tree

Showing 17 changed files with 7,763 additions and 6,815 deletions.
diff --git a/docs/adjusted_sbm_unmatched_test.ipynb b/docs/adjusted_sbm_unmatched_test.ipynb
diff --git a/docs/define_data.ipynb b/docs/define_data.ipynb
diff --git a/docs/er_unmatched_test.ipynb b/docs/er_unmatched_test.ipynb
diff --git a/docs/kc_minus.ipynb b/docs/kc_minus.ipynb
diff --git a/docs/revamp_sbm_methods_sim.ipynb b/docs/revamp_sbm_methods_sim.ipynb
diff --git a/docs/sbm_block_power.ipynb b/docs/sbm_block_power.ipynb
diff --git a/docs/sbm_unmatched_test.ipynb b/docs/sbm_unmatched_test.ipynb
diff --git a/docs/show_data.ipynb b/docs/show_data.ipynb
diff --git a/docs/single_subgraph_power.ipynb b/docs/single_subgraph_power.ipynb
diff --git a/docs/thresholding_tests.ipynb b/docs/thresholding_tests.ipynb
diff --git a/overleaf b/overleaf
diff --git a/pkg/pkg/perturb/perturb.py b/pkg/pkg/perturb/perturb.py
@@ -1,7 +1,6 @@
 import numpy as np
 from numpy.random import default_rng
-from giskard.utils import get_random_seed
-from sklearn.utils import shuffle
+from ..utils import get_random_seed
 
 
 def _input_checks(adjacency, random_seed, effect_size, max_tries):

diff --git a/pkg/pkg/plot/scatter.py b/pkg/pkg/plot/scatter.py
@@ -1,5 +1,6 @@
 import matplotlib.pyplot as plt
 import numpy as np
+import pandas as pd
 import seaborn as sns
 
 from .utils import legend_upper_right

diff --git a/pkg/pkg/stats/__init__.py b/pkg/pkg/stats/__init__.py
@@ -1,7 +1,6 @@
 from .er import erdos_renyi_test, erdos_renyi_test_paired
 from .fisher_exact_nonunity import fisher_exact_nonunity
 from .sbm import fit_sbm, stochastic_block_test, stochastic_block_test_paired
-from .rdpg import rdpg_test
 from .degree import degree_test
 from .binomial import binom_2samp, binom_2samp_paired
 from .combine import combine_pvalues

diff --git a/pkg/pkg/utils/__init__.py b/pkg/pkg/utils/__init__.py
@@ -1,10 +1,10 @@
 from .toy import get_toy_palette, sample_toy_networks
-from .utils import set_warnings
+from .utils import get_random_seed, set_warnings
 from .wrangle import (
     get_paired_inds,
     get_paired_subgraphs,
     get_seeds,
+    remove_group,
     to_largest_connected_component,
     to_pandas_edgelist,
-    remove_group,
 )
diff --git a/pkg/pkg/utils/utils.py b/pkg/pkg/utils/utils.py
@@ -1,4 +1,6 @@
 import warnings
+
+import numpy as np
 from beartype.roar import BeartypeDecorHintPepDeprecatedWarning
 
 
@@ -11,3 +13,6 @@ def set_warnings():
     )
 
 
+def get_random_seed(random_state):
+    seed = random_state.integers(np.iinfo(np.int32).max)
+    return seed
diff --git a/scripts/revamp_sbm_methods_sim.py b/scripts/revamp_sbm_methods_sim.py
@@ -298,9 +298,10 @@ def compare_individual_probabilities(
 n_runs = n_sims * len(n_perturb_range) * len(perturb_size_range)
 print(f"Number of runs: {n_runs}")
 
-pbar = tqdm(total=len(n_perturb_range) * len(perturb_size_range) * n_sims)
 
 if RERUN_SIMS:
+    pbar = tqdm(total=len(n_perturb_range) * len(perturb_size_range) * n_sims)
+
     rows = []
     example_perturb_probs = {}