Validator: refactor number validators to core (#199)

CMakeLists.txt

@@ -164,7 +164,7 @@ set(INCLUDE
         include/tcframe/util.hpp
         include/tcframe/util/StringUtils.hpp
         include/tcframe/util/optional.hpp
-        include/tcframe/validator/number.hpp
+        include/tcframe/validator/core.hpp
         include/tcframe/validator/vector.hpp
 )
 
@@ -260,7 +260,7 @@ set(TEST_UNIT
         test/unit/tcframe/util/OptionalTests.cpp
         test/unit/tcframe/util/StringUtilsTests.cpp
         test/unit/tcframe/util/TestUtils.hpp
-        test/unit/tcframe/validator/NumberValidatorTests.cpp
+        test/unit/tcframe/validator/CoreValidatorTests.cpp
         test/unit/tcframe/validator/VectorValidatorTests.cpp
 )
 

include/tcframe/spec.hpp

@@ -7,4 +7,4 @@
 #include "tcframe/spec/testcase.hpp"
 #include "tcframe/spec/variable.hpp"
 #include "tcframe/spec/verifier.hpp"
-
+#include "tcframe/validator/core.hpp"

include/tcframe/validator/core.hpp

@@ -0,0 +1,30 @@
+
+#include <type_traits>
+
+using std::enable_if_t;
+using std::is_arithmetic_v;
+
+namespace tcframe {
+
+template<typename T>
+using ScalarType = enable_if_t<is_arithmetic_v<T>>;
+
+template<typename T, typename = ScalarType<T>>
+struct ScalarValidator {
+private:
+    T val;
+
+public:
+    explicit ScalarValidator(T _val) : val(_val) {}
+
+    bool isBetween(T minVal, T maxVal) {
+        return minVal <= val && val <= maxVal;
+    }
+};
+
+template<typename T, typename = ScalarType<T>>
+ScalarValidator<T> valueOf(T val) {
+    return ScalarValidator(val);
+}
+
+}

test/ete/resources/interactive/spec.cpp

@@ -20,7 +20,7 @@ class ProblemSpec : public BaseProblemSpec {
     }
 
     void Constraints() {
-        CONS(1 <= N && N <= 10);
+        CONS(valueOf(N).isBetween(1, 10));
     }
 };
 

test/ete/resources/multi-no-output/spec.cpp

@@ -26,12 +26,12 @@ class ProblemSpec : public BaseProblemSpec {
     }
 
     void MultipleTestCasesConstraints() {
-        CONS(1 <= T && T <= 5);
+        CONS(valueOf(T).isBetween(1, 5));
     }
 
     void Constraints() {
-        CONS(1 <= A && A <= 100);
-        CONS(1 <= B && B <= 100);
+        CONS(valueOf(A).isBetween(1, 100));
+        CONS(valueOf(B).isBetween(1, 100));
     }
 };
 

test/ete/resources/multi-prefix/spec.cpp

@@ -27,12 +27,12 @@ class ProblemSpec : public BaseProblemSpec {
     }
 
     void MultipleTestCasesConstraints() {
-        CONS(1 <= T && T <= 5);
+        CONS(valueOf(T).isBetween(1, 5));
     }
 
     void Constraints() {
-        CONS(1 <= A && A <= 100);
-        CONS(1 <= B && B <= 100);
+        CONS(valueOf(A).isBetween(1, 100));
+        CONS(valueOf(B).isBetween(1, 100));
     }
 };
 

test/ete/resources/multi/spec.cpp

@@ -30,8 +30,8 @@ class ProblemSpec : public BaseProblemSpec {
     }
 
     void Constraints() {
-        CONS(1 <= A && A <= 100);
-        CONS(1 <= B && B <= 100);
+        CONS(valueOf(A).isBetween(1, 100));
+        CONS(valueOf(B).isBetween(1, 100));
     }
 };
 

test/ete/resources/normal-complex-formats/spec.cpp

@@ -39,7 +39,7 @@ class ProblemSpec : public BaseProblemSpec {
     }
 
     void Constraints() {
-        CONS(1 <= N && N <= 10);
+        CONS(valueOf(N).isBetween(1, 10));
     }
 };
 

test/ete/resources/normal-custom-scorer/spec.cpp

@@ -21,8 +21,8 @@ class ProblemSpec : public BaseProblemSpec {
     }
 
     void Constraints() {
-        CONS(1 <= A && A <= 10);
-        CONS(1 <= B && B <= 10);
+        CONS(valueOf(A).isBetween(1, 10));
+        CONS(valueOf(B).isBetween(1, 10));
     }
 };
 

test/ete/resources/normal-lifecycle/spec.cpp

@@ -31,7 +31,7 @@ class ProblemSpec : public BaseProblemSpec {
     }
 
     void Constraints() {
-        CONS(1 <= N && N <= 10);
+        CONS(valueOf(N).isBetween(1, 10));
     }
 };
 

test/ete/resources/normal-no-output/spec.cpp

@@ -21,8 +21,8 @@ class ProblemSpec : public BaseProblemSpec {
     }
 
     void Constraints() {
-        CONS(1 <= A && A <= 10);
-        CONS(1 <= B && B <= 10);
+        CONS(valueOf(A).isBetween(1, 10));
+        CONS(valueOf(B).isBetween(1, 10));
     }
 };
 

test/ete/resources/normal/spec.cpp

@@ -22,8 +22,8 @@ class ProblemSpec : public BaseProblemSpec {
     }
 
     void Constraints() {
-        CONS(1 <= A && A <= 10);
-        CONS(1 <= B && B <= 10);
+        CONS(valueOf(A).isBetween(1, 10));
+        CONS(valueOf(B).isBetween(1, 10));
     }
 };
 

test/unit/tcframe/validator/CoreValidatorTests.cpp

@@ -0,0 +1,21 @@
+#include "gmock/gmock.h"
+
+#include "tcframe/validator/core.hpp"
+
+using ::testing::Eq;
+using ::testing::Test;
+
+namespace tcframe {
+
+class CoreValidatorTests : public Test {};
+
+TEST_F(CoreValidatorTests, valueOf_isBetween) {
+    EXPECT_FALSE(valueOf(5).isBetween(1, 4));
+    EXPECT_FALSE(valueOf(5).isBetween(6, 10));
+    EXPECT_FALSE(valueOf(5).isBetween(100, -100));
+    EXPECT_TRUE(valueOf(5).isBetween(1, 5));
+    EXPECT_TRUE(valueOf(5).isBetween(5, 10));
+    EXPECT_TRUE(valueOf(5).isBetween(0, 10));
+}
+
+}