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

V0.2.x

.travis.yml

@@ -4,6 +4,7 @@ python:
 - '3.6'
 - '3.7'
 - '3.8'
+- '3.9'
 
 before_install:
 - python --version

README.md

@@ -18,7 +18,7 @@ A Python package for graph kernels, graph edit distances and graph pre-image pro
 * tabulate>=0.8.2
 * tqdm>=4.26.0
 * control>=0.8.2 (for generalized random walk kernels only)
-* slycot==0.3.3 (for generalized random walk kernels only, which requires a fortran compiler, gfortran for example)
+* slycot>0.4.0 (for generalized random walk kernels only, which requires a fortran compiler, gfortran for example)
 
 ## How to use?
 

gklearn/preimage/median_preimage_generator.py

@@ -183,7 +183,7 @@ class MedianPreimageGenerator(PreimageGenerator):
 		results['mge']['num_decrease_order'] = self._mge.get_num_times_order_decreased()
 		results['mge']['num_increase_order'] = self._mge.get_num_times_order_increased()
 		results['mge']['num_converged_descents'] = self._mge.get_num_converged_descents()
-		results['ged_matrix_set_median'] = self._mge.ged_matrix_set_median_tmp
+# 		results['ged_matrix_set_median'] = self._mge.ged_matrix_set_median_tmp
 		return results
 
 		

gklearn/tests/test_median_preimage_generator.py

@@ -71,4 +71,8 @@ def test_median_preimage_generator():
 		try:
 			generate_median_preimages_by_class(ds_name, mpg_options, kernel_options, ged_options, mge_options, save_results=save_results, save_medians=True, plot_medians=True, load_gm='auto', dir_save=dir_save, irrelevant_labels=irrelevant_labels, edge_required=edge_required, cut_range=range(0, 4))
 		except Exception as exception:
-			assert False, exception
+			assert False, exception
+			
+	
+if __name__ == '__main__':
+	test_median_preimage_generator()

requirements.txt

@@ -6,6 +6,7 @@ scikit-learn>=0.20.0
 tabulate>=0.8.2
 tqdm>=4.26.0
 control>=0.8.2 # for generalized random walk kernels only.
+slycot>=0.4.0 # for generalized random walk kernels only, which requires a fortran compiler, gfortran for example
 cvxpy>=1.0.31 # for preimage. Does not work for "pip install graphkit-learn".
 # -e https://files.pythonhosted.org/packages/11/d0/d900870dc2d02ea74961b90c353666c6528a33ea61a10aa59a0d5574ae59/cvxpy-1.0.31.tar.gz # for preimage.
 cvxopt>=1.2.5 # for preimage.

requirements_pypi.txt

@@ -6,6 +6,7 @@ scikit-learn>=0.20.0
 tabulate>=0.8.2
 tqdm>=4.26.0
 control>=0.8.2 # for generalized random walk kernels only.
+# slycot>=0.4.0 # for generalized random walk kernels only, which requires a fortran compiler, gfortran for example
 # cvxpy>=1.0.31 # for preimage. Does not work for "pip install graphkit-learn".
 # -e https://files.pythonhosted.org/packages/11/d0/d900870dc2d02ea74961b90c353666c6528a33ea61a10aa59a0d5574ae59/cvxpy-1.0.31.tar.gz # for preimage.
 cvxopt>=1.2.5 # for preimage.