From ad88625beabb7c19c7b7f946d45b617ee7f892ec Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 17 Jan 2009 11:38:46 -0500 Subject: Finished Rules tests and fixed some tests in Rules --- sigmod/Rules.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sigmod/Rules.cpp') diff --git a/sigmod/Rules.cpp b/sigmod/Rules.cpp index e8fa0d7b..18300a1a 100644 --- a/sigmod/Rules.cpp +++ b/sigmod/Rules.cpp @@ -250,13 +250,13 @@ CHECK_BEGIN(Rules, bool, specialDVSplit) } CHECK_END() CHECK(Rules, bool, effortValuesAllowed) -CHECK_BOUNDS(Rules, int, maxTotalEV, 0, INT_MAX) +CHECK_BEGIN(Rules, int, maxTotalEV) + if (m_effortValuesAllowed) + TBOUNDS(maxTotalEV, 0, INT_MAX); +CHECK_END() CHECK_BEGIN(Rules, int, maxEVPerStat) - if (m_maxTotalEV) - { + if (m_effortValuesAllowed && m_maxTotalEV) TBOUNDS(maxEVPerStat, 0, m_maxTotalEV); - return false; - } CHECK_END() Sigmod::Rules& Sigmod::Rules::operator=(const Rules& rhs) -- cgit