test/func: replacing parameters name with funcy

Author: Luiskitsu

src/diffpy/morph/morph_api.py

@@ -40,7 +40,7 @@
     ],
     qdamp=morphs.MorphResolutionDamping,
     squeeze=morphs.MorphSqueeze,
-    parameters=morphs.MorphFuncy,
+    funcy=morphs.MorphFuncy,
 )
 _default_config = dict(
     scale=None,
@@ -49,7 +49,7 @@
     baselineslope=None,
     qdamp=None,
     squeeze=None,
-    parameters=None,
+    funcy=None,
 )
 
 
@@ -144,7 +144,7 @@ def morph(
             - 'baselineslope'
             - 'qdamp'
             - 'squeeze'
-            - 'parameters'
+            - 'funcy'
 
     Returns
     -------
@@ -207,7 +207,7 @@ def morph(
         if k == "smear":
             [chain.append(el()) for el in morph_cls]
             refpars.append("baselineslope")
-        elif k == "parameters":
+        elif k == "funcy":
             morph_inst = morph_cls()
             morph_inst.function = rv_cfg.get("function", None)
             if morph_inst.function is None:

src/diffpy/morph/morphs/morphfuncy.py

@@ -11,7 +11,7 @@ class MorphFuncy(Morph):
     yinlabel = LABEL_GR
     xoutlabel = LABEL_RA
     youtlabel = LABEL_GR
-    parnames = ["parameters"]
+    parnames = ["funcy"]
 
     def morph(self, x_morph, y_morph, x_target, y_target):
         """General morph function that applies a user-supplied function to the
@@ -50,7 +50,7 @@ def morph(self, x_morph, y_morph, x_target, y_target):
         and target array (x_target, y_target):
         >>> morph = MorphFuncy()
         >>> morph.function = sine_function
-        >>> morph.parameters = parameters
+        >>> morph.funcy = parameters
         >>> x_morph_out, y_morph_out, x_target_out, y_target_out = morph.morph(
         ...     x_morph, y_morph, x_target, y_target)
 
@@ -59,11 +59,11 @@ def morph(self, x_morph, y_morph, x_target, y_target):
         >>> y_morph_in = morph.y_morph_in
         >>> x_target_in = morph.x_target_in
         >>> y_target_in = morph.y_target_in
-        >>> parameters_out = morph.parameters
+        >>> parameters_out = morph.funcy
         """
         Morph.morph(self, x_morph, y_morph, x_target, y_target)
 
         self.y_morph_out = self.function(
-            self.x_morph_in, self.y_morph_in, **self.parameters
+            self.x_morph_in, self.y_morph_in, **self.funcy
         )
         return self.xyallout

tests/test_morph_func.py

@@ -133,7 +133,7 @@ def linear_function(x, y, scale, offset):
     y_morph = np.sin(x_morph)
     x_target = x_morph.copy()
     y_target = np.sin(x_target) * 2 * x_target + 0.4
-    cfg = morph_default_config(parameters={"scale": 1.2, "offset": 0.1})
+    cfg = morph_default_config(funcy={"scale": 1.2, "offset": 0.1})
     cfg["function"] = linear_function
     morph_rv = morph(x_morph, y_morph, x_target, y_target, **cfg)
     morphed_cfg = morph_rv["morphed_config"]
@@ -142,6 +142,6 @@ def linear_function(x, y, scale, offset):
     ].xyallout
     assert np.allclose(x_morph_out, x_target_out)
     assert np.allclose(y_morph_out, y_target_out, atol=1e-6)
-    fitted_parameters = morphed_cfg["parameters"]
+    fitted_parameters = morphed_cfg["funcy"]
     assert np.allclose(fitted_parameters["scale"], 2, atol=1e-6)
     assert np.allclose(fitted_parameters["offset"], 0.4, atol=1e-6)

tests/test_morphfuncy.py

@@ -63,7 +63,7 @@ def test_funcy(function, parameters, expected_function):
     y_morph_expected = expected_function(x_morph, y_morph)
     morph = MorphFuncy()
     morph.function = function
-    morph.parameters = parameters
+    morph.funcy = parameters
     x_morph_actual, y_morph_actual, x_target_actual, y_target_actual = (
         morph.morph(x_morph, y_morph, x_target, y_target)
     )