diff options
Diffstat (limited to 'lib/ravi.c')
| -rw-r--r-- | lib/ravi.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -25,7 +25,7 @@ ts_parameter_t const ts_ravi_p = { .n_inputs = 4, .n_outputs = 2, .n_constants = uint_t ts_ravi_offset( ts_constant_t const *c ) { ( void )c; - return ( c ? ((ts_ravi_params_t *)c)->k + (uint_t)((ts_ravi_params_t *)c)->k2 - 2 : 0 ); + return ( c ? ((ts_ravi_params_t const *)c)->k + (uint_t)((ts_ravi_params_t const *)c)->k2 - 2 : 0 ); } int ts_ravi( @@ -36,19 +36,19 @@ int ts_ravi( { TS_PROLOGUE( ts_ravi_p ); if ( !c ) return -1; - uint_t k = ((ts_ravi_params_t *)c)->k; - fp_t k2 = ((ts_ravi_params_t *)c)->k2; + uint_t k = ((ts_ravi_params_t const *)c)->k; + fp_t k2 = ((ts_ravi_params_t const *)c)->k2; - if( k == 0 || k2 == 0 ) return -1; + if( k == 0 || k2 <= 0 || isnan(k2) || isinf(k2) ) return -1; - fp_t *num_buf = calloc( n, sizeof( fp_t ) ); + fp_t *num_buf = calloc( n, sizeof( fp_t ) ); fp_t *den_buf = calloc( n, sizeof( fp_t ) ); if( !num_buf || !den_buf ) { free( num_buf ); free( den_buf ); return -1; } for( uint_t i = 0; i < n; ++i ) { - num_buf[i] = (x[3][i] - x[0][i]) + (x[3][i] - (i > 0 ? x[3][i - 1] : x[3][i])); - den_buf[i] = fabs(x[1][i] - x[2][i]) + fabs(x[3][i] - x[0][i]); + num_buf[i] = ( x[3][i] - x[0][i] ) + ( x[3][i] - ( i > 0 ? x[3][i - 1] : x[3][i] ) ); + den_buf[i] = fabs( x[1][i] - x[2][i] ) + fabs( x[3][i] - x[0][i] ); } fp_t num_sum = 0; @@ -65,14 +65,14 @@ int ts_ravi( fp_t sig_a = 1.0 / k2; uint_t offset = k + (uint_t)k2 - 2; - for (uint_t i = 0; i < offset; ++i) { y[0][i] = 0; y[1][i] = 0; } + for ( uint_t i = 0; i < offset; ++i ) { y[0][i] = 0; y[1][i] = 0; } for( uint_t i = k; i < n; ++i ) { num_sum = num_sum - num_buf[i - k] + num_buf[i]; den_sum = den_sum - den_buf[i - k] + den_buf[i]; rvi = ( den_sum != 0 ) ? num_sum / den_sum : 0; - sig = sig + sig_a * (rvi - sig); + sig = sig + sig_a * ( rvi - sig ); if( i >= offset ) { |