Check if alpha is not None when restricting it to be at most 1 #199
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4203747 to
ae7fbfe
Compare
rflamary
reviewed
Jul 15, 2020
ot/optim.py
Outdated
| @@ -69,7 +69,7 @@ def phi(alpha1): | |||
| alpha, phi1 = scalar_search_armijo( | |||
| phi, phi0, derphi0, c1=c1, alpha0=alpha0) | |||
|
|
|||
| return min(1, alpha), fc[0], phi1 | |||
| return min(1, alpha) if alpha is not None else 1, fc[0], phi1 | |||
There was a problem hiding this comment.
could you put the test in another line with a small comment about what is necessary?
It is a bit hard to follow in the return
There was a problem hiding this comment.
Also I guess you have an example where the original function failed. Could you do a simple no regression test it test_optim.py to check that this problem never re-appears again? It feels as if this function always needs tuning ;)
There was a problem hiding this comment.
Hello @panpan2 could you please take into account my comment so that we can merge your PR?
There was a problem hiding this comment.
@rflamary any other changes needed to merge this?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Types of changes
scipy.optimize.linesearch.scalar_search_armijo can return alpha=None (function definition). In optim.py:line_search_armijo as part of a previous issue #184, we restrict the value of alpha to be at most 1 with min(1, alpha) but this throws an Exception when alpha is None. In this PR, we just check the value of
alphais notNonewhen making the comparison with1.Motivation and context / Related issue
Issue: #198
How has this been tested (if it applies)
Checklist