lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-03-17 07:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

dsp: fix Demux sampling handling

Browse Source
This commit is contained in:
Roman Zeyde
2014-08-26 17:27:20 +03:00
parent 771692126c
commit 9579b3d825
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
amodem/dsp.py
View File

@@ -107,8 +107,8 @@ class QAM(object):
class Demux(object):
def __init__(self, src, freqs, sampler=None):
self.sampler = sampling.Sampler(src) if sampler is None else sampler
def __init__(self, sampler, freqs):
self.sampler = sampler
self.filters = [exp_iwt(-f, Nsym) / (0.5*Nsym) for f in freqs]
self.filters = np.array(self.filters)

2
amodem/equalizer.py
View File

@@ -28,7 +28,7 @@ def modulator(symbols, carriers=modem.carriers):
def demodulator(signal, size):
signal = itertools.chain(signal, itertools.repeat(0))
symbols = dsp.Demux(signal, config.frequencies)
symbols = dsp.Demux(sampling.Sampler(signal), config.frequencies)
return np.array(list(itertools.islice(symbols, size)))

3
tests/test_dsp.py
View File

@@ -5,6 +5,7 @@ from numpy.linalg import norm
from amodem import dsp
from amodem import config
from amodem import sampling
def test_qam():
@@ -93,6 +94,6 @@ def test_demux():
carriers = [dsp.exp_iwt(f, config.Nsym) for f in freqs]
syms = [3, 2j]
sig = np.dot(syms, carriers)
res = dsp.Demux(sig.real, freqs)
res = dsp.Demux(sampling.Sampler(sig.real), freqs)
res = np.array(list(res))
assert np.max(np.abs(res - syms)) < 1e-12