From a5ee0bb24c3dbb8c48bc66a6480669f69f742c5f Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 12 Apr 2021 11:21:10 +0100 Subject: [PATCH] Result member functions are now const --- include/etl/correlation.h | 14 +++++++------- include/etl/covariance.h | 8 ++++---- include/etl/mean.h | 8 ++++---- include/etl/rms.h | 8 ++++---- include/etl/standard_deviation.h | 14 +++++++------- include/etl/variance.h | 8 ++++---- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/etl/correlation.h b/include/etl/correlation.h index c22a5b7c..c78b9e31 100644 --- a/include/etl/correlation.h +++ b/include/etl/correlation.h @@ -161,7 +161,7 @@ namespace etl //********************************* /// Get the correlation. //********************************* - double get_covariance() + double get_covariance() const { calculate(); @@ -171,7 +171,7 @@ namespace etl //********************************* /// Get the correlation. //********************************* - double get_correlation() + double get_correlation() const { calculate(); @@ -181,7 +181,7 @@ namespace etl //********************************* /// Get the correlation. //********************************* - operator double() + operator double() const { return get_correlation(); } @@ -215,7 +215,7 @@ namespace etl //********************************* /// Do the calculation. //********************************* - void calculate() + void calculate() const { if (recalculate) { @@ -264,9 +264,9 @@ namespace etl calc_t sum1; calc_t sum2; uint32_t counter; - double covariance_value; - double correlation_value; - bool recalculate; + mutable double covariance_value; + mutable double correlation_value; + mutable bool recalculate; }; } diff --git a/include/etl/covariance.h b/include/etl/covariance.h index 33619cc9..3f7b1232 100644 --- a/include/etl/covariance.h +++ b/include/etl/covariance.h @@ -159,7 +159,7 @@ namespace etl //********************************* /// Get the covaniance. //********************************* - double get_covariance() + double get_covariance() const { if (recalculate) { @@ -182,7 +182,7 @@ namespace etl //********************************* /// Get the covariance. //********************************* - operator double() + operator double() const { return get_covariance(); } @@ -214,8 +214,8 @@ namespace etl calc_t sum1; calc_t sum2; uint32_t counter; - double covariance_value; - bool recalculate; + mutable double covariance_value; + mutable bool recalculate; }; } diff --git a/include/etl/mean.h b/include/etl/mean.h index e2a42fa8..04370df3 100644 --- a/include/etl/mean.h +++ b/include/etl/mean.h @@ -146,7 +146,7 @@ namespace etl //********************************* /// Get the mean. //********************************* - double get_mean() + double get_mean() const { if (recalculate) { @@ -167,7 +167,7 @@ namespace etl //********************************* /// Get the mean. //********************************* - operator double() + operator double() const { return get_mean(); } @@ -195,8 +195,8 @@ namespace etl calc_t sum; uint32_t counter; - double mean_value; - bool recalculate; + mutable double mean_value; + mutable bool recalculate; }; } diff --git a/include/etl/rms.h b/include/etl/rms.h index d6f478d5..8b6fdb60 100644 --- a/include/etl/rms.h +++ b/include/etl/rms.h @@ -148,7 +148,7 @@ namespace etl //********************************* /// Get the rms. //********************************* - double get_rms() + double get_rms() const { if (recalculate) { @@ -174,7 +174,7 @@ namespace etl //********************************* /// Get the rms. //********************************* - operator double() + operator double() const { return get_rms(); } @@ -202,8 +202,8 @@ namespace etl calc_t sum_of_squares; uint32_t counter; - double rms_value; - bool recalculate; + mutable double rms_value; + mutable bool recalculate; }; } diff --git a/include/etl/standard_deviation.h b/include/etl/standard_deviation.h index bcae237b..4c99ed4a 100644 --- a/include/etl/standard_deviation.h +++ b/include/etl/standard_deviation.h @@ -158,7 +158,7 @@ namespace etl //********************************* /// Get the variance. //********************************* - double get_variance() + double get_variance() const { calculate(); @@ -168,7 +168,7 @@ namespace etl //********************************* /// Get the standard_deviation. //********************************* - double get_standard_deviation() + double get_standard_deviation() const { calculate(); @@ -178,7 +178,7 @@ namespace etl //********************************* /// Get the standard_deviation. //********************************* - operator double() + operator double() const { return get_standard_deviation(); } @@ -209,7 +209,7 @@ namespace etl //********************************* /// Do the calculation. //********************************* - void calculate() + void calculate() const { if (recalculate) { @@ -238,9 +238,9 @@ namespace etl calc_t sum_of_squares; calc_t sum; uint32_t counter; - double variance_value; - double standard_deviation_value; - bool recalculate; + mutable double variance_value; + mutable double standard_deviation_value; + mutable bool recalculate; }; } diff --git a/include/etl/variance.h b/include/etl/variance.h index b26fcc20..c5ee9b8f 100644 --- a/include/etl/variance.h +++ b/include/etl/variance.h @@ -158,7 +158,7 @@ namespace etl //********************************* /// Get the variance. //********************************* - double get_variance() + double get_variance() const { if (recalculate) { @@ -183,7 +183,7 @@ namespace etl //********************************* /// Get the variance. //********************************* - operator double() + operator double() const { return get_variance(); } @@ -213,8 +213,8 @@ namespace etl calc_t sum_of_squares; calc_t sum; uint32_t counter; - double variance_value; - bool recalculate; + mutable double variance_value; + mutable bool recalculate; }; }