From f799857da9ef3ee93c84f44eb377aa079352cc31 Mon Sep 17 00:00:00 2001 From: Alessandro Sidero <75628365+Alessandro624@users.noreply.github.com> Date: Tue, 15 Apr 2025 15:38:20 +0200 Subject: [PATCH] refactor: replace asserts with eoException-based validation --- eo/src/eoRanking.h | 14 +++++++++++++- eo/src/eoRankingCached.h | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/eo/src/eoRanking.h b/eo/src/eoRanking.h index a8e6b69d1..ea82ed5f0 100644 --- a/eo/src/eoRanking.h +++ b/eo/src/eoRanking.h @@ -48,7 +48,19 @@ public: */ eoRanking(double _p = 2.0, double _e = 1.0) : pressure(_p), exponent(_e) { - assert(1 < pressure and exponent <= 2); + if (pressure <= 1.0) + { + std::string msg = "eoRanking: pressure must be > 1.0"; + eo::log << eo::errors << "ERROR: " << msg << std::endl; + throw eoException(msg); + } + + if (exponent > 2.0) + { + std::string msg = "eoRanking: exponent must be <= 2.0"; + eo::log << eo::errors << "ERROR: " << msg << std::endl; + throw eoException(msg); + } } /* helper function: finds index in _pop of _eo, an EOT * */ diff --git a/eo/src/eoRankingCached.h b/eo/src/eoRankingCached.h index 65b8c5fce..81cfa60d4 100644 --- a/eo/src/eoRankingCached.h +++ b/eo/src/eoRankingCached.h @@ -59,7 +59,19 @@ public: */ eoRankingCached(double _p = 2.0, double _e = 1.0) : pressure(_p), exponent(_e), cached_pSize(0) { - assert(1 < pressure and exponent <= 2); + if (pressure <= 1.0) + { + std::string msg = "eoRankingCached: pressure must be > 1.0"; + eo::log << eo::errors << "ERROR: " << msg << std::endl; + throw eoException(msg); + } + + if (exponent > 2.0) + { + std::string msg = "eoRankingCached: exponent must be <= 2.0"; + eo::log << eo::errors << "ERROR: " << msg << std::endl; + throw eoException(msg); + } } /*