diff --git a/applyMovingAverage.m b/applyMovingAverage.m index 7232ea3..584ac13 100644 --- a/applyMovingAverage.m +++ b/applyMovingAverage.m @@ -1,6 +1,6 @@ -function applyMovingAverage(freq_sampling, duration_signal, signal_constant, nbSamples, plt) +function applyMovingAverage(freq_sampling, duration_signal, signal_constant, nbSamples, randomRange, plt) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% function applyMovingAverage(freq_sampling, duration_signal, signal_constant, nbSamples, plt) +% function applyMovingAverage(freq_sampling, duration_signal, signal_constant, nbSamples, randomRange, plt) % ex.:applyMovingAverage(500, 10, 100, 10, 1); % % Task: To generate a digital constant signal with noise and apply moving @@ -25,9 +25,9 @@ t=0:1/freq_sampling:duration_signal; %generate the signal samples for l_sample=1:length(t) - signal(l_sample)=signal_constant+(rand()-0.5); + signal(l_sample) = signal_constant + (rand()*(randomRange(2)-randomRange(1))+randomRange(1)); end %apply the moving average filter -signal_filtered=movingAverage(t, signal,nbSamples, plt); +signal_filtered = movingAverage(t, signal,nbSamples, plt); diff --git a/movingAverage.m b/movingAverage.m index 983b3d7..c22b480 100644 --- a/movingAverage.m +++ b/movingAverage.m @@ -1,6 +1,6 @@ function signal_filtered = movingAverage(t, signal, nbSamples, plt) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% function signal_filtered = movingAverage(t, signal, 10, plt) +% function signal_filtered = movingAverage(t, signal, nbSamples, plt) % ex.: signal_filtered = movingAverage(t, signal, 10, 1); % % Task: To apply a moving average filter @@ -10,7 +10,7 @@ function signal_filtered = movingAverage(t, signal, nbSamples, plt) % -signal: signal amplitude (length is the same as t), in a.u % -nbSamples=nb of samples taken into account to complete the moving % amplitude -% -plot +% -plot: flag if equal to 1, figures are displayed % % Outputs: -signal_filtered:filtered signal amplitude is a.u. after % windowing @@ -26,7 +26,7 @@ for l_samples = nbSamples:length(signal) for l_avg=0:nbSamples-1 sum = sum+signal(l_sample-l_avg); end - signal_filtered(l_samples)= sum/nbSamples; + signal_filtered(l_samples)= sum / nbSamples; end if(plt)