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.

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

try add astar in classic_solvers.py; add some functions in utils.py to support NetworkX and GraphML formats #63

Merged
merged 60 commits into from
Jul 31, 2023

Conversation

heatingma
Copy link
Member

No description provided.

@codecov
Copy link

codecov bot commented Jul 11, 2023

Codecov Report

Merging #63 (c47f6ab) into main (edc0f3e) will decrease coverage by 0.64%.
Report is 1 commits behind head on main.
The diff coverage is 86.61%.

❗ Current head c47f6ab differs from pull request most recent head 95f8eeb. Consider uploading reports for the commit 95f8eeb to get more accurate results

@@            Coverage Diff             @@
##             main      #63      +/-   ##
==========================================
- Coverage   93.67%   93.04%   -0.64%     
==========================================
  Files          19       20       +1     
  Lines        6993     7578     +585     
==========================================
+ Hits         6551     7051     +500     
- Misses        442      527      +85     
Files Changed Coverage Δ
pygmtools/pytorch_astar_modules.py 82.99% <82.99%> (ø)
pygmtools/classic_solvers.py 87.50% <86.66%> (-0.42%) ⬇️
pygmtools/neural_solvers.py 88.62% <86.66%> (-0.43%) ⬇️
pygmtools/pytorch_backend.py 94.91% <88.61%> (-2.28%) ⬇️
pygmtools/utils.py 86.19% <94.00%> (+0.94%) ⬆️
pygmtools/__init__.py 75.00% <100.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plz revert commits on this file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plz revert commits on this file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plz revert commits on this file.

return_network=False, pretrain='AIDS700nef',backend=None,**kwargs):

r"""
GENN-A* solver for graph matching based on Graph Neural Network.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add more descriptions for GENN, A-star algorithm, graph edit distance problem, citation information, etc.

Comment on lines 28 to 46
#cdef class TreeNode:
# cdef public x_indices
# cdef public double gplsh
# cdef public long idx
#
# def __init__(self, x_indices, double gplsh, long idx):
# self.x_indices = x_indices
# self.gplsh = gplsh
# self.idx = idx

#cdef (double, long) key_func(TreeNode ele):
#cdef tuple key_func(TreeNode ele):
# cdef double gplsh = ele.gplsh
# cdef long idx = ele.idx
# return gplsh, -idx

#cdef bool comp_func(TreeNode a, TreeNode b):
# # note - no protection if allocated memory isn't long enough
# return a.gplsh < a.gplsh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove these comments

@rogerwwww rogerwwww merged commit ebaf921 into Thinklab-SJTU:main Jul 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants