Update forgotten typos.

Author: BastienTr

commpy/examples/plotConsModem.py

@@ -9,8 +9,8 @@
 
 # Constellation corresponding to PSKModem for 4 bits per symbols
 psk = PSKModem(16)
-psk.plotCons()
+psk.plot_constellation()
 
 # Constellation corresponding to QAMModem for 2 bits per symbols
 qam = QAMModem(4)
-qam.plotCons()
+qam.plot_constellation()

commpy/modulation.py

@@ -131,9 +131,9 @@ def plot_constellation(self):
         x = symb.real
         y = symb.imag
 
-        plt.plot(x, y, '+',linewidth=4)
+        plt.plot(x, y, '+', linewidth=4)
         for i in range(len(x)):
-            plt.text(x[i], y[i] , listBin[i])
+            plt.text(x[i], y[i], listBin[i])
 
         plt.title('Constellation')
         plt.grid()
@@ -163,6 +163,7 @@ def __init__(self, m):
         self.constellation = list(map(self._constellation_symbol,
                                       self.symbol_mapping))
 
+
 class QAMModem(Modem):
     """ Creates a Quadrature Amplitude Modulation (QAM) Modem object."""
 
@@ -295,12 +296,12 @@ def kbest(y, h, constellation, K):
     else:
         const_type = float
     X = empty((nb_rx, K * m), dtype=const_type)  # Set of current candidates
-    d = tile(yt[:, None], (1, K * m))        # Corresponding distance vector
-    d_tot = zeros(K * m, dtype=float)        # Corresponding total distance
-    hyp = empty(K * m, dtype=const_type)     # Hypothesis vector
+    d = tile(yt[:, None], (1, K * m))  # Corresponding distance vector
+    d_tot = zeros(K * m, dtype=float)  # Corresponding total distance
+    hyp = empty(K * m, dtype=const_type)  # Hypothesis vector
 
     # Processing
-    for coor in range(nb_rx-1, -1, -1):
+    for coor in range(nb_rx - 1, -1, -1):
         nb_hyp = nb_can * m
 
         # Copy best candidates m times
@@ -312,7 +313,7 @@ def kbest(y, h, constellation, K):
         hyp[:nb_hyp] = repeat(constellation, nb_can)
         X[coor, :nb_hyp] = hyp[:nb_hyp]
         d[coor, :nb_hyp] -= r[coor, coor] * hyp[:nb_hyp]
-        d_tot[:nb_hyp] += abs(d[coor, :nb_hyp])**2
+        d_tot[:nb_hyp] += abs(d[coor, :nb_hyp]) ** 2
 
         # Select best candidates
         argsort = d_tot[:nb_hyp].argsort()
@@ -345,8 +346,8 @@ def bit_lvl_repr(H, w):
     beta = len(w)
     if beta % 2 == 0:
         m, n = H.shape
-        In = eye(n , n)
-        kr = kron(In , w)
-        return dot(H , kr)
+        In = eye(n, n)
+        kr = kron(In, w)
+        return dot(H, kr)
     else:
-       raise ValueError('Beta must be even.')
+        raise ValueError('Beta must be even.')

commpy/tests/test_modulation.py

@@ -21,7 +21,7 @@ def test_bit_lvl_repr():
 
     SNR = arange(10, 16, 5)
 
-    def receiverWithBLR(y, H, cons):
+    def receiver_with_blr(y, H, cons):
         beta = int(log2(len(cons)))
         # creation de w
         reel = [pow(2, i) for i in range(beta // 2 - 1, -1, -1)]
@@ -32,17 +32,17 @@ def receiverWithBLR(y, H, cons):
         mes[mes == -1] = 0
         return mes
 
-    def receiverWithoutBLR(y, H, cons):
+    def receiver_without_blr(y, H, cons):
         return qam.demodulate(mimo_ml(y, H, cons), 'hard')
 
-    MymodelWithoutBLR = \
-        LinkModel(qam.modulate, RayleighChannel, receiverWithoutBLR, qam.num_bits_symbol, qam.constellation, qam.Es)
-    MymodelWithBLR = \
-        LinkModel(qam.modulate, RayleighChannel, receiverWithBLR, qam.num_bits_symbol, qam.constellation, qam.Es)
+    my_model_without_blr = \
+        LinkModel(qam.modulate, RayleighChannel, receiver_without_blr, qam.num_bits_symbol, qam.constellation, qam.Es)
+    my_model_with_blr = \
+        LinkModel(qam.modulate, RayleighChannel, receiver_with_blr, qam.num_bits_symbol, qam.constellation, qam.Es)
 
-    BERWithoutBLR = link_performance(MymodelWithoutBLR, SNR, 300e4, 300)
-    BERWithBLR = link_performance(MymodelWithBLR, SNR, 300e4, 300)
-    assert_allclose(BERWithoutBLR, BERWithBLR, rtol=0.5,
+    ber_without_blr = link_performance(my_model_without_blr, SNR, 300e4, 300)
+    ber_with_blr = link_performance(my_model_with_blr, SNR, 300e4, 300)
+    assert_allclose(ber_without_blr, ber_with_blr, rtol=0.5,
                     err_msg='bit_lvl_repr changes the performance')