Updates to phase.interpolate, renamed to phase.interp. #592
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
…bset upon which the interpolation should be performed.
…eft in the upgrade guide and the test of the JOSS code.
kaushikponnapalli
approved these changes
May 10, 2021
Kenneth-T-Moore
requested changes
May 10, 2021
| p.set_val('traj.phase0.states:x', phase.interp('x', ys=[0, 10]), units='m') | ||
| p.set_val('traj.phase0.states:y', phase.interp('y', ys=[10, 5]), units='m') | ||
| p.set_val('traj.phase0.states:v', phase.interp('v', ys=[0, 9.9]), units='m/s') | ||
| p.set_val('traj.phase0.controls:theta', phase.interp('theta', ys=[5, 100]), units='deg') |
There was a problem hiding this comment.
Was the change in values intentional?
There was a problem hiding this comment.
Not intentional but in the end only the state values matter here, since we're using fix_initial/fix_final. The control values will all change and the initial guess isn't that consequential.
| p.set_val('traj.burn2.states:r', value=burn2.interp('r', [1, 3])) | ||
| p.set_val('traj.burn2.states:theta', value=burn2.interp('theta', [0, 4.0])) | ||
| p.set_val('traj.burn2.states:vr', value=burn2.interp('vr', [0, 0])) | ||
| p.set_val('traj.burn2.states:vt', value=burn2.interp('vt', [1, np.sqrt(1 / 3)])) |
There was a problem hiding this comment.
some value changes here too
| p['traj0.phase0.states:v'] = phase.interpolate(ys=[0, 9.9], nodes='state_input') | ||
| p.set_val('traj0.phase0.states:x', phase.interp('x', [0, 10]), units='m') | ||
| p.set_val('traj0.phase0.states:y', phase.interp('y', [10, 5]), units='m') | ||
| p.set_val('traj0.phase0.states:v', phase.interp('v', [0, 5]), units='m/s') |
There was a problem hiding this comment.
Changes here too. Wonder why you didn't need to change any asserts.
There was a problem hiding this comment.
Same, final velocity is unconstrained.
dymos/phase/phase.py
Outdated
| @@ -1669,6 +1675,93 @@ def interpolate(self, xs=None, ys=None, nodes='all', kind='linear', axis=0): | |||
| res = res.T | |||
| return res | |||
|
|
|||
| def interp(self, name=None, ys=None, xs=None, nodes=None, kind='linear', axis=0): | |||
| """ | |||
| Return an array of values on interpolated to the given node subset of the phase. | |||
Kenneth-T-Moore
approved these changes
May 12, 2021
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.
Summary
Adds
phase.interpto the API and deprecatesphase.interpolate.phase.interpis similar with a few exceptions:nameis first, followed byys, this makes the most common use case of linear interpolation much more terse:phase.interpolate('x', [0, 10])Related Issues
Status
Backwards incompatibilities
phase.interpolate is deprecated
New Dependencies
None