|
22 | 22 | from itertools import product |
23 | 23 |
|
24 | 24 | import matplotlib.pyplot as plt |
25 | | -from commpy.utilities import bitarray2dec, dec2bitarray |
26 | 25 | from numpy import arange, array, zeros, pi, cos, sin, sqrt, log2, argmin, \ |
27 | 26 | hstack, repeat, tile, dot, shape, concatenate, exp, \ |
28 | 27 | log, vectorize, empty, eye, kron, inf |
29 | 28 | from numpy.fft import fft, ifft |
30 | 29 | from numpy.linalg import qr, norm |
31 | 30 |
|
| 31 | +from commpy.utilities import bitarray2dec, dec2bitarray |
| 32 | + |
32 | 33 | __all__ = ['PSKModem', 'QAMModem', 'ofdm_tx', 'ofdm_rx', 'mimo_ml', 'kbest', 'bit_lvl_repr', 'max_log_approx'] |
33 | 34 |
|
34 | 35 |
|
@@ -340,7 +341,7 @@ def kbest(y, h, constellation, K, noise_var=0, output_type='hard', demode=None): |
340 | 341 | if output_type == 'hard': |
341 | 342 | return X[:, 0] |
342 | 343 | elif output_type == 'soft': |
343 | | - return max_log_approx(y, h, noise_var, X, demode) |
| 344 | + return max_log_approx(y, h, noise_var, X[:, :nb_can], demode) |
344 | 345 | else: |
345 | 346 | raise ValueError('output_type must be "hard" or "soft"') |
346 | 347 |
|
|
0 commit comments