filled function contents and tests

Author: aajayi-21

diffpy/snmf/subroutines.py

@@ -449,7 +449,7 @@ def get_residual_matrix(component_matrix, weights_matrix, stretching_matrix, dat
     return residual_matrx
 
 
-def reconstruct_data(components, input_data):
+def reconstruct_data(components):
     """Reconstructs the `input_data` matrix
 
     Reconstructs the `input_data` matrix from calculated component signals, weights, and stretching factors.
@@ -458,13 +458,16 @@ def reconstruct_data(components, input_data):
     ----------
     components: tuple of ComponentSignal objects
       The tuple containing the component signals.
-    input_data: 2d array
-      The 2d array containing the user provided signals.
 
     Returns
     -------
     2d array
       The 2d array containing the reconstruction of input_data.
 
     """
-    pass
+    signal_length = len(components[0].iq)
+    number_of_signal = len(components[0].weights)
+    data_reconstruction = np.zeros((signal_length, number_of_signal))
+    for signal in range(number_of_signal):
+        data_reconstruction[:, signal] = reconstruct_signal(components, signal)
+    return data_reconstruction

diffpy/snmf/tests/test_subroutines.py

@@ -108,13 +108,22 @@ def test_get_residual_matrix(tgrm):
 
 
 trd = [
+    ([ComponentSignal([0, .25, .5, .75, 1], 2, 0), ComponentSignal([0, .25, .5, .75, 1], 2, 1),
+     ComponentSignal([0, .25, .5, .75, 1], 2, 2)]),
+    ([ComponentSignal([0, .25, .5, .75, 1], 2, 0)]),
+    ([ComponentSignal([0, .25, .5, .75, 1], 2, 0), ComponentSignal([0, .25, .5, .75, 1], 2, 1),
+     ComponentSignal([0, .25, .5, .75, 1], 2, 2), ComponentSignal([0, .25, .5, .75, 1], 2, 3),
+      ComponentSignal([0, .25, .5, .75, 1], 2, 4)]),
+    #([]) # Exception expected
 
 ]
 
 
 @pytest.mark.parametrize('trd', trd)
 def test_reconstruct_data(trd):
-    assert False
+    actual = reconstruct_data(trd)
+    assert actual.shape == (len(trd[0].iq),len(trd[0].weights))
+    print(actual)
 
 
 tld = [(([[[1, -1, 1], [0, 0, 0], [2, 10, -3]], 1]), ([[4, 2, 4], [3, 3, 3], [5, 13, 0]])),