From ba3414159a9f275ba6b4b2a062fce049a0237ace Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 9 Jan 2025 09:57:04 +0100 Subject: [PATCH] Fix tests --- sasdata/transforms/rebinning.py | 1 + sasdata/transforms/test_interpolation.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sasdata/transforms/rebinning.py b/sasdata/transforms/rebinning.py index 7bdc662..fe96bcb 100644 --- a/sasdata/transforms/rebinning.py +++ b/sasdata/transforms/rebinning.py @@ -132,6 +132,7 @@ def calculate_interpolation_matrix_1d(input_axis: Quantity[ArrayLike], if mask is None: return conversion_matrix, None + else: # Create a new mask diff --git a/sasdata/transforms/test_interpolation.py b/sasdata/transforms/test_interpolation.py index 688da65..97b4f79 100644 --- a/sasdata/transforms/test_interpolation.py +++ b/sasdata/transforms/test_interpolation.py @@ -23,7 +23,7 @@ def test_linear_interpolate_matrix_inside(fun: Callable[[Quantity[ArrayLike]], Q test_points = NamedQuantity("x_test", np.linspace(-5, 5, 11), units.meters) - mapping = calculate_interpolation_matrix_1d(original_points, test_points, order=InterpolationOptions.LINEAR) + mapping, _ = calculate_interpolation_matrix_1d(original_points, test_points, order=InterpolationOptions.LINEAR) y_original = fun(original_points) y_test = y_original @ mapping @@ -53,7 +53,7 @@ def test_linear_interpolate_different_units(fun: Callable[[Quantity[ArrayLike]], original_points = NamedQuantity("x_base", np.linspace(-10,10, 107), units.meters) test_points = NamedQuantity("x_test", np.linspace(-5000, 5000, 11), units.millimeters) - mapping = calculate_interpolation_matrix_1d(original_points, test_points, order=InterpolationOptions.LINEAR) + mapping, _ = calculate_interpolation_matrix_1d(original_points, test_points, order=InterpolationOptions.LINEAR) y_original = fun(original_points) y_test = y_original @ mapping @@ -83,7 +83,7 @@ def test_linearity_linear(): x_and_y = NamedQuantity("x_base", np.linspace(-10, 10, 2), units.meters) new_x = NamedQuantity("x_test", np.linspace(-5000, 5000, 101), units.millimeters) - mapping = calculate_interpolation_matrix_1d(x_and_y, new_x, order=InterpolationOptions.LINEAR) + mapping, _ = calculate_interpolation_matrix_1d(x_and_y, new_x, order=InterpolationOptions.LINEAR) linear_points = x_and_y @ mapping