Handle kwargs and bounds in curve_fit
#2545
Merged
Conversation
This file contains 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
src/scipp/optimize/__init__.py
Outdated
Comment on lines
66
to
71
| if isinstance(b, Variable): | ||
| if b.shape != [2]: | ||
| raise ValueError("Parameter bounds must be either a tuple of scalar " | ||
| "variables or a 2-element array variable. " | ||
| f"Got sizes={b.sizes} as bounds for '{name}'.") | ||
| return tuple(b.to(unit=unit, dtype=float).values) |
There was a problem hiding this comment.
It is a bit odd to support this, I think? What is the meaning of the dimension?
There was a problem hiding this comment.
None as far as curve_fit is concerned. I was just thinking it might be useful, similarly to passing limits as a length-2 array to sc.array.
But I don't mind removing it.
There was a problem hiding this comment.
similarly to passing limits as a length-2 array to sc.array.
Not sure what you are referring to?
There was a problem hiding this comment.
I meant sc.arange: #2140 (comment)
tests/optimize/curve_fit_test.py
Outdated
| 'a': sc.scalar(1.0, unit='s'), | ||
| 'b': sc.scalar(1.0, unit='m') | ||
| }, | ||
| bounds={'b': sc.array(dims=['xyz'], values=[-2.0, 2.0], unit='m')}) |
There was a problem hiding this comment.
As mentioned above, we have an odd dummy dimension here?
SimonHeybrock
approved these changes
Apr 25, 2022
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.
Fixes #2541