Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patch for computation of treelet kernel: intersection does not induce… #55

Merged
merged 1 commit into from
Dec 6, 2023
Merged

patch for computation of treelet kernel: intersection does not induce… #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions gklearn/kernels/treelet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions gklearn/kernels/treeletKernel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down