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] MM algorithms for UOT #362

Merged
merged 35 commits into from
Apr 11, 2022
Merged

[MRG] MM algorithms for UOT #362

merged 35 commits into from
Apr 11, 2022

Conversation

lchapel
Copy link
Collaborator

@lchapel lchapel commented Apr 8, 2022

Types of changes

  • introduce mm algorithms for unbalanced OT + example
  • update doc of regpath
  • update readme

Motivation and context / Related issue

How has this been tested (if it applies)

pep8 + doctest

PR checklist

  • I have read the CONTRIBUTING document.
  • The documentation is up-to-date with the changes I made (check build artifacts).
  • All tests passed, and additional code has been covered with new tests.
  • I have added the PR and Issue fix to the RELEASES.md file.

@codecov
Copy link

codecov bot commented Apr 8, 2022

Codecov Report

Merging #362 (8385b6d) into master (0b223ff) will decrease coverage by 0.00%.
The diff coverage is 93.10%.

@@            Coverage Diff             @@
##           master     #362      +/-   ##
==========================================
- Coverage   93.78%   93.78%   -0.01%     
==========================================
  Files          23       23              
  Lines        5845     5902      +57     
==========================================
+ Hits         5482     5535      +53     
- Misses        363      367       +4     

@rflamary rflamary changed the title MM algorithms for UOT [MRG] MM algorithms for UOT Apr 8, 2022
Copy link
Collaborator

@rflamary rflamary left a comment

Choose a reason for hiding this comment

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

Thank you @lchapel this is a very nice PR.

could you pease add a few more tests to check for special cases ?

also I'm not sure why the doc is not building but please check locally that the new function give a proper documentation.


while (err > stopThr and cpt < numItermax):
Kprev = K
K = K * q1
Copy link
Collaborator

Choose a reason for hiding this comment

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

What is all this? was the implementation false? why is there so much more steps?

ot/unbalanced.py Outdated
if G0 is None:
G = a[:, None] * b[None, :]
else:
G = G0
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please also test with G0 not given and with a and b =[]

log['err'].append(err)
log['G'].append(G)
if verbose:
print('{:5d}|{:8e}|'.format(i, err))
Copy link
Collaborator

Choose a reason for hiding this comment

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

test with verbose

verbose=verbose, log=True)

if log:
return log_mm['cost'], log_mm
Copy link
Collaborator

Choose a reason for hiding this comment

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

also test with log

@rflamary rflamary merged commit ac4cf44 into PythonOT:master Apr 11, 2022
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