changed behavior of lift_data to add abs(min(data_input) * lift). Changed expections of test cases to reflect changed bahvior

Author: aajayi-21

diffpy/snmf/subroutines.py

@@ -25,7 +25,7 @@ def lift_data(data_input, lift=1):
 
     """
     data_input = np.asarray(data_input)
-    return data_input - (np.min(data_input) * lift)
+    return data_input + np.abs(np.min(data_input) * lift)
 
 
 def initialize_arrays(number_of_components, number_of_moments, signal_length):

diffpy/snmf/tests/test_subroutines.py

@@ -139,9 +139,9 @@ def test_reconstruct_data(trd):
 tld = [(([[[1, -1, 1], [0, 0, 0], [2, 10, -3]], 1]), ([[4, 2, 4], [3, 3, 3], [5, 13, 0]])),
        (([[[1, -1, 1], [0, 0, 0], [2, 10, -3]], 0]), ([[1, -1, 1], [0, 0, 0], [2, 10, -3]])),
        (([[[1, -1, 1], [0, 0, 0], [2, 10, -3]], .5]), ([[2.5, .5, 2.5], [1.5, 1.5, 1.5], [3.5, 11.5, -1.5]])),
-       (([[[1, -1, 1], [0, 0, 0], [2, 10, -3]], -1]), ([[-2, -4, -2], [-3, -3, -3], [-1, 7, -6]])),
+       (([[[1, -1, 1], [0, 0, 0], [2, 10, -3]], -1]), ([[4, 2, 4], [3, 3, 3], [5, 13, 0]])),
        (([[[0, 0, 0], [0, 0, 0], [0, 0, 0]], 100]), ([[0, 0, 0], [0, 0, 0], [0, 0, 0]])),
-       (([[[1.5, 2], [10.5, 1], [0.5, 2]], 1]), ([[1, 1.5], [10, .5], [0, 1.5]])),
+       (([[[1.5, 2], [10.5, 1], [0.5, 2]], 1]), ([[2, 2.5], [11, 1.5], [1, 2.5]])),
        (([[[-10, -10.5], [-12.2, -12.2], [0, 0]], 1]), ([[2.2, 1.7], [0, 0], [12.2, 12.2]])),
        ]
 @pytest.mark.parametrize('tld', tld)