diff options
author | koe <ukoe@protonmail.com> | 2020-07-21 02:00:27 -0500 |
---|---|---|
committer | koe <ukoe@protonmail.com> | 2020-07-23 03:36:05 -0500 |
commit | 85efc88c1edc7371ca5c8722c896fd64a258ddd2 (patch) | |
tree | 82603bf55a58a77a797193e81bac479f4a2adc6c /contrib/epee/include/misc_language.h | |
parent | Merge pull request #6586 (diff) | |
download | monero-85efc88c1edc7371ca5c8722c896fd64a258ddd2.tar.xz |
Fix overflow issue in epee:misc_utils::rolling_median_t and median(), with unit test
Diffstat (limited to '')
-rw-r--r-- | contrib/epee/include/misc_language.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/epee/include/misc_language.h b/contrib/epee/include/misc_language.h index 5f7202150..a04c63231 100644 --- a/contrib/epee/include/misc_language.h +++ b/contrib/epee/include/misc_language.h @@ -106,6 +106,14 @@ namespace misc_utils return true; } + template <typename T> + T get_mid(const T &a, const T &b) + { + //returns the average of two numbers; overflow safe and works with at least all integral and floating point types + //(a+b)/2 = (a/2) + (b/2) + ((a - 2*(a/2)) + (b - 2*(b/2)))/2 + return (a/2) + (b/2) + ((a - 2*(a/2)) + (b - 2*(b/2)))/2; + } + template<class type_vec_type> type_vec_type median(std::vector<type_vec_type> &v) { @@ -122,7 +130,7 @@ namespace misc_utils return v[n]; }else {//2, 4, 6... - return (v[n-1] + v[n])/2; + return get_mid<type_vec_type>(v[n-1],v[n]); } } |