Merge pull request #58 from jajupmochi/master

Fix treelet

.github/ISSUE_TEMPLATE/issue-template.md

@@ -0,0 +1,30 @@
+---
+name: Issue template
+about: Issue template
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Please describe the issue in detail here, and fill in the fields below -->
+
+### Reproducing code example:
+
+<!-- A short code example that reproduces the problem/missing feature. It should be
+self-contained, i.e., possible to run as-is via 'python myproblem.py' -->
+
+```python
+import gklearn
+<< your code here >>
+```
+
+<!-- Remove these sections for a feature request -->
+
+### Error message:
+
+<!-- Full error message, if any (starting from line Traceback: ...) -->
+
+### graphkit-learn/Python version information:
+
+<!-- Output from 'import sys, gklearn; print(gklearn.__version__, sys.version)' -->

README.md

@@ -4,7 +4,8 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/bdxsolk0t1uji9rd?svg=true)](https://ci.appveyor.com/project/jajupmochi/graphkit-learn)
 [![codecov](https://codecov.io/gh/jajupmochi/graphkit-learn/branch/master/graph/badge.svg)](https://codecov.io/gh/jajupmochi/graphkit-learn)
 [![Documentation Status](https://readthedocs.org/projects/graphkit-learn/badge/?version=master)](https://graphkit-learn.readthedocs.io/en/master/?badge=master)
-[![PyPI version](https://badge.fury.io/py/graphkit-learn.svg)](https://badge.fury.io/py/graphkit-learn)
+[![PyPI version](https://badge.fury.io/py/graphkit-learn.svg)](https://badge.fury.io/py/graphkit-learn) 
+[![Join the chat at https://gitter.im/graphkit-learn/graphkit-learn](https://badges.gitter.im/graphkit-learn/graphkit-learn.svg)](https://gitter.im/graphkit-learn/graphkit-learn?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 A Python package for graph kernels, graph edit distances and graph pre-image problem.
 

gklearn/kernels/treelet.py

@@ -452,20 +452,12 @@ def _kernel_do(self, canonkey1, canonkey2):
 		kernel : float
 			Treelet kernel between 2 graphs.
 		"""
-		keys = set(canonkey1.keys()) & set(
-			canonkey2.keys()
-		)  # find same canonical keys in both graphs
+		keys = set(canonkey1.keys()) | set(canonkey2.keys())  # find same canonical keys in both graphs
 		if len(keys) == 0:  # There is nothing in common...
-			return 0
+		        return 0
 
-		vector1 = np.array(
-			[(canonkey1[key] if (key in canonkey1.keys()) else 0) for key in
-			 keys]
-		)
-		vector2 = np.array(
-			[(canonkey2[key] if (key in canonkey2.keys()) else 0) for key in
-			 keys]
-		)
+		vector1 = np.array([canonkey1.get(key,0) for key in keys])
+		vector2 = np.array([canonkey2.get(key,0)for key in keys])
 
 		# 		vector1, vector2 = [], []
 		# 		keys1, keys2 = canonkey1, canonkey2

gklearn/kernels/treeletKernel.py

@@ -160,9 +160,9 @@ def _treeletkernel_do(canonkey1, canonkey2, sub_kernel):
 	kernel : float
 		Treelet Kernel between 2 graphs.
 	"""
-	keys = set(canonkey1.keys()) & set(canonkey2.keys()) # find same canonical keys in both graphs
-	vector1 = np.array([(canonkey1[key] if (key in canonkey1.keys()) else 0) for key in keys])
-	vector2 = np.array([(canonkey2[key] if (key in canonkey2.keys()) else 0) for key in keys]) 
+	keys = set(canonkey1.keys()) | set(canonkey2.keys()) # find union of canonical keys in both graphs
+	vector1 = np.array([canonkey1.get(key,0) for key in keys])
+	vector2 = np.array([canonkey2.get(key,0) for key in keys]) 
 	kernel = sub_kernel(vector1, vector2) 
 	return kernel