removed transpose. removed/correct tests

Author: aajayi-21

diffpy/snmf/subroutines.py

@@ -108,7 +108,7 @@ def construct_component_matrix(components):
     component_matrix = np.zeros((number_of_components, signal_length))
     for i, component in enumerate(components):
         component_matrix[i] = component.iq
-    return component_matrix.T
+    return component_matrix
 
 
 def initialize_arrays(number_of_components, number_of_moments, signal_length):

diffpy/snmf/tests/test_subroutines.py

@@ -187,40 +187,22 @@ def test_construct_stretching_matrix(tcso):
         np.testing.assert_allclose(actual[component.id,:], component.stretching_factors)
         #assert actual[component.id, :] == component.stretching_factors
 
-tccm = [ # (ComponentSignal([0,.25,.5,.75,1],20,0),1,5), # Expected to fail
+tccm = [
         ([ComponentSignal([0,.25,.5,.75,1],20,0)]),
-        # ([ComponentSignal([0,.25,.5,.75,1],20,2)],1,5), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],1,2), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],1,5.5), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],1,-5), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],1,0), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],1,'bad'), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],1,[]), Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],1.2,5), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],0,5), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],-1,5), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],'bad',5), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20,0)],[],5), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],-20,0)],1,5), # Expected to fail
-        # ([ComponentSignal([0,.25,.5,.75,1],20.2,0)],1,5), # Expected to fail
         ([ComponentSignal([0,.25,.5,.75,1],0,0)]),
         ([ComponentSignal([0,.25,.5,.75,1],20,0),ComponentSignal([0,.25,.5,.75,1],20,1),ComponentSignal([0,.25,.5,.75,1],20,2)]),
         ([ComponentSignal([0, .25, .5, .75, 1], 20, 0), ComponentSignal([0, .25, .5, .75, 1], 20, 1),
           ComponentSignal([0, .25, .5, .75, 1], 20, 2)]),
         ([ComponentSignal([0, .25, .5, .75, 1], 20, 0), ComponentSignal([0, .25, .5, 2.75, 1], 20, 1),
           ComponentSignal([0, .25, .5, .75, 1], 20, 2)]),
         ([ComponentSignal([.25], 20, 0), ComponentSignal([.25], 20, 1), ComponentSignal([.25], 20, 2)]),
-        # ([ComponentSignal([0, .25, .5, .75, 1], 20, 0), ComponentSignal([0, .25, .5, .75, 1], 20, 1),
-        # ComponentSignal([], 20, 2)], 1, 5), # Expected to fail
-        # ([ComponentSignal([0, .25, .5, .75, 1], 2, 0), ComponentSignal([0, .25, .5, .75, 1], 4, 1),
-        # ComponentSignal([0, .25, .5, .75, 1], 20, 2)], 1, 5), # Expected to fail
-        # ([], 0, 5), Expected to fail
-        # ([], 1, 5), Expected to fail
-        # ([], -1, 5), # Expected to fail
-        # ([], 0, 0), # Expected to fail
+        ([ComponentSignal([0, .25, .5, .75, 1], 20, 0), ComponentSignal([0, .25, .5, .75, 1], 20, 1)]),
+        # ([ComponentSignal([[0, .25, .5, .75, 1],[0, .25, .5, .75, 1]], 20, 0), ComponentSignal([[0, .25, .5, .75, 1],[0, .25, .5, .75, 1]], 20, 1)]), # iq is multidimensional. Expected to fail
+        # (ComponentSignal([], 20, 0)), # Expected to fail
+        # ([]), #Expected to fail
         ]
 @pytest.mark.parametrize('tccm',tccm)
 def test_construct_component_matrix(tccm):
     actual = construct_component_matrix(tccm)
     for component in tccm:
-        np.testing.assert_allclose(actual[:,component.id], component.iq)
+        np.testing.assert_allclose(actual[component.id], component.iq)