mirror
/
libdspl-2.0
kopia lustrzana https://github.com/Dsplib/libdspl-2.0
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

std function is renamed to stat_std

pull/6/merge
Sergey Bakhurin 2021-12-04 21:26:33 +03:00
rodzic 82d8a57362
commit d509c033f6
4 zmienionych plików z 20 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
dspl/src/statistic.c
Wyświetl plik

@ -473,7 +473,7 @@ int DSPL_API minmax(double* x, int n, double* xmin, double* xmax)
#ifdef DOXYGEN_ENGLISH
/*! ****************************************************************************
\ingroup SPEC_MATH_STAT_GROUP
\fn int std(double* x, int n, double* s)
\fn int stat_std(double* x, int n, double* s)
\brief Calculates the standard deviation of the input vector `x`
Function calculates the the standard deviation value
@ -503,7 +503,7 @@ Example:
\code{.cpp}
double a[5] = {0.0, 1.0, 2.0, 3.0, 4.0};
double s;
std(a, 5, &s);
stat_std(a, 5, &s);
printf("\n\n Standard deviation value: %8.1f\n", s);
\endcode
As result the variable `s` will keep value `1.5811`.
@ -513,7 +513,7 @@ As result the variable `s` will keep value `1.5811`.
#ifdef DOXYGEN_RUSSIAN
/*! ****************************************************************************
\ingroup SPEC_MATH_STAT_GROUP
\fn int std(double* x, int n, double* s)
\fn int stat_std(double* x, int n, double* s)
\brief Выборочная оценка стандартного отклонения вещественного вектора `x`
Функция рассчитывает оценку стандартного отклонения
@ -545,7 +545,7 @@ s = \sqrt{\frac{1}{n-1} \sum_{i = 0}^{n-1} \big(x(i) - \mu \big)^2},
\code{.cpp}
double a[5] = {0.0, 1.0, 2.0, 3.0, 4.0};
double s;
std(a, 5, &s);
stat_std(a, 5, &s);
printf("\n\n Standard deviation value: %8.1f\n", s);
\endcode
В результате в переменную `s` будет записано значение `1.5811`.
@ -553,7 +553,7 @@ s = \sqrt{\frac{1}{n-1} \sum_{i = 0}^{n-1} \big(x(i) - \mu \big)^2},
\author Бахурин Сергей. www.dsplib.org
***************************************************************************** */
#endif
int DSPL_API std(double* x, int n, double* s)
int DSPL_API stat_std(double* x, int n, double* s)
{
int k, err;
double sum, m;
@ -577,7 +577,7 @@ exit_label:
#ifdef DOXYGEN_ENGLISH
/*! ****************************************************************************
\ingroup SPEC_MATH_STAT_GROUP
\fn int std_cmplx(complex_t* x, int n, double* s)
\fn int stat_std_cmplx(complex_t* x, int n, double* s)
\brief Calculates the standard deviation of the complex input vector `x`
Function calculates the the standard deviation value
@ -607,7 +607,7 @@ Example:
\code{.cpp}
complex_t a[3] = {{0.0, -1.0}, {1.0, 2.0}, {3.0, 5.0}};
double s;
std_cmplx(a, 3, &s);
stat_std_cmplx(a, 3, &s);
printf("\n\n Standard deviation value: %8.1f\n", s);
\endcode
As result the variable `s` will keep value `3.3665`.
@ -617,7 +617,7 @@ As result the variable `s` will keep value `3.3665`.
#ifdef DOXYGEN_RUSSIAN
/*! ****************************************************************************
\ingroup SPEC_MATH_STAT_GROUP
\fn int std_cmplx(complex_t* x, int n, double* s)
\fn int stat_std_cmplx(complex_t* x, int n, double* s)
\brief Выборочная оценка стандартного отклонения комплексного вектора `x`
Функция рассчитывает оценку стандартного отклонения
@ -651,7 +651,7 @@ s = \sqrt{\frac{1}{n-1} \sum_{i = 0}^{n-1} \big|x(i) - \mu \big|^2},
\code{.cpp}
complex_t a[3] = {{0.0, -1.0}, {1.0, 2.0}, {3.0, 5.0}};
double s;
std_cmplx(a, 3, &s);
stat_std_cmplx(a, 3, &s);
printf("\n\n Standard deviation value: %8.1f\n", s);
\endcode
В результате в переменную `s` будет записано значение `3.3665`.
@ -659,7 +659,7 @@ s = \sqrt{\frac{1}{n-1} \sum_{i = 0}^{n-1} \big|x(i) - \mu \big|^2},
\author Бахурин Сергей. www.dsplib.org
***************************************************************************** */
#endif
int DSPL_API std_cmplx(complex_t* x, int n, double* s)
int DSPL_API stat_std_cmplx(complex_t* x, int n, double* s)
{
int k, err;
complex_t tmp, m;

8
include/dspl.c
Wyświetl plik

@ -180,8 +180,8 @@ p_sin_cmplx sin_cmplx ;
p_sinc sinc ;
p_sine_int sine_int ;
p_sqrt_cmplx sqrt_cmplx ;
p_std std ;
p_std_cmplx std_cmplx ;
p_stat_std stat_std ;
p_stat_std_cmplx stat_std_cmplx ;
p_sum sum ;
p_sum_sqr sum_sqr ;
@ -397,8 +397,8 @@ void* dspl_load()
LOAD_FUNC(sinc);
LOAD_FUNC(sine_int);
LOAD_FUNC(sqrt_cmplx);
LOAD_FUNC(std);
LOAD_FUNC(std_cmplx);
LOAD_FUNC(stat_std);
LOAD_FUNC(stat_std_cmplx);
LOAD_FUNC(sum);
LOAD_FUNC(sum_sqr);

4
include/dspl.h
Wyświetl plik

@ -1517,11 +1517,11 @@ DECLARE_FUNC(int, sqrt_cmplx, complex_t*
COMMA int
COMMA complex_t*);
/*----------------------------------------------------------------------------*/
DECLARE_FUNC(int, std, double* x
DECLARE_FUNC(int, stat_std, double* x
COMMA int n
COMMA double* s);
/*----------------------------------------------------------------------------*/
DECLARE_FUNC(int, std_cmplx, complex_t* x
DECLARE_FUNC(int, stat_std_cmplx, complex_t* x
COMMA int n
COMMA double* s);
/*----------------------------------------------------------------------------*/

8
verification/src/statistic_verification.c
Wyświetl plik

@ -34,8 +34,8 @@ int main(int argc, char* argv[])
verif_str(&yd, 1, "mean for double data:",
"dat/mean_real.dat",
"verification.log");
std(xd, SIZE, &yd);
verif_str(&yd, 1, "std for double data:", "dat/std_real.dat",
stat_std(xd, SIZE, &yd);
verif_str(&yd, 1, "stat_std for double data:", "dat/std_real.dat",
"verification.log");
@ -48,8 +48,8 @@ int main(int argc, char* argv[])
/*------------------------------------------------------------------------*/
std_cmplx(xc, SIZE, &yd);
verif_str(&yd, 1, "std for complex data:",
stat_std_cmplx(xc, SIZE, &yd);
verif_str(&yd, 1, "stat_std for complex data:",
"dat/std_cmplx.dat",
"verification.log");