diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-06 14:28:22 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-06 14:40:43 -0500 |
| commit | fd110bdbbe8bc40781c34f33c70deec5b7931109 (patch) | |
| tree | ef18e813add19b09c57cc21cb672ea602701405b /gr-trellis/doc | |
| parent | 0c9c16fb008b02a5af39fb22e18acfff2dbd933a (diff) | |
analog: Removing reference to gr.sig_source_X and gr.noise_source_X where possible.
Passing make and make test. Examples and apps need testing.
gr-filter relies on sig_source and noise_source, so can't remove them from core.
Diffstat (limited to 'gr-trellis/doc')
| -rw-r--r-- | gr-trellis/doc/test_tcm.py | 4 | ||||
| -rw-r--r-- | gr-trellis/doc/test_tcm.py.xml | 4 | ||||
| -rwxr-xr-x | gr-trellis/doc/test_viterbi_equalization1.py | 4 | ||||
| -rw-r--r-- | gr-trellis/doc/test_viterbi_equalization1.py.xml | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/gr-trellis/doc/test_tcm.py b/gr-trellis/doc/test_tcm.py index 3a285e27a2..ac8641d7a7 100644 --- a/gr-trellis/doc/test_tcm.py +++ b/gr-trellis/doc/test_tcm.py @@ -2,7 +2,7 @@ from gnuradio import gr from gnuradio import audio -from gnuradio import trellis, digital +from gnuradio import trellis, digital, analog from gnuradio import eng_notation import math import sys @@ -21,7 +21,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed): # CHANNEL add = gr.add_ff() - noise = gr.noise_source_f(gr.GR_GAUSSIAN,math.sqrt(N0/2),seed) + noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed) # RX metrics = trellis.metrics_f(f.O(),dimensionality,constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for Viterbi diff --git a/gr-trellis/doc/test_tcm.py.xml b/gr-trellis/doc/test_tcm.py.xml index a4c541e38a..4122fafff8 100644 --- a/gr-trellis/doc/test_tcm.py.xml +++ b/gr-trellis/doc/test_tcm.py.xml @@ -4,7 +4,7 @@ 2 3 from gnuradio import gr 4 from gnuradio import audio - 5 from gnuradio import trellis + 5 from gnuradio import trellis, digital, analog 6 from gnuradio import eng_notation 7 import math 8 import sys @@ -23,7 +23,7 @@ 21 22 # CHANNEL 23 add = gr.add_ff() - 24 noise = gr.noise_source_f(gr.GR_GAUSSIAN,math.sqrt(N0/2),seed) + 24 noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed) 25 26 # RX 27 metrics = trellis.metrics_f(f.O(),dimensionality,constellation,trellis.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for Viterbi diff --git a/gr-trellis/doc/test_viterbi_equalization1.py b/gr-trellis/doc/test_viterbi_equalization1.py index c9c897fe2e..2dd3f2bcbe 100755 --- a/gr-trellis/doc/test_viterbi_equalization1.py +++ b/gr-trellis/doc/test_viterbi_equalization1.py @@ -2,7 +2,7 @@ from gnuradio import gr from gnuradio import audio -from gnuradio import trellis, digital +from gnuradio import trellis, digital, analog from gnuradio import eng_notation import math import sys @@ -28,7 +28,7 @@ def run_test (f,Kb,bitspersymbol,K,channel,modulation,dimensionality,tot_constel # CHANNEL isi = gr.fir_filter_fff(1,channel) add = gr.add_ff() - noise = gr.noise_source_f(gr.GR_GAUSSIAN,math.sqrt(N0/2),seed) + noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed) # RX skip = gr.skiphead(gr.sizeof_float, L) # skip the first L samples since you know they are coming from the L zero symbols diff --git a/gr-trellis/doc/test_viterbi_equalization1.py.xml b/gr-trellis/doc/test_viterbi_equalization1.py.xml index 751633a618..e1f2aeefcb 100644 --- a/gr-trellis/doc/test_viterbi_equalization1.py.xml +++ b/gr-trellis/doc/test_viterbi_equalization1.py.xml @@ -4,7 +4,7 @@ 2 3 from gnuradio import gr 4 from gnuradio import audio - 5 from gnuradio import trellis + 5 from gnuradio import trellis, digital, analog 6 from gnuradio import eng_notation 7 import math 8 import sys @@ -30,7 +30,7 @@ 28 # CHANNEL 29 isi = gr.fir_filter_fff(1,channel) 30 add = gr.add_ff() - 31 noise = gr.noise_source_f(gr.GR_GAUSSIAN,math.sqrt(N0/2),seed) + 31 noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed) 32 33 # RX 34 skip = gr.skiphead(gr.sizeof_float, L) # skip the first L samples since you know they are coming from the L zero symbols |