set_alpha(gain);
set_beta(0.25*gain*gain);
d_k = d_nfilters / 2;
+ d_filtnum = (int)floor(d_k);
d_rate = 0;
d_start_count = 0;
// produce output as long as we can and there are enough input samples
while((i < noutput_items) && (count < nrequired)) {
- int filtnum = (int)d_k;
// FIXME: prevent this from asserting
assert(filtnum < d_nfilters);
- out[i] = d_filters[filtnum]->filter(&in[count]);
- error = (out[i] * d_diff_filters[filtnum]->filter(&in[count])).real();
+ out[i] = d_filters[d_filtnum]->filter(&in[count]);
+ error = (out[i] * d_diff_filters[d_filtnum]->filter(&in[count])).real();
d_k = d_k + d_alpha*error + d_rate;
d_rate = d_rate + d_beta*error;
- while(d_k >= (float)d_nfilters) {
+ d_filtnum = (int)floor(d_k);
+
+ while(d_filtnum >= d_nfilters) {
d_k -= d_nfilters;
+ d_filtnum -= d_nfilters;
count++;
}
- while(d_k < 0) {
+ while(d_filtnum < 0) {
d_k += d_nfilters;
+ d_filtnum += d_nfilters;
count--;
}
unsigned int d_sps;
float d_alpha;
float d_beta;
- unsigned int d_nfilters;
+ int d_nfilters;
std::vector<gr_fir_ccf*> d_filters;
std::vector<gr_fir_ccf*> d_diff_filters;
std::vector< std::vector<float> > d_taps;
std::vector< std::vector<float> > d_dtaps;
float d_k;
float d_rate;
+ int d_filtnum;
unsigned int d_start_count;
unsigned int d_taps_per_filter;