Typo & Test for conv_encode

Author: akou97

commpy/channelcoding/tests/test_convcode.py

@@ -1,12 +1,11 @@
 # Authors: CommPy contributors
 # License: BSD 3-Clause
 
+from commpy.channelcoding.convcode import Trellis, conv_encode, viterbi_decode
 from numpy import array, inf
 from numpy.random import randint, randn
 from numpy.testing import assert_array_equal, dec, assert_array_less
 
-from commpy.channelcoding.convcode import Trellis, conv_encode, viterbi_decode
-
 
 class TestConvCode(object):
 
@@ -15,6 +14,8 @@ def setup_class(cls):
         cls.trellis = []
         cls.desired_next_state_table = []
         cls.desired_output_table = []
+        cls.desired_encode_msg = []
+        cls.mes = array((0, 0, 1, 0))
 
         ### 1/2 - rate codes  ###
 
@@ -30,6 +31,7 @@ def setup_class(cls):
                                                [3, 0],
                                                [1, 2],
                                                [2, 1]]))
+        cls.desired_encode_msg.append(array([0., 0., 0., 0., 1., 1., 0., 1.]))
 
         # Convolutional Code 2: G(D) = [1 1+D+D^2/1+D]
         memory = array([2])
@@ -44,6 +46,7 @@ def setup_class(cls):
                                                [0, 3],
                                                [1, 2],
                                                [1, 2]]))
+        cls.desired_encode_msg.append(array([0., 0., 0., 0., 1., 1., 0., 1.]))
 
         ### 2/3 - rate codes  ###
 
@@ -67,6 +70,7 @@ def setup_class(cls):
                                                [1, 0, 7, 6],
                                                [4, 5, 2, 3],
                                                [7, 6, 1, 0]]))
+        cls.desired_encode_msg.append(array([0., 0., 0., 1., 1., 0.]))
 
         # Convolutional Code 2: G(D) = [[1, 0, 0], [0, 1, 1+D]]; F(D) = [[D, D], [1+D, 1]]
         memory = array([1, 1])
@@ -81,6 +85,7 @@ def setup_class(cls):
                                                [1, 2, 5, 6],
                                                [0, 3, 4, 7],
                                                [1, 2, 5, 6]]))
+        cls.desired_encode_msg.append(array([0., 0., 0., 1., 0., 0.]))
 
     @classmethod
     def teardown_class(cls):
@@ -95,7 +100,8 @@ def test_output_table(self):
             assert_array_equal(self.trellis[i].output_table, self.desired_output_table[i])
 
     def test_conv_encode(self):
-        pass
+        for i in range(len(self.trellis)):
+            assert_array_equal(conv_encode(self.mes, self.trellis[i],'cont'), self.desired_encode_msg[i])
 
     def test_viterbi_decode(self):
         pass
@@ -132,3 +138,10 @@ def test_conv_encode_viterbi_decode(self):
                 coded_syms = (2.0 * coded_bits - 1) * inf
                 decoded_bits = viterbi_decode(coded_syms, self.trellis[i], 15, 'soft')
                 assert_array_less((decoded_bits[:len(msg)] - msg).sum(), 0.03 * blocklength)
+
+                coded = conv_encode(msg, self.trellis[i], termination='cont')
+                coded_bits = coded.astype(float)
+                coded_bits[coded_bits == 1.0] = inf
+                coded_bits[coded_bits == 0.0] = -inf
+                decoded_bits = viterbi_decode(coded_bits, self.trellis[i], 15,'soft')
+                assert_array_equal(decoded_bits, msg)

commpy/modulation.py

@@ -22,14 +22,13 @@
 from itertools import product
 
 import matplotlib.pyplot as plt
+from commpy.utilities import bitarray2dec, dec2bitarray
 from numpy import arange, array, zeros, pi, cos, sin, sqrt, log2, argmin, \
     hstack, repeat, tile, dot, shape, concatenate, exp, \
     log, vectorize, empty, eye, kron, inf
 from numpy.fft import fft, ifft
 from numpy.linalg import qr, norm
 
-from commpy.utilities import bitarray2dec, dec2bitarray
-
 __all__ = ['PSKModem', 'QAMModem', 'ofdm_tx', 'ofdm_rx', 'mimo_ml', 'kbest', 'bit_lvl_repr', 'max_log_approx']
 
 
@@ -395,7 +394,7 @@ def max_log_approx(y, h, noise_var, pts_list, demode):
 
     return
     ------
-    LLR : 1D nbarray of floats
+    LLR : 1D ndarray of floats
         Log-Likelihood Ratio for each bit (same length as the return of decode)
     """
     # Decode all pts