Fixed pytest

Reed-CompBio · Jun 17, 2024 · f160609 · f160609
1 parent 6f59c78
commit f160609
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 24 deletions.
diff --git a/main.py b/main.py
@@ -92,8 +92,8 @@ def main():
         go_protein_pairs,
         sample_size,
         protein_list,
-        graph_file_path,
-        dataset_directory_path,
+        testing_graph_file_path,
+        testing_input_directory_path,
         output_data_path,
         output_image_path,
         repeats,

diff --git a/tests/test_pytest.py b/tests/test_pytest.py
@@ -8,16 +8,14 @@
 from classes.protein_degree_v3_class import ProteinDegreeV3
 from classes.sample_algorithm import SampleAlgorithm
 from classes.base_algorithm_class import BaseAlgorithm
+from classes.hypergeometric_distribution_class import HypergeometricDistribution
+from classes.hypergeometric_distribution_class_V2 import HypergeometricDistributionV2
+
 from pathlib import Path
-from tools.helper import (
-    read_specific_columns,
-    import_graph_from_pickle,
-)
-from tools.workflow import run_workflow
+from tools.workflow import run_experiement
 import os
 
 
-
 def test_algorithm_attributes():
     algorithm_classes = {
         "OverlappingNeighbors": OverlappingNeighbors,
@@ -26,7 +24,8 @@ def test_algorithm_attributes():
         "ProteinDegree": ProteinDegree,
         "ProteinDegreeV2": ProteinDegreeV2,
         "ProteinDegreeV3": ProteinDegreeV3,
-        "SampleAlgorithm": SampleAlgorithm,
+        "HypergeometricDistribution": HypergeometricDistribution,
+        "HypergeometricDistributionV2": HypergeometricDistributionV2,
     }
     for algorithm in algorithm_classes:
         assert hasattr(algorithm_classes[algorithm](), "y_score")
@@ -41,14 +40,15 @@ def test_algorithm_inherits_class():
         "ProteinDegree": ProteinDegree,
         "ProteinDegreeV2": ProteinDegreeV2,
         "ProteinDegreeV3": ProteinDegreeV3,
-        "SampleAlgorithm": SampleAlgorithm,
+        "HypergeometricDistribution": HypergeometricDistribution,
+        "HypergeometricDistributionV2": HypergeometricDistributionV2,
     }
 
     for algorithm in algorithm_classes:
         assert issubclass(algorithm_classes[algorithm], BaseAlgorithm)
 
 
-def test_algorithm_workflow():
+def test_algorithm_experiment():
     if not os.path.exists("output"):
         os.makedirs("output")
     if not os.path.exists("output/dataset"):
@@ -70,9 +70,11 @@ def test_algorithm_workflow():
         "ProteinDegree": ProteinDegree,
         "ProteinDegreeV2": ProteinDegreeV2,
         "ProteinDegreeV3": ProteinDegreeV3,
+        "HypergeometricDistribution": HypergeometricDistribution,
+        "HypergeometricDistributionV2": HypergeometricDistributionV2,
     }
 
-    results = run_workflow(
+    results = run_experiement(
         algorithm_classes,
         input_directory_path,
         graph_file_path,
@@ -88,10 +90,8 @@ def test_algorithm_workflow():
         "ProteinDegree": 0.825,
         "ProteinDegreeV2": 0.675,
         "ProteinDegreeV3": 0.89,
-        "HypergeometricDistribution": 0.78,
-        "HypergeometricDistributionV2": 0.89,
-        "HypergeometricDistributionV3": 0.675,
-        "HypergeometricDistributionV4": 0.6
+        "HypergeometricDistribution": 0.76,
+        "HypergeometricDistributionV2": 0.86,
     }
 
     pr_results = {
@@ -101,11 +101,8 @@ def test_algorithm_workflow():
         "OverlappingNeighborsV2": 0.7467907092907092,
         "ProteinDegreeV2": 0.6367757242757243,
         "OverlappingNeighbors": 0.5329058916229968,
-        "SampleAlgorithm": 0.4093791854859966,
-        "HypergeometricDistribution": 0.7899246806,
-        "HypergeometricDistributionV2": 0.8519169719,
-        "HypergeometricDistributionV3": 0.7142573629,
-        "HypergeometricDistributionV4": 0.6967847007,
+        "HypergeometricDistribution": 0.7899246805825753,
+        "HypergeometricDistributionV2": 0.8519169719169718,
     }
 
     for algorithm, metrics in results.items():

diff --git a/tools/workflow.py b/tools/workflow.py
@@ -60,9 +60,9 @@ def run_workflow(
     ):  # Creates a pos/neg list each replicate then runs workflow like normal
         print("\n\nReplicate: " + str(i) + "\n")
 
-        positive_dataset, negative_dataset = sample_data(
-            go_protein_pairs, sample_size, protein_list, G, dataset_directory_path
-        )
+        # positive_dataset, negative_dataset = sample_data(
+        #     go_protein_pairs, sample_size, protein_list, G, dataset_directory_path
+        # )
 
         results = run_experiement(
             algorithm_classes,