Skip to content

Commit 8a7214c

Browse files
mormjmbr0wn
authored andcommittedMay 23, 2019
Issue gnuradio#1974 Reduce the history from ntaps+1 to ntaps
Also, add () around the default list parameters in the yml files
1 parent 8aea46e commit 8a7214c

4 files changed

+8
-8
lines changed
 

‎gr-channels/grc/channels_selective_fading_model.block.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ parameters:
2929
- id: delays
3030
label: PDP Delays (samp)
3131
dtype: real_vector
32-
default: 0.0,0.1,1.3
32+
default: (0.0,0.1,1.3)
3333
- id: mags
3434
label: PDP Magnitudes
3535
dtype: real_vector
36-
default: 1,0.99,0.97
36+
default: (1,0.99,0.97)
3737
- id: ntaps
3838
label: Num Taps
3939
dtype: int

‎gr-channels/grc/channels_selective_fading_model2.block.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ parameters:
2929
- id: delays
3030
label: PDP Delays (in samps)
3131
dtype: real_vector
32-
default: 1.0,1.9,2.7
32+
default: (1.0,1.9,2.7)
3333
- id: delay_std
3434
label: PDP Delay StdDev (per samp)
3535
dtype: real_vector
36-
default: 1e-4,1e-4,1e-4
36+
default: (1e-4,1e-4,1e-4)
3737
- id: delay_maxdev
3838
label: PDP Delay Max-Dev (per samp)
3939
dtype: real_vector
40-
default: 0.5,0.7,0.9
40+
default: (0.5,0.7,0.9)
4141
- id: mags
4242
label: PDP Magnitudes
4343
dtype: real_vector
44-
default: 1,0.95,0.8
44+
default: (1,0.95,0.8)
4545
- id: ntaps
4646
label: Num Taps
4747
dtype: int

‎gr-channels/lib/selective_fading_model2_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace gr {
7777

7878
// set up tap history
7979
if(ntaps < 1){ throw std::runtime_error("ntaps must be >= 1"); }
80-
set_history(1+ntaps);
80+
set_history(ntaps);
8181
d_taps.resize(ntaps, gr_complex(0,0));
8282

8383
// set up message port

‎gr-channels/lib/selective_fading_model_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace gr {
6565

6666
// set up tap history
6767
if(ntaps < 1){ throw std::runtime_error("ntaps must be >= 1"); }
68-
set_history(1+ntaps);
68+
set_history(ntaps);
6969
d_taps.resize(ntaps, gr_complex(0,0));
7070
}
7171

0 commit comments

Comments
 (0)
Please sign in to comment.