From 684d26bf7e104756e4af44889872def268e221dc Mon Sep 17 00:00:00 2001 From: jajupmochi Date: Sat, 23 Jan 2021 18:32:16 +0100 Subject: [PATCH 1/2] [Exp] Update exceptions in fcsp exps. --- gklearn/experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp.py | 1 + .../experiments/thesis/graph_kernels/fcsp/run_jobs_compare_fcsp_space.py | 1 + 2 files changed, 2 insertions(+) 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 7a98686..4997c41 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 @@ -59,6 +59,7 @@ OUT_MEM_LIST = set({('StructuralSP', 'DD', 'True'), ('ShortestPath', 'TWITTER-Real-Graph-Partial', 'True'), ('ShortestPath', 'TWITTER-Real-Graph-Partial', 'False'), ('StructuralSP', 'TWITTER-Real-Graph-Partial', 'True'), + ('StructuralSP', 'TWITTER-Real-Graph-Partial', 'False'), }) MISS_LABEL_LIST = set({('StructuralSP', 'GREC', '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 37cbb2e..35a6d63 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 @@ -130,6 +130,7 @@ OUT_MEM_LIST = set({('ShortestPath', 'REDDIT-BINARY', 'True'), ('ShortestPath', 'DBLP_v1', 'True'), ('ShortestPath', 'DBLP_v1', 'False'), ('StructuralSP', 'DBLP_v1', 'True'), + ('StructuralSP', 'DBLP_v1', 'False'), ('ShortestPath', 'COLLAB', 'True'), ('ShortestPath', 'COLLAB', 'False'), ('StructuralSP', 'COLLAB', 'True'), From 47951de0491c3c1cc82fc2dac627371a6f975288 Mon Sep 17 00:00:00 2001 From: jajupmochi Date: Mon, 25 Jan 2021 23:27:12 +0100 Subject: [PATCH 2/2] [Update] Move the import of control into the __init__(). --- gklearn/kernels/sylvester_equation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gklearn/kernels/sylvester_equation.py b/gklearn/kernels/sylvester_equation.py index 9f8fc66..03f9a18 100644 --- a/gklearn/kernels/sylvester_equation.py +++ b/gklearn/kernels/sylvester_equation.py @@ -14,7 +14,6 @@ import sys from gklearn.utils import get_iters import numpy as np import networkx as nx -from control import dlyap from gklearn.utils.parallel import parallel_gm, parallel_me from gklearn.kernels import RandomWalkMeta @@ -23,6 +22,7 @@ class SylvesterEquation(RandomWalkMeta): def __init__(self, **kwargs): + from control import dlyap super().__init__(**kwargs)