From c04b7bc41412f9b8e94f181c2a85ad5f2bc2f871 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Sat, 14 Dec 2019 22:13:30 +0200 Subject: [PATCH 1/2] Fix typo in install_build_depends.sh --- BUILD/install_build_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD/install_build_deps.sh b/BUILD/install_build_deps.sh index 999ee3303..129adbeea 100755 --- a/BUILD/install_build_deps.sh +++ b/BUILD/install_build_deps.sh @@ -107,7 +107,7 @@ then yum repolist all | grep PowerTools if [ $? == 0 ] then - enable_power_tools="enablerepo=PowerTools" + enable_power_tools="--enablerepo=PowerTools" fi sudo yum install -y --nogpgcheck ${enable_power_tools} \ gcc gcc-c++ ncurses-devel bison glibc-devel \ From 41c1ce441add1523dbb2ce1243f6532eda7b5247 Mon Sep 17 00:00:00 2001 From: Niclas Antti Date: Mon, 16 Dec 2019 09:25:22 +0200 Subject: [PATCH 2/2] fix bug in average --- maxutils/maxbase/include/maxbase/average.hh | 3 +-- maxutils/maxbase/src/average.cc | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/maxutils/maxbase/include/maxbase/average.hh b/maxutils/maxbase/include/maxbase/average.hh index c06dc5188..a05d5a3b9 100644 --- a/maxutils/maxbase/include/maxbase/average.hh +++ b/maxutils/maxbase/include/maxbase/average.hh @@ -60,8 +60,7 @@ public: CumulativeAverage& operator+=(const CumulativeAverage& rhs); private: double m_ave = 0; - int m_num_samples = 0; - int m_num_last_added = 0; + long m_num_samples = 0; }; CumulativeAverage operator+(const CumulativeAverage& rhs, const CumulativeAverage& lhs); diff --git a/maxutils/maxbase/src/average.cc b/maxutils/maxbase/src/average.cc index ee5c99db2..a2e0b5ea5 100644 --- a/maxutils/maxbase/src/average.cc +++ b/maxutils/maxbase/src/average.cc @@ -27,10 +27,9 @@ void CumulativeAverage::add(double ave, int num_samples) } else { - m_ave = (m_ave * (m_num_samples - m_num_last_added) + m_ave = (m_ave * (m_num_samples - num_samples) + ave * num_samples) / m_num_samples; } - m_num_last_added = num_samples; } double CumulativeAverage::average() const @@ -58,7 +57,6 @@ void CumulativeAverage::reset() { m_ave = 0; m_num_samples = 0; - m_num_last_added = 0; } EMAverage::EMAverage(double min_alpha, double max_alpha, int sample_max)