diff --git a/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp.py b/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp.py index 5944f58..9e9af66 100644 --- a/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp.py +++ b/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp.py @@ -19,7 +19,15 @@ OUT_TIME_LIST = set({('ShortestPath', 'ENZYMES', 'False'), ('StructuralSP', 'NCI1', 'False'), ('ShortestPath', 'NCI109', 'False'), ('StructuralSP', 'NCI109', 'True'), + ('ShortestPath', 'NCI-H23', 'True'), + ('ShortestPath', 'NCI-H23', 'False'), + ('StructuralSP', 'NCI-H23', 'True'), + ('StructuralSP', 'NCI-H23', 'False'), ('StructuralSP', 'NCI109', 'False'), + ('ShortestPath', 'NCI-H23H', 'True'), + ('ShortestPath', 'NCI-H23H', 'False'), + ('StructuralSP', 'NCI-H23H', 'True'), + ('StructuralSP', 'NCI-H23H', 'False'), ('ShortestPath', 'DD', 'True'), ('ShortestPath', 'DD', 'False'), ('StructuralSP', 'BZR', 'False'), @@ -35,8 +43,17 @@ OUT_TIME_LIST = set({('ShortestPath', 'ENZYMES', 'False'), ('ShortestPath', 'MCF-7H', 'False'), ('StructuralSP', 'MCF-7H', 'True'), ('StructuralSP', 'MCF-7H', 'False'), + ('ShortestPath', 'MOLT-4', 'True'), + ('ShortestPath', 'MOLT-4', 'False'), + ('StructuralSP', 'MOLT-4', 'True'), + ('StructuralSP', 'MOLT-4', 'False'), + ('ShortestPath', 'MOLT-4H', 'True'), + ('ShortestPath', 'MOLT-4H', 'False'), + ('StructuralSP', 'MOLT-4H', 'True'), + ('StructuralSP', 'MOLT-4H', 'False'), ('StructuralSP', 'OHSU', 'True'), ('StructuralSP', 'OHSU', 'False'), + ('ShortestPath', 'OVCAR-8', 'True'), ('StructuralSP', 'Steroid', 'False'), ('ShortestPath', 'SYNTHETIC', 'False'), ('StructuralSP', 'SYNTHETIC', 'True'), @@ -52,13 +69,6 @@ OUT_TIME_LIST = set({('ShortestPath', 'ENZYMES', 'False'), ('StructuralSP', 'COIL-DEL', 'False'), ('ShortestPath', 'PROTEINS', 'False'), ('ShortestPath', 'PROTEINS_full', 'False'), - ('ShortestPath', 'MOLT-4', 'False'), - ('StructuralSP', 'MOLT-4', 'True'), - ('StructuralSP', 'MOLT-4', 'False'), - ('ShortestPath', 'MOLT-4H', 'True'), - ('ShortestPath', 'MOLT-4H', 'False'), - ('StructuralSP', 'MOLT-4H', 'True'), - ('StructuralSP', 'MOLT-4H', 'False'), ('StructuralSP', 'Mutagenicity', 'True'), ('StructuralSP', 'Mutagenicity', 'False'), ('StructuralSP', 'REDDIT-BINARY', 'True'), diff --git a/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp_space.py b/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp_space.py index 35a6d63..c608047 100644 --- a/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp_space.py +++ b/gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp_space.py @@ -17,6 +17,7 @@ OUT_TIME_LIST = [] OUT_MEM_LIST = set({('ShortestPath', 'REDDIT-BINARY', 'True'), ('ShortestPath', 'REDDIT-BINARY', 'False'), ('StructuralSP', 'ENZYMES', 'False'), + ('StructuralSP', 'AIDS', 'False'), ('ShortestPath', 'DD', 'True'), ('ShortestPath', 'DD', 'False'), ('StructuralSP', 'DD', 'True'), @@ -55,6 +56,7 @@ OUT_MEM_LIST = set({('ShortestPath', 'REDDIT-BINARY', 'True'), ('ShortestPath', 'P388H', 'False'), ('StructuralSP', 'P388H', 'True'), ('StructuralSP', 'P388H', 'False'), + ('StructuralSP', 'NCI1', 'False'), ('ShortestPath', 'NCI-H23', 'True'), ('ShortestPath', 'NCI-H23', 'False'), ('StructuralSP', 'NCI-H23', 'True'),