Test: added different grids

Author: Luiskitsu

src/diffpy/morph/morphs/morphsqueeze.py

@@ -1,4 +1,3 @@
-import numpy as np
 from numpy.polynomial import Polynomial
 from scipy.interpolate import interp1d
 
@@ -27,17 +26,15 @@ class MorphSqueeze(Morph):
 
     def morph(self, x_morph, y_morph, x_target, y_target):
         Morph.morph(self, x_morph, y_morph, x_target, y_target)
-        if self.squeeze is None or np.allclose(self.squeeze, 0):
+        if self.squeeze is None:
             self.x_morph_out = self.x_morph_in
             self.y_morph_out = self.y_morph_in
             return self.xyallout
 
         squeeze_polynomial = Polynomial(self.squeeze)
         x_squeezed = self.x_morph_in + squeeze_polynomial(self.x_morph_in)
-
         self.y_morph_out = interp1d(
             x_squeezed, self.y_morph_in, kind="cubic", bounds_error=False
         )(self.x_morph_in)
-
         self.x_morph_out = self.x_morph_in
         return self.xyallout

tests/test_morphsqueeze.py

@@ -1,6 +1,7 @@
 import numpy as np
 import pytest
 from numpy.polynomial import Polynomial
+from scipy.interpolate import interp1d
 
 from diffpy.morph.morphs.morphsqueeze import MorphSqueeze
 
@@ -21,40 +22,36 @@
         [0.1, 0.3],
         # 4th order squeeze coefficients
         [0.2, -0.01, 0.001, -0.001, 0.0004],
-        # Zeros and non-zeros, expect 0 + a1x + 0 + a3x**3
+        # Zeros and non-zeros, the full polynomial is applied
         [0, 0.03, 0, -0.001],
         # Testing zeros, expect no squeezing
-        [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+        [0, 0, 0, 0, 0, 0],
     ],
 )
 def test_morphsqueeze(squeeze_coeffs):
-    x_target = np.linspace(0, 10, 1001)
-    y_target = np.sin(x_target)
-
-    x_make = np.linspace(-3, 13, 1601)
-    lower_idx = np.where(x_make == 0.0)[0][0]
-    upper_idx = np.where(x_make == 10.0)[0][0]
-
+    x_expected = np.linspace(0, 10, 1001)
+    y_expected = np.sin(x_expected)
+    x_make = np.linspace(-3, 13, 3250)
     squeeze_polynomial = Polynomial(squeeze_coeffs)
     x_squeezed = x_make + squeeze_polynomial(x_make)
-
-    x_morph = x_make.copy()
     y_morph = np.sin(x_squeezed)
-
     morph = MorphSqueeze()
     morph.squeeze = squeeze_coeffs
-
-    x_actual, y_actual, x_expected, y_expected = morph(
-        x_morph, y_morph, x_target, y_target
+    x_actual, y_actual, x_target, y_target = morph(
+        x_make, y_morph, x_expected, y_expected
     )
-    y_actual = y_actual[lower_idx : upper_idx + 1]
+    y_actual = interp1d(x_actual, y_actual)(x_target)
+    x_actual = x_target
     assert np.allclose(y_actual, y_expected)
+    assert np.allclose(x_actual, x_expected)
+    assert np.allclose(x_target, x_expected)
+    assert np.allclose(y_target, y_expected)
 
     # Plotting code used for figures in PR comments
     # https://github.com/diffpy/diffpy.morph/pull/180
     # plt.figure()
     # plt.scatter(x_expected, y_expected, color='black', label='Expected')
-    # plt.plot(x_morph, y_morph, color='purple', label='morph')
+    # plt.plot(x_make, y_morph, color='purple', label='morph')
     # plt.plot(x_actual, y_actual, '--', color='gold', label='Actual')
     # plt.legend()
     # plt.show()