diff --git a/test/network/test_family.py b/test/network/test_family.py index 28bbd8ab..95e904d2 100644 --- a/test/network/test_family.py +++ b/test/network/test_family.py @@ -133,19 +133,19 @@ def test_get_cc_edge_weight_std(self): self.assertEqual(expected_std, actual_std) - def test_get_cc_connectivity(self): - """Tests whether the connectivity of a connected component is correctly + def test_get_cc_density(self): + """Tests whether the density of a connected component is correctly calculated """ adj_list = TestAffinityPropagation.gen_edge_list() # 8 nodes, 15 edges # 115 / (8 * (8 - 1) / 2) = 0.54 - expected_connectivity = 0.54 + expected_density = 0.54 - actual_connectivity = bs_families.get_cc_connectivity(adj_list) + actual_density = bs_families.get_cc_density(adj_list) - self.assertEqual(expected_connectivity, actual_connectivity) + self.assertEqual(expected_density, actual_density) def test_test_centrality(self): """Tests whether the test_centrality function correctly identifies a network diff --git a/test/test_data/bs2_output/01-12-2023_12-01-01_c0.3/mix/mix_c0.5.network b/test/test_data/bs2_output/2023-12-01_12-01-01_c0.3/mix/mix_c0.5.network similarity index 100% rename from test/test_data/bs2_output/01-12-2023_12-01-01_c0.3/mix/mix_c0.5.network rename to test/test_data/bs2_output/2023-12-01_12-01-01_c0.3/mix/mix_c0.5.network diff --git a/test/test_data/bs2_output/01-12-2023_12-01-01_c0.3/mix/mix_clustering_c0.5.tsv b/test/test_data/bs2_output/2023-12-01_12-01-01_c0.3/mix/mix_clustering_c0.5.tsv similarity index 100% rename from test/test_data/bs2_output/01-12-2023_12-01-01_c0.3/mix/mix_clustering_c0.5.tsv rename to test/test_data/bs2_output/2023-12-01_12-01-01_c0.3/mix/mix_clustering_c0.5.tsv diff --git a/test/test_data/bs2_output/01-12-2023_12-01-01_full.network b/test/test_data/bs2_output/2023-12-01_12-01-01_full.network similarity index 100% rename from test/test_data/bs2_output/01-12-2023_12-01-01_full.network rename to test/test_data/bs2_output/2023-12-01_12-01-01_full.network diff --git a/test/test_data/bs2_output/07-12-2023_12-15-35_c0.5/mix/mix_c0.5.network b/test/test_data/bs2_output/2023-12-07_12-15-35_c0.5/mix/mix_c0.5.network similarity index 100% rename from test/test_data/bs2_output/07-12-2023_12-15-35_c0.5/mix/mix_c0.5.network rename to test/test_data/bs2_output/2023-12-07_12-15-35_c0.5/mix/mix_c0.5.network diff --git a/test/test_data/bs2_output/07-12-2023_12-15-35_c0.5/mix/mix_clustering_c0.5.tsv b/test/test_data/bs2_output/2023-12-07_12-15-35_c0.5/mix/mix_clustering_c0.5.tsv similarity index 100% rename from test/test_data/bs2_output/07-12-2023_12-15-35_c0.5/mix/mix_clustering_c0.5.tsv rename to test/test_data/bs2_output/2023-12-07_12-15-35_c0.5/mix/mix_clustering_c0.5.tsv diff --git a/test/test_data/bs2_output/07-12-2023_12-15-35_c0.7/mix/mix_c0.7.network b/test/test_data/bs2_output/2023-12-07_12-15-35_c0.7/mix/mix_c0.7.network similarity index 100% rename from test/test_data/bs2_output/07-12-2023_12-15-35_c0.7/mix/mix_c0.7.network rename to test/test_data/bs2_output/2023-12-07_12-15-35_c0.7/mix/mix_c0.7.network diff --git a/test/test_data/bs2_output/07-12-2023_12-15-35_c0.7/mix/mix_clustering_c0.7.tsv b/test/test_data/bs2_output/2023-12-07_12-15-35_c0.7/mix/mix_clustering_c0.7.tsv similarity index 100% rename from test/test_data/bs2_output/07-12-2023_12-15-35_c0.7/mix/mix_clustering_c0.7.tsv rename to test/test_data/bs2_output/2023-12-07_12-15-35_c0.7/mix/mix_clustering_c0.7.tsv diff --git a/test/test_data/bs2_output/07-12-2023_12-15-35_full.network b/test/test_data/bs2_output/2023-12-07_12-15-35_full.network similarity index 100% rename from test/test_data/bs2_output/07-12-2023_12-15-35_full.network rename to test/test_data/bs2_output/2023-12-07_12-15-35_full.network