From 5a3d36fecabc8f220b19dcaea28a78f99b5244af Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Thu, 17 Apr 2025 12:28:51 -0400 Subject: switched k to a double --- include/framework/reconstruction/BSMPolicy.h | 6 +++--- include/framework/reconstruction/LevelingPolicy.h | 7 ++++--- include/framework/reconstruction/TieringPolicy.h | 8 +++++--- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/framework/reconstruction/BSMPolicy.h b/include/framework/reconstruction/BSMPolicy.h index 65554fb..61f379e 100644 --- a/include/framework/reconstruction/BSMPolicy.h +++ b/include/framework/reconstruction/BSMPolicy.h @@ -21,7 +21,7 @@ class BSMPolicy : public ReconstructionPolicy { LevelVector; public: - BSMPolicy(size_t buffer_size, size_t scale_factor, size_t modifier = 0) + BSMPolicy(size_t buffer_size, size_t scale_factor, double modifier = 0) : m_scale_factor(scale_factor), m_buffer_size(buffer_size), m_size_modifier(modifier) {} @@ -85,12 +85,12 @@ private: } inline size_t capacity(level_index level, size_t reccnt) const { - size_t base = m_scale_factor * pow(log(reccnt), m_size_modifier); + double base = std::ceil(m_scale_factor * std::pow(std::log10(reccnt), m_size_modifier)); return m_buffer_size * (base - 1) * pow(base, level + 1); } size_t m_scale_factor; size_t m_buffer_size; - size_t m_size_modifier; + double m_size_modifier; }; } // namespace de diff --git a/include/framework/reconstruction/LevelingPolicy.h b/include/framework/reconstruction/LevelingPolicy.h index 6e20cdb..955bc02 100644 --- a/include/framework/reconstruction/LevelingPolicy.h +++ b/include/framework/reconstruction/LevelingPolicy.h @@ -21,7 +21,7 @@ class LevelingPolicy : public ReconstructionPolicy { LevelVector; public: - LevelingPolicy(size_t scale_factor, size_t buffer_size, size_t modifier = 0) + LevelingPolicy(size_t scale_factor, size_t buffer_size, double modifier = 0) : m_scale_factor(scale_factor), m_buffer_size(buffer_size), m_size_modifier(modifier) {} @@ -95,11 +95,12 @@ private: inline size_t capacity(level_index level, size_t reccnt) const { return m_buffer_size * - pow(m_scale_factor * pow(std::log(reccnt), m_size_modifier), level); + pow(m_scale_factor * std::ceil(std::pow(std::log10(reccnt), m_size_modifier)), level); + } size_t m_scale_factor; size_t m_buffer_size; - size_t m_size_modifier; + double m_size_modifier; }; } // namespace de diff --git a/include/framework/reconstruction/TieringPolicy.h b/include/framework/reconstruction/TieringPolicy.h index 55f5f47..b1fcb49 100644 --- a/include/framework/reconstruction/TieringPolicy.h +++ b/include/framework/reconstruction/TieringPolicy.h @@ -21,7 +21,7 @@ class TieringPolicy : public ReconstructionPolicy { LevelVector; public: - TieringPolicy(size_t scale_factor, size_t buffer_size, size_t modifier=0) + TieringPolicy(size_t scale_factor, size_t buffer_size, double modifier=0) : m_scale_factor(scale_factor), m_buffer_size(buffer_size), m_size_modifier(modifier) {} std::vector get_reconstruction_tasks( @@ -73,10 +73,12 @@ private: return target_level; } - inline size_t capacity(size_t reccnt) const { return m_scale_factor * std::pow(std::log(reccnt), m_size_modifier); } + inline size_t capacity(size_t reccnt) const { + return std::ceil((double) m_scale_factor * std::pow(std::log10(reccnt), m_size_modifier)); + } size_t m_scale_factor; size_t m_buffer_size; - size_t m_size_modifier; + double m_size_modifier; }; } // namespace de -- cgit v1.2.3