Skip to content

[MRG] SinkhornL1L2Transport bug - #312

Merged
rflamary merged 3 commits into
PythonOT:masterfrom
ncassereau:bug_sinkhornl1l2
Nov 17, 2021
Merged

rflamary merged 3 commits into
PythonOT:masterfrom
ncassereau:bug_sinkhornl1l2

Conversation

@ncassereau

@ncassereau ncassereau commented Nov 17, 2021 •

Copy link
Copy Markdown
Contributor

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

Attempt to resolve #311.
This bug appeared on multiple occasions (#281, #311 as far as I'm aware) due to the fact that line_search_armijo could return None as an alpha if no valid value was found. This behaviour is faulty and might be a cause of bugs in the future. From now on, this function returns 0 if no alpha value was found, meaning convergence point was reached.

How has this been tested (if it applies)

Tested with the data provided by issue #311

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.

@codecov

codecov Bot commented Nov 17, 2021 •

Copy link
Copy Markdown

Codecov Report

Merging #312 (d036d17) into master (f4b363d) will increase coverage by 0.03%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #312      +/-   ##
==========================================
+ Coverage   93.39%   93.43%   +0.03%     
==========================================
  Files          21       21              
  Lines        4888     4887       -1     
==========================================
+ Hits         4565     4566       +1     
+ Misses        323      321       -2     

@ncassereau ncassereau changed the title [WIP] SinkhornL1L2Transport bug [MRG] SinkhornL1L2Transport bug Nov 17, 2021
@rflamary
rflamary merged commit e235b08 into PythonOT:master Nov 17, 2021
@ncassereau
ncassereau deleted the bug_sinkhornl1l2 branch November 17, 2021 10:17
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.

An Error (RuntimeWarning: invalid value encountered in log) in ot.da.SinkhornL1lL2 after some iterations

2 participants