diff --git a/gklearn/ged/__init__.py b/gklearn/ged/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gklearn/preimage/experiments/xp_median_preimage.py b/gklearn/preimage/experiments/xp_median_preimage.py index 4fd12d2..2b920e7 100644 --- a/gklearn/preimage/experiments/xp_median_preimage.py +++ b/gklearn/preimage/experiments/xp_median_preimage.py @@ -92,7 +92,7 @@ def xp_median_preimage_9_2(): 'epsilon_ec': 0.1, 'verbose': 2} kernel_options = {'name': 'PathUpToH', - 'depth': 2, # + 'depth': 9, # 'k_func': 'MinMax', # 'compute_method': 'trie', 'parallel': 'imap_unordered', @@ -217,7 +217,7 @@ def xp_median_preimage_8_2(): 'epsilon_ec': 0.1, 'verbose': 2} kernel_options = {'name': 'PathUpToH', - 'depth': 2, # + 'depth': 7, # 'k_func': 'MinMax', # 'compute_method': 'trie', 'parallel': 'imap_unordered', diff --git a/gklearn/tests/test_graph_kernels.py b/gklearn/tests/test_graph_kernels.py index fbad15f..5ee9997 100644 --- a/gklearn/tests/test_graph_kernels.py +++ b/gklearn/tests/test_graph_kernels.py @@ -162,6 +162,11 @@ def test_ShortestPath(ds_name, parallel): node_kernels=sub_kernels) gram_matrix, run_time = graph_kernel.compute(dataset.graphs, parallel=parallel, n_jobs=multiprocessing.cpu_count(), verbose=True) + kernel_list, run_time = graph_kernel.compute(dataset.graphs[0], dataset.graphs[1:], + parallel=parallel, n_jobs=multiprocessing.cpu_count(), verbose=True) + kernel, run_time = graph_kernel.compute(dataset.graphs[0], dataset.graphs[1], + parallel=parallel, n_jobs=multiprocessing.cpu_count(), verbose=True) + except Exception as exception: assert False, exception @@ -190,6 +195,11 @@ def test_StructuralSP(ds_name, parallel): edge_kernels=sub_kernels) gram_matrix, run_time = graph_kernel.compute(dataset.graphs, parallel=parallel, n_jobs=multiprocessing.cpu_count(), verbose=True) + kernel_list, run_time = graph_kernel.compute(dataset.graphs[0], dataset.graphs[1:], + parallel=parallel, n_jobs=multiprocessing.cpu_count(), verbose=True) + kernel, run_time = graph_kernel.compute(dataset.graphs[0], dataset.graphs[1], + parallel=parallel, n_jobs=multiprocessing.cpu_count(), verbose=True) + except Exception as exception: assert False, exception @@ -213,6 +223,10 @@ def test_PathUpToH(ds_name, parallel, k_func, compute_method): depth=2, k_func=k_func, compute_method=compute_method) gram_matrix, run_time = graph_kernel.compute(dataset.graphs, parallel=parallel, n_jobs=multiprocessing.cpu_count(), verbose=True) + kernel_list, run_time = graph_kernel.compute(dataset.graphs[0], dataset.graphs[1:], + parallel=parallel, n_jobs=multiprocessing.cpu_count(), verbose=True) + kernel, run_time = graph_kernel.compute(dataset.graphs[0], dataset.graphs[1], + parallel=parallel, n_jobs=multiprocessing.cpu_count(), verbose=True) except Exception as exception: assert False, exception