-
Notifications
You must be signed in to change notification settings - Fork 19
feat: add set_extrapolation_info function in morph.Morph
#255
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| **Added:** | ||
|
|
||
| * Enable ``diffpy.morph`` to detect extrapolation. | ||
|
|
||
| **Changed:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Deprecated:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Removed:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Fixed:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Security:** | ||
|
|
||
| * <news item> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,9 +12,8 @@ | |
| # See LICENSE.txt for license information. | ||
| # | ||
| ############################################################################## | ||
| """Morph -- base class for defining a morph. | ||
| """ | ||
|
|
||
| """Morph -- base class for defining a morph.""" | ||
| import numpy | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
|
||
| LABEL_RA = "r (A)" # r-grid | ||
| LABEL_GR = "G (1/A^2)" # PDF G(r) | ||
|
|
@@ -246,6 +245,36 @@ def plotOutputs(self, xylabels=True, **plotargs): | |
| ylabel(self.youtlabel) | ||
| return rv | ||
|
|
||
| def set_extrapolation_info(self, x_true, x_extrapolate): | ||
| """Set extrapolation information of the concerned morphing | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. docstring is added. |
||
| process. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| x_true : array | ||
| original x values | ||
| x_extrapolate : array | ||
| x values after a morphing process | ||
| """ | ||
|
|
||
| cutoff_low = min(x_true) | ||
| extrap_low_x = numpy.where(x_extrapolate < cutoff_low)[0] | ||
| is_extrap_low = False if len(extrap_low_x) == 0 else True | ||
| cutoff_high = max(x_true) | ||
| extrap_high_x = numpy.where(x_extrapolate > cutoff_high)[0] | ||
| is_extrap_high = False if len(extrap_high_x) == 0 else True | ||
| extrap_index_low = extrap_low_x[-1] if is_extrap_low else 0 | ||
| extrap_index_high = extrap_high_x[0] if is_extrap_high else -1 | ||
| extrapolation_info = { | ||
| "is_extrap_low": is_extrap_low, | ||
| "cutoff_low": cutoff_low, | ||
| "extrap_index_low": extrap_index_low, | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| "is_extrap_high": is_extrap_high, | ||
| "cutoff_high": cutoff_high, | ||
| "extrap_index_high": extrap_index_high, | ||
| } | ||
| self.extrapolation_info = extrapolation_info | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The way the function works has changed from returning a dict to setting the object's attributes since now the name starts with |
||
|
|
||
| def __getattr__(self, name): | ||
| """Obtain the value from self.config, when normal lookup fails. | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,47 +46,56 @@ | |
| @pytest.mark.parametrize("squeeze_coeffs", squeeze_coeffs_dic) | ||
| def test_morphsqueeze(x_morph, x_target, squeeze_coeffs): | ||
| y_target = np.sin(x_target) | ||
| y_morph = np.sin(x_morph) | ||
| # expected output | ||
| y_morph_expected = y_morph | ||
| x_morph_expected = x_morph | ||
| x_target_expected = x_target | ||
| y_target_expected = y_target | ||
| # actual output | ||
| coeffs = [squeeze_coeffs[f"a{i}"] for i in range(len(squeeze_coeffs))] | ||
| squeeze_polynomial = Polynomial(coeffs) | ||
| x_squeezed = x_morph + squeeze_polynomial(x_morph) | ||
| y_morph = np.sin(x_squeezed) | ||
| low_extrap = np.where(x_morph < x_squeezed[0])[0] | ||
| high_extrap = np.where(x_morph > x_squeezed[-1])[0] | ||
| extrap_index_low_expected = low_extrap[-1] if low_extrap.size else None | ||
| extrap_index_high_expected = high_extrap[0] if high_extrap.size else None | ||
| x_morph_expected = x_morph | ||
| y_morph_expected = np.sin(x_morph) | ||
| morph = MorphSqueeze() | ||
| morph.squeeze = squeeze_coeffs | ||
| x_morph_actual, y_morph_actual, x_target_actual, y_target_actual = morph( | ||
| x_morph, y_morph, x_target, y_target | ||
| ) | ||
| extrap_index_low = morph.extrap_index_low | ||
| extrap_index_high = morph.extrap_index_high | ||
| if extrap_index_low is None: | ||
| extrap_index_low = 0 | ||
| elif extrap_index_high is None: | ||
| extrap_index_high = -1 | ||
|
|
||
| extrap_low = np.where(x_morph < min(x_squeezed))[0] | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The code to compute
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there an argument to be made that this work could be done in |
||
| extrap_high = np.where(x_morph > max(x_squeezed))[0] | ||
| extrap_index_low_expected = extrap_low[-1] if extrap_low.size else 0 | ||
| extrap_index_high_expected = extrap_high[0] if extrap_high.size else -1 | ||
|
|
||
| extrapolation_info = morph.extrapolation_info | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Getting the index now can be done in the |
||
| extrap_index_low_actual = extrapolation_info["extrap_index_low"] | ||
| extrap_index_high_actual = extrapolation_info["extrap_index_high"] | ||
|
|
||
| assert np.allclose( | ||
| y_morph_actual[extrap_index_low + 1 : extrap_index_high], | ||
| y_morph_expected[extrap_index_low + 1 : extrap_index_high], | ||
| y_morph_actual[ | ||
| extrap_index_low_expected + 1 : extrap_index_high_expected | ||
| ], | ||
| y_morph_expected[ | ||
| extrap_index_low_expected + 1 : extrap_index_high_expected | ||
| ], | ||
| atol=1e-6, | ||
| ) | ||
| assert np.allclose( | ||
| y_morph_actual[:extrap_index_low], | ||
| y_morph_expected[:extrap_index_low], | ||
| y_morph_actual[:extrap_index_low_expected], | ||
| y_morph_expected[:extrap_index_low_expected], | ||
| atol=1e-3, | ||
| ) | ||
| assert np.allclose( | ||
| y_morph_actual[extrap_index_high:], | ||
| y_morph_expected[extrap_index_high:], | ||
| y_morph_actual[extrap_index_high_expected:], | ||
| y_morph_expected[extrap_index_high_expected:], | ||
| atol=1e-3, | ||
| ) | ||
| assert morph.extrap_index_low == extrap_index_low_expected | ||
| assert morph.extrap_index_high == extrap_index_high_expected | ||
| assert np.allclose(x_morph_actual, x_morph_expected) | ||
| assert np.allclose(x_target_actual, x_target) | ||
| assert np.allclose(y_target_actual, y_target) | ||
| assert np.allclose(x_target_actual, x_target_expected) | ||
| assert np.allclose(y_target_actual, y_target_expected) | ||
| assert extrap_index_low_actual == extrap_index_low_expected | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| assert extrap_index_high_actual == extrap_index_high_expected | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
|
|
@@ -97,23 +106,23 @@ def test_morphsqueeze(x_morph, x_target, squeeze_coeffs): | |
| {"a0": 0.01}, | ||
| lambda x: ( | ||
| "Warning: points with grid value below " | ||
| f"{x[0]} will be extrapolated." | ||
| f"{x[0]} are extrapolated." | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "will be" -> "are" |
||
| ), | ||
| ), | ||
| # extrapolate above | ||
| ( | ||
| {"a0": -0.01}, | ||
| lambda x: ( | ||
| "Warning: points with grid value above " | ||
| f"{x[1]} will be extrapolated." | ||
| f"{x[1]} are extrapolated." | ||
| ), | ||
| ), | ||
| # extrapolate below and above | ||
| ( | ||
| {"a0": 0.01, "a1": -0.002}, | ||
| lambda x: ( | ||
| "Warning: points with grid value below " | ||
| f"{x[0]} and above {x[1]} will be " | ||
| f"{x[0]} and above {x[1]} are " | ||
| "extrapolated." | ||
| ), | ||
| ), | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Logic flow changed according to @sbillinge's comment.