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

[MRG] Fix bugs for partial OT #215

Merged
merged 13 commits into from
Oct 22, 2020
Merged

[MRG] Fix bugs for partial OT #215

merged 13 commits into from
Oct 22, 2020

Conversation

lchapel
Copy link
Collaborator

@lchapel lchapel commented Oct 14, 2020

Types of changes

  • Docs change / refactoring / dependency upgrade
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Motivation and context / Related issue

Corrects some bugs on partial-OT and references related to partial-OT

How has this been tested (if it applies)

Checklist

  • The documentation is up-to-date with the changes I made.
  • I have read the CONTRIBUTING document.
  • All tests passed, and additional code has been covered with new tests.

This PR fixes:

the use of the dummy points in function partial_wasserstein
the computation of gamma in function partial_gromov_wasserstein
update the reference paper

@codecov-commenter
Copy link

Codecov Report

Merging #215 into master will decrease coverage by 3.93%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #215      +/-   ##
==========================================
- Coverage   92.28%   88.34%   -3.94%     
==========================================
  Files          15       19       +4     
  Lines        3006     3157     +151     
==========================================
+ Hits         2774     2789      +15     
- Misses        232      368     +136     

@rflamary
Copy link
Collaborator

why codecov ? why? those files are supposed to be excluded!

README.md Outdated
<<<<<<< HEAD

[29] Chapel, L., Alaya, M., Gasso, G. (2020). [Partial Optimal Transport with Applications on Positive-Unlabeled Learning](https://arxiv.org/abs/2002.08276), Advances in Neural Information Processing Systems (NeurIPS), 2020.
=======
Copy link
Collaborator

Choose a reason for hiding this comment

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

merge pb

README.md Outdated

[29] Chapel, L., Alaya, M., Gasso, G. (2019). [Partial Gromov-Wasserstein with Applications on Positive-Unlabeled Learning](https://arxiv.org/abs/2002.08276), arXiv preprint arXiv:2002.08276.

[30] Flamary R., Courty N., Tuia D., Rakotomamonjy A. (2014). [Optimal transport with Laplacian regularization: Applications to domain adaptation and shape matching](https://remi.flamary.com/biblio/flamary2014optlaplace.pdf), NIPS Workshop on Optimal Transport and Machine Learning OTML, 2014.
>>>>>>> 55164e9272c9899ca413fca411d410ec28b736b0
Copy link
Collaborator

Choose a reason for hiding this comment

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

idem

@codecov-io
Copy link

Codecov Report

Merging #215 into master will decrease coverage by 3.93%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #215      +/-   ##
==========================================
- Coverage   92.28%   88.34%   -3.94%     
==========================================
  Files          15       19       +4     
  Lines        3006     3157     +151     
==========================================
+ Hits         2774     2789      +15     
- Misses        232      368     +136     

@rflamary rflamary merged commit 93785eb into PythonOT:master Oct 22, 2020
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.

5 participants