Merge pull request #45 from jajupmochi/v0.2.x

V0.2.x

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'),

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'),

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)