construct_stretching_matrix

Made exception condition more robust, changed for loop iterable, specified tests raising expected exception

Author: aajayi-21

diffpy/snmf/subroutines.py

@@ -73,13 +73,13 @@ def construct_stretching_matrix(components, number_of_components, number_of_sign
       Has dimensions `component_signal` x `number_of_signals`
 
     """
-    if number_of_components == 0:
+    if (number_of_components <= 0) or (len(components)) == 0:
         raise ValueError(f"Number of components = {number_of_components}. Number_of_components must be >= 1.")
-    if number_of_signals == 0:
+    if number_of_signals <= 0:
         raise ValueError(f"Number of signals = {number_of_signals}. Number_of_signals must be >= 1.")
     stretching_factor_matrix = np.zeros((number_of_components, number_of_signals))
-    for c in components:
-        stretching_factor_matrix[c.id, :] = c.stretching_factors
+    for i, component in enumerate(components):
+        stretching_factor_matrix[i, :] = component.stretching_factors
     return stretching_factor_matrix
 
 

diffpy/snmf/tests/test_subroutines.py

@@ -165,19 +165,19 @@ def test_initialize_components(tcc):
 
 tcso =[([ComponentSignal([0,.5,1,1.5],20,0)],1,20),
        ([ComponentSignal([0,.5,1,1.5],20,0)],4,20),
-       #([ComponentSignal([0,.5,1,1.5],20,0)],0,20), # Raises an exception
-       #([ComponentSignal([0,.5,1,1.5],20,0)],-2,20), # Raises an exception
-       #([ComponentSignal([0,.5,1,1.5],20,0)],1,0), # Raises an Exception
-       #([ComponentSignal([0,.5,1,1.5],20,0)],1,-3), # Raises an exception
+       # ([ComponentSignal([0,.5,1,1.5],20,0)],0,20), # Raises an exception
+       # ([ComponentSignal([0,.5,1,1.5],20,0)],-2,20), # Raises an exception
+       # ([ComponentSignal([0,.5,1,1.5],20,0)],1,0), # Raises an Exception
+       # ([ComponentSignal([0,.5,1,1.5],20,0)],1,-3), # Raises an exception
        ([ComponentSignal([0,.5,1,1.5],20,0),ComponentSignal([0,.5,1,1.5],20,1)],2,20),
        ([ComponentSignal([0,.5,1,1.5],20,0),ComponentSignal([0,.5,1,21.5],20,1)],2,20),
        ([ComponentSignal([0,1,1.5],20,0),ComponentSignal([0,.5,1,21.5],20,1)],2,20),
-       ([ComponentSignal([0,.5,1,1.5],20,0),ComponentSignal([0,.5,1,1.5],20,1)],1,-3),
-       ([],1,20),
-       ([],-1,20),
-       ([],0,20), # Raises an exception
-       ([],1,0), #Raises an exception
-       ([],-1,-2),
+       # ([ComponentSignal([0,.5,1,1.5],20,0),ComponentSignal([0,.5,1,1.5],20,1)],1,-3), # Negative signal length. Raises an exception
+       #([],1,20), # Empty components. Raises an Exception
+       #([],-1,20), # Empty components with negative number of components. Raises an exception
+       #([],0,20), # Empty components with zero number of components. Raises an exception
+       #([],1,0), # Empty components with zero signal length. Raises an exception.
+       #([],-1,-2), # Empty components with negative number of components and signal length Raises an exception.
 
 ]
 @pytest.mark.parametrize('tcso',tcso)