From: <car...@us...> - 2012-08-17 19:29:34
|
Revision: 10884 http://octave.svn.sourceforge.net/octave/?rev=10884&view=rev Author: carandraug Date: 2012-08-17 19:29:27 +0000 (Fri, 17 Aug 2012) Log Message: ----------- lssa: coding guidelines * replacing tabs per spaces * do not use newline for erros to show traceback * use elseif to reduce code Modified Paths: -------------- trunk/octave-forge/extra/lssa/inst/cubicwgt.m trunk/octave-forge/extra/lssa/inst/lombcoeff.m trunk/octave-forge/extra/lssa/inst/lombnormcoeff.m trunk/octave-forge/extra/lssa/inst/lscomplex.m trunk/octave-forge/extra/lssa/inst/lscomplexwavelet.m trunk/octave-forge/extra/lssa/inst/lscorrcoeff.m trunk/octave-forge/extra/lssa/inst/lsreal.m trunk/octave-forge/extra/lssa/inst/lswaveletcoeff.m trunk/octave-forge/extra/lssa/src/fastlscomplex.cc Modified: trunk/octave-forge/extra/lssa/inst/cubicwgt.m =================================================================== --- trunk/octave-forge/extra/lssa/inst/cubicwgt.m 2012-08-17 15:49:41 UTC (rev 10883) +++ trunk/octave-forge/extra/lssa/inst/cubicwgt.m 2012-08-17 19:29:27 UTC (rev 10884) @@ -32,7 +32,7 @@ function a = cubicwgt (s) if (nargin != 1) - print_usage (); + print_usage (); endif ## s is the value/vector/matrix to be windowed Modified: trunk/octave-forge/extra/lssa/inst/lombcoeff.m =================================================================== --- trunk/octave-forge/extra/lssa/inst/lombcoeff.m 2012-08-17 15:49:41 UTC (rev 10883) +++ trunk/octave-forge/extra/lssa/inst/lombcoeff.m 2012-08-17 19:29:27 UTC (rev 10884) @@ -25,17 +25,14 @@ function coeff = lombcoeff (T, X, o) if (nargin != 3) - print_usage (); + print_usage (); + elseif (! all (size (T) == size (X))) + error ("lombcoeff: Time series vectors of uneven size"); + elseif (! isscalar (o)) + error ("lombcoeff: Supplied frequency is not a scalar"); + elseif (o == 0) + error ("lombcoeff: Supplied frequency is not a frequency"); endif - if (! all (size (T) == size (X))) - error ("lombcoeff: Time series vectors of uneven size.\n"); - endif - if (! isscalar (o)) - error ("lombcoeff: Supplied frequency is not a scalar.\n"); - endif - if (o == 0) - error ("lombcoeff: Supplied frequency is not a frequency.\n"); - endif oT = o .* T; Modified: trunk/octave-forge/extra/lssa/inst/lombnormcoeff.m =================================================================== --- trunk/octave-forge/extra/lssa/inst/lombnormcoeff.m 2012-08-17 15:49:41 UTC (rev 10883) +++ trunk/octave-forge/extra/lssa/inst/lombnormcoeff.m 2012-08-17 19:29:27 UTC (rev 10884) @@ -27,28 +27,25 @@ function coeff = lombnormcoeff (T, X, omega) if (nargin != 3) - print_usage (); + print_usage (); + elseif (! all (size (T) == size (X))) + error ("lombnormcoeff: Time series vectors of uneven size"); + elseif (! isscalar (omega)) + error ("lombnormcoeff: Supplied frequency is not a scalar"); + elseif (omega == 0) + error ("lombnormcoeff: Supplied frequency is not a frequency"); endif - if (! all (size (T) == size (X))) - error ("lombnormcoeff: Time series vectors of uneven size.\n"); - endif - if (! isscalar (omega)) - error ("lombnormcoeff: Supplied frequency is not a scalar.\n"); - endif - if (omega == 0) - error ("lombnormcoeff: Supplied frequency is not a frequency.\n"); - endif xmean = mean (X); theta = atan2 (sum (sin (2 .* omega .*T)), - sum (cos (2 .* omega .* T))) / (2*omega); + sum (cos (2 .* omega .* T))) / (2*omega); coeff = ((sum ((X-xmean) .* cos (omega .* T - theta)) .^ 2 / - sum (cos (omega .* T - theta) .^ 2) + + sum (cos (omega .* T - theta) .^ 2) + sum ((X-xmean) .* sin (omega .* T - theta)) .^ 2 / - sum (sin (omega .* T - theta) .^ 2 )) / + sum (sin (omega .* T - theta) .^ 2 )) / (2 * var(X))); endfunction Modified: trunk/octave-forge/extra/lssa/inst/lscomplex.m =================================================================== --- trunk/octave-forge/extra/lssa/inst/lscomplex.m 2012-08-17 15:49:41 UTC (rev 10883) +++ trunk/octave-forge/extra/lssa/inst/lscomplex.m 2012-08-17 19:29:27 UTC (rev 10884) @@ -33,43 +33,32 @@ function transform = lscomplex (t, x, omegamax, ncoeff, noctave) if (nargin != 5) - print_usage (); + print_usage (); + elseif (! isvector (t)) + error ("lscomplex: Time values are not a vector"); + elseif (! isvector (x)) + error ("lscomplex: Magnitude values are not a vector"); + elseif (! all (size (t) == size (x))) + error ("lscomplex: Size of time vector, magnitude vector unequal"); + elseif (! isscalar (omegamax)) + error ("lscomplex: More than one value for maximum frequency specified"); + elseif (! isscalar (ncoeff)) + error ("lscomplex: More than one number of frequencies per octave specified"); + elseif (! isscalar (noctave)) + error ("lscomplex: More than one number of octaves to traverse specified"); + elseif (omegamax == 0) + error ("lscomplex: Specified maximum frequency is not a frequency"); + elseif (noctave == 0) + error ("lscomplex: No octaves of results requested"); + elseif (ncoeff == 0) + error ("lscomplex: No frequencies per octave requested"); + elseif (ncoeff != floor (ncoeff)) + error ("lscomplex: Specified number of frequencies per octave is not integral"); + elseif (noctave != floor (noctave)) + error ("lscomplex: Specified number of octaves of results is not integral"); endif - if (! isvector (t)) - error ("lscomplex: Time values are not a vector.\n"); - endif - if (! isvector (x)) - error ("lscomplex: Magnitude values are not a vector.\n"); - endif - if (! all (size (t) == size (x))) - error ("lscomplex: Size of time vector, magnitude vector unequal.\n"); - endif - if (! isscalar (omegamax)) - error ("lscomplex: More than one value for maximum frequency specified.\n"); - endif - if (! isscalar (ncoeff)) - error ("lscomplex: More than one number of frequencies per octave specified.\n"); - endif - if (! isscalar (noctave)) - error ("lscomplex: More than one number of octaves to traverse specified.\n"); - endif - if (omegamax == 0) - error ("lscomplex: Specified maximum frequency is not a frequency.\n"); - endif - if (noctave == 0) - error ("lscomplex: No octaves of results requested.\n"); - endif - if (ncoeff == 0) - error ("lscomplex: No frequencies per octave requested.\n"); - endif - if (ncoeff != floor (ncoeff)) - error ("lscomplex: Specified number of frequencies per octave is not integral.\n"); - endif - if (noctave != floor (noctave)) - error ("lscomplex: Specified number of octaves of results is not integral.\n"); - endif - n = numel (t); + n = numel (t); iter = 0 : (ncoeff * noctave - 1); omul = (2 .^ (- iter / ncoeff)); Modified: trunk/octave-forge/extra/lssa/inst/lscomplexwavelet.m =================================================================== --- trunk/octave-forge/extra/lssa/inst/lscomplexwavelet.m 2012-08-17 15:49:41 UTC (rev 10883) +++ trunk/octave-forge/extra/lssa/inst/lscomplexwavelet.m 2012-08-17 19:29:27 UTC (rev 10884) @@ -52,7 +52,7 @@ ## 2004.) does not seem to always cover all values in the data set, and makes ## me suspicious of its ability to accurately transform a data set. ## - + transform = cell(noctave*ncoeff,1); for octave_iter = 1:noctave @@ -63,11 +63,11 @@ ## An additional consideration is that for coeff_iter = 1:ncoeff - + ## in this, win_t is the centre of the window in question ## Although that will vary depending on the window. This is just an ## implementation for the first window. - + current_iteration = (octave_iter-1)*ncoeff+coeff_iter; window_radius = pi / ( sigma * omegamax * ( 2 ^ ( current_iteration - 1 ) ) ); window_count = 2 * ceil ( ( tmax - tmin ) / window_radius ) - 1; @@ -80,14 +80,14 @@ ## win_t is the centre of the current window. win_t = tmin + window_radius; for iter_window = 1:window_count - ## Computes the transform as stated in the paper for each given frequency. - zeta = sum ( cubicwgt ( sigma .* omega .* ( T - win_t ) ) .* exp ( -i .* omega .* ( T - win_t ) ) .* X ) / sum ( cubicwgt ( sigma .* omega .* ( T - win_t ) ) .* exp ( -i .* omega .* ( T - win_t ) ) ); - transform{current_iteration}(iter_window) = zeta; - window_min += window_radius ; + ## Computes the transform as stated in the paper for each given frequency. + zeta = sum ( cubicwgt ( sigma .* omega .* ( T - win_t ) ) .* exp ( -i .* omega .* ( T - win_t ) ) .* X ) / sum ( cubicwgt ( sigma .* omega .* ( T - win_t ) ) .* exp ( -i .* omega .* ( T - win_t ) ) ); + transform{current_iteration}(iter_window) = zeta; + window_min += window_radius ; + endfor endfor + endfor - -endfor endfunction Modified: trunk/octave-forge/extra/lssa/inst/lscorrcoeff.m =================================================================== --- trunk/octave-forge/extra/lssa/inst/lscorrcoeff.m 2012-08-17 15:49:41 UTC (rev 10883) +++ trunk/octave-forge/extra/lssa/inst/lscorrcoeff.m 2012-08-17 19:29:27 UTC (rev 10884) @@ -37,38 +37,29 @@ ## Input checking is absolutely necessary. if (!((nargin >= 6) && (nargin <= 8))) - print_usage (); - endif + print_usage (); ## Test to be sure x1, y1, x2, y2 are all vectors, and that t and o are ## scalars. - if (! isvector (x1)) - error ("lscorrcoeff: First time series time values are not a vector.\n"); + elseif (! isvector (x1)) + error ("lscorrcoeff: First time series time values are not a vector"); + elseif (! isvector (y1)) + error ("lscorrcoeff: First time series magnitude values are not a vector"); + elseif (! isvector (x2)) + error ("lscorrcoeff: Second time series time values are not a vector"); + elseif (! isvector (y2)) + error ("lscorrcoeff: Second time series magnitude values are not a vector"); + elseif (! isscalar (t)) + error ("lscorrcoeff: Window centre is not a scalar"); + elseif (! isscalar (o)) + error ("lscorrcoeff: Specified frequency is not a scalar"); + elseif (! isscalar (wgtrad)) + error ("lscorrcoeff: Window radius is not a scalar"); + elseif (! all (size (x1) == size (y1))) + error ("lscorrcoeff: First time series vectors not of matching size"); + elseif (! all (size (x2) == size (y2))) + error ("lscorrcoeff: Second time series vectors not of matching size"); endif - if (! isvector (y1)) - error ("lscorrcoeff: First time series magnitude values are not a vector.\n"); - endif - if (! isvector (x2)) - error ("lscorrcoeff: Second time series time values are not a vector.\n"); - endif - if (! isvector (y2)) - error ("lscorrcoeff: Second time series magnitude values are not a vector.\n"); - endif - if (! isscalar (t)) - error ("lscorrcoeff: Window centre is not a scalar.\n"); - endif - if (! isscalar (o)) - error ("lscorrcoeff: Specified frequency is not a scalar.\n"); - endif - if (! isscalar (wgtrad)) - error ("lscorrcoeff: Window radius is not a scalar.\n"); - endif - if (! all (size (x1) == size (y1))) - error ("lscorrcoeff: First time series vectors not of matching size.\n"); - endif - if (! all (size (x2) == size (y2))) - error ("lscorrcoeff: Second time series vectors not of matching size.\n"); - endif ## How to determine if a weight function has been assigned or not? (Possible ## to get name of function?) @@ -89,7 +80,7 @@ windowed_element_count = length (rx1); if (windowed_element_count == 0) - error("lscorrcoeff: No time-series elements contained in window.\n"); + error("lscorrcoeff: No time-series elements contained in window"); endif s = sum (wgt ((rx1 - t) .* so)) * sum (wgt ((rx2 - t ) .* so )); Modified: trunk/octave-forge/extra/lssa/inst/lsreal.m =================================================================== --- trunk/octave-forge/extra/lssa/inst/lsreal.m 2012-08-17 15:49:41 UTC (rev 10883) +++ trunk/octave-forge/extra/lssa/inst/lsreal.m 2012-08-17 19:29:27 UTC (rev 10884) @@ -39,41 +39,30 @@ ## Sanity checks to make sure that the user can get meaningful errors. if (nargin != 5) - print_usage (); + print_usage (); + elseif (! isvector (t)) + error ("lsreal: Time values are not a vector"); + elseif (! isvector (x)) + error ("lsreal: Magnitude values are not a vector"); + elseif (! all (size (t) == size (x))) + error ("lsreal: Size of time vector, magnitude vector unequal"); + elseif (! isscalar (omegamax)) + error ("lsreal: More than one value for maximum frequency specified"); + elseif (! isscalar (ncoeff)) + error ("lsreal: More than one number of frequencies per octave specified"); + elseif (! isscalar (noctave)) + error ("lsreal: More than one number of octaves to traverse specified"); + elseif (omegamax == 0) + error ("lsreal: Specified maximum frequency is not a frequency"); + elseif (noctave == 0) + error ("lsreal: No octaves of results requested"); + elseif (ncoeff == 0) + error ("lsreal: No frequencies per octave requested"); + elseif (ncoeff != floor (ncoeff)) + error ("lsreal: Specified number of frequencies per octave is not integral"); + elseif (noctave != floor (noctave)) + error ("lsreal: Specified number of octaves of results is not integral"); endif - if (! isvector (t)) - error ("lsreal: Time values are not a vector.\n"); - endif - if (! isvector (x)) - error ("lsreal: Magnitude values are not a vector.\n"); - endif - if (! all (size (t) == size (x))) - error ("lsreal: Size of time vector, magnitude vector unequal.\n"); - endif - if (! isscalar (omegamax)) - error ("lsreal: More than one value for maximum frequency specified.\n"); - endif - if (! isscalar (ncoeff)) - error ("lsreal: More than one number of frequencies per octave specified.\n"); - endif - if (! isscalar (noctave)) - error ("lsreal: More than one number of octaves to traverse specified.\n"); - endif - if (omegamax == 0) - error ("lsreal: Specified maximum frequency is not a frequency.\n"); - endif - if (noctave == 0) - error ("lsreal: No octaves of results requested.\n"); - endif - if (ncoeff == 0) - error ("lsreal: No frequencies per octave requested.\n"); - endif - if (ncoeff != floor (ncoeff)) - error ("lsreal: Specified number of frequencies per octave is not integral.\n"); - endif - if (noctave != floor (noctave)) - error ("lsreal: Specified number of octaves of results is not integral.\n"); - endif n = numel (t); Modified: trunk/octave-forge/extra/lssa/inst/lswaveletcoeff.m =================================================================== --- trunk/octave-forge/extra/lssa/inst/lswaveletcoeff.m 2012-08-17 15:49:41 UTC (rev 10883) +++ trunk/octave-forge/extra/lssa/inst/lswaveletcoeff.m 2012-08-17 19:29:27 UTC (rev 10884) @@ -37,26 +37,20 @@ function coeff = lswaveletcoeff (x, y, t, o, wgt = @cubicwgt, wgtrad = 1) if (! (nargin >= 4) && (nargin <= 6)) - print_usage (); + print_usage (); + elseif (! isvector (x)) + error ("lswaveletcoeff: Time values are not a vector"); + elseif (! isvector (y)) + error ("lswaveletcoeff: Magnitude values are not a vector"); + elseif (! all (size (x) == size (y))) + error ("lswaveletcoeff: Time series vectors of uneven size"); + elseif (! isscalar (t)) + error ("lswaveletcoeff: Window centre specified is not scalar"); + elseif (! isscalar (o)) + error ("lswaveletcoeff: Frequency specified is not scalar"); + elseif (! isscalar (wgtrad)) + error ("lswaveletcoeff: Window radius specified is not scalar"); endif - if (! isvector (x)) - error ("lswaveletcoeff: Time values are not a vector.\n"); - endif - if (! isvector (y)) - error ("lswaveletcoeff: Magnitude values are not a vector.\n"); - endif - if (! all (size (x) == size (y))) - error ("lswaveletcoeff: Time series vectors of uneven size.\n"); - endif - if (! isscalar (t)) - error ("lswaveletcoeff: Window centre specified is not scalar.\n"); - endif - if (! isscalar (o)) - error ("lswaveletcoeff: Frequency specified is not scalar.\n"); - endif - if (! isscalar (wgtrad)) - error ("lswaveletcoeff: Window radius specified is not scalar.\n"); - endif so = 0.05 .* o; Modified: trunk/octave-forge/extra/lssa/src/fastlscomplex.cc =================================================================== --- trunk/octave-forge/extra/lssa/src/fastlscomplex.cc 2012-08-17 15:49:41 UTC (rev 10883) +++ trunk/octave-forge/extra/lssa/src/fastlscomplex.cc 2012-08-17 19:29:27 UTC (rev 10884) @@ -312,30 +312,30 @@ */ double *exp_pse_ptr, *exp_ptr, exp_power_series_elements[12]; { - double t = mu * loop_delta_tau, tt; - exp_ptr = exp_power_series_elements; - *exp_ptr++ = 1; - *exp_ptr++ = t; - tt = t * t * ( 1.0 / 2.0 ); - *exp_ptr++ = tt; - tt *= t * ( 1.0 / 3.0 ); - *exp_ptr++ = tt; - tt *= t * ( 1.0 / 4.0 ); - *exp_ptr++ = tt; - tt *= t * ( 1.0 / 5.0 ); - *exp_ptr++ = tt; - tt *= t * ( 1.0 / 6.0 ); - *exp_ptr++ = tt; - tt *= t * ( 1.0 / 7.0 ); - *exp_ptr++ = tt; - tt *= t * ( 1.0 / 8.0 ); - *exp_ptr++ = tt; - tt *= t * ( 1.0 / 9.0 ); - *exp_ptr++ = tt; - tt *= t * ( 1.0 / 10.0 ); - *exp_ptr++ = tt; - tt *= t * ( 1.0 / 11.0 ); - *exp_ptr++ = tt; + double t = mu * loop_delta_tau, tt; + exp_ptr = exp_power_series_elements; + *exp_ptr++ = 1; + *exp_ptr++ = t; + tt = t * t * ( 1.0 / 2.0 ); + *exp_ptr++ = tt; + tt *= t * ( 1.0 / 3.0 ); + *exp_ptr++ = tt; + tt *= t * ( 1.0 / 4.0 ); + *exp_ptr++ = tt; + tt *= t * ( 1.0 / 5.0 ); + *exp_ptr++ = tt; + tt *= t * ( 1.0 / 6.0 ); + *exp_ptr++ = tt; + tt *= t * ( 1.0 / 7.0 ); + *exp_ptr++ = tt; + tt *= t * ( 1.0 / 8.0 ); + *exp_ptr++ = tt; + tt *= t * ( 1.0 / 9.0 ); + *exp_ptr++ = tt; + tt *= t * ( 1.0 / 10.0 ); + *exp_ptr++ = tt; + tt *= t * ( 1.0 / 11.0 ); + *exp_ptr++ = tt; } exp_pse_ptr = exp_ptr = exp_power_series_elements; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |