Merge pull request #78 from eSoares/fix_wrap_as_tupple

Fix issue #76

Author: BastienTr

commpy/channelcoding/convcode.py

@@ -573,7 +573,9 @@ def _where_c(inarray, rows, cols, search_value, index_array):
 
 
 @functools.lru_cache(maxsize=128, typed=False)
-def _compute_branch_metrics(decoding_type, r_codeword, i_codeword_array):
+def _compute_branch_metrics(decoding_type, _r_codeword: tuple, _i_codeword_array: tuple):
+    r_codeword = np.array(_r_codeword)
+    i_codeword_array = np.array(_i_codeword_array)
     if decoding_type == 'hard':
         return hamming_dist(r_codeword.astype(int), i_codeword_array.astype(int))
     elif decoding_type == 'soft':

commpy/channelcoding/tests/test_convcode.py

@@ -131,6 +131,9 @@ def test_viterbi_decode(self):
 
     @dec.slow
     def test_conv_encode_viterbi_decode(self):
+        # Set seed
+        seed(17121996)
+
         niters = 10
         blocklength = 1000
 
@@ -176,6 +179,5 @@ def test_conv_encode_viterbi_decode(self):
 
 
 if __name__ == "__main__":
-    seed(17121996)
     run_module_suite()
 

commpy/tests/test_channels.py

@@ -48,6 +48,9 @@ def check(chan):
                      err_msg='SISO channel as more than 1 Tx')
 
     def test_fading(self):
+        # Set seed
+        seed(17121996)
+
         def check_chan_gain(mod, chan):
             msg = choice(mod, self.msg_length)
             chan.propagate(msg)
@@ -121,6 +124,9 @@ def check_chan_gain(mod, chan):
                             err_msg='Wrong channel variance with real channel')
 
     def test_noise_generation(self):
+        # Set seed
+        seed(17121996)
+
         def check_noise(mod, chan, corrected_SNR_lin):
             msg = choice(mod, self.msg_length)
             chan.propagate(msg)
@@ -267,6 +273,9 @@ def __init__(self):
         super(TestMIMOFading, self).__init__()
 
     def do(self, nb_tx, nb_rx):
+        # Set seed
+        seed(17121996)
+
         def check_chan_gain(mod, chan):
             msg = choice(mod, self.msg_length)
             chan.propagate(msg)
@@ -408,7 +417,7 @@ def __init__(self):
     def do(self, nb_tx, nb_rx):
         chan = MIMOFlatChannel(nb_tx, nb_rx, 0)
 
-        # Text raising of ValueError
+        # Test raising of ValueError
         with assert_raises(ValueError):
             chan.specular_compo(0, -1, 0, 1)
         with assert_raises(ValueError):
@@ -429,6 +438,9 @@ def __init__(self):
         super(TestMIMONoiseGeneration, self).__init__()
 
     def do(self, nb_tx, nb_rx):
+        # Set seed
+        seed(17121996)
+
         def check_noise(mod, chan, corrected_SNR_lin):
             msg = choice(mod, self.msg_length)
             chan.propagate(msg)
@@ -505,6 +517,9 @@ def __init__(self):
         super(TestMIMOkFactor, self).__init__()
 
     def do(self, nb_tx, nb_rx):
+        # Set seed
+        seed(17121996)
+
         prod_nb = nb_tx * nb_rx
 
         # Real channel
@@ -533,5 +548,4 @@ def do(self, nb_tx, nb_rx):
 
 
 if __name__ == "__main__":
-    seed(17121996)
     run_module_suite()

commpy/tests/test_links.py

@@ -15,6 +15,9 @@
 
 @dec.slow
 def test_link_performance():
+    # Set seed
+    seed(17121996)
+
     # Apply link_performance to SISO QPSK and AWGN channel
     QPSK = QAMModem(4)
 
@@ -46,5 +49,4 @@ def receiver(y, h, constellation, noise_var):
 
 
 if __name__ == "__main__":
-    seed(17121996)
     run_module_suite()

commpy/tests/test_modulation.py

@@ -15,8 +15,10 @@
 
 @dec.slow
 def test_bit_lvl_repr():
-    # Test the BLR by comparing the performance of a receiver with and without it.
+    # Set seed
+    seed(17121996)
 
+    # Test the BLR by comparing the performance of a receiver with and without it.
     qam = QAMModem(4)
 
     nb_rx = 2
@@ -143,5 +145,4 @@ def do_custom(self, modem):
 
 
 if __name__ == "__main__":
-    seed(17121996)
     run_module_suite()

commpy/tests/test_sequences.py

@@ -2,7 +2,6 @@
 # License: BSD 3-Clause
 
 from numpy import array
-from numpy.random import seed
 from numpy.testing import run_module_suite, assert_raises, assert_equal
 
 from commpy.sequences import pnsequence
@@ -20,6 +19,6 @@ def test_pnsequence():
     assert_equal(pnsequence(4, (0, 0, 1, 1), array((1, 1, 0, 1)), 7), array((1, 1, 0, 0, 1, 0, 1), int),
                  err_msg='Pseudo-noise sequence is not the one expected.')
 
+
 if __name__ == "__main__":
-    seed(17121996)
     run_module_suite()

commpy/tests/test_utilities.py

@@ -2,7 +2,6 @@
 # License: BSD 3-Clause
 
 from numpy import array
-from numpy.random import seed
 from numpy.testing import run_module_suite, assert_array_equal
 
 from commpy.utilities import dec2bitarray
@@ -15,5 +14,4 @@ def test_dec2bitarray():
 
 
 if __name__ == "__main__":
-    seed(17121996)
     run_module_suite()