From 8fdd4c18fd1c163c056c2f4db47ed3548b91c85e Mon Sep 17 00:00:00 2001 From: rasmus Date: Wed, 26 Mar 2025 12:05:45 +0100 Subject: [PATCH] Validate if roll is higher than 10, and lower than 0 --- include/NumberHelper.h | 1 + rolls.txt | 2 +- rolls2.txt | 1 + rolls3.txt | 1 + src/NumberHelper.cpp | 10 ++++++++++ src/main.cpp | 5 +++++ 6 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 rolls2.txt create mode 100644 rolls3.txt diff --git a/include/NumberHelper.h b/include/NumberHelper.h index a1da688..daa95f9 100644 --- a/include/NumberHelper.h +++ b/include/NumberHelper.h @@ -13,6 +13,7 @@ class NumberHelper { ~NumberHelper() = default; static vector getRolls(string csv); + static bool validateRolls(vector rolls); }; diff --git a/rolls.txt b/rolls.txt index aadbdc8..083bc71 100644 --- a/rolls.txt +++ b/rolls.txt @@ -1 +1 @@ -2, 3, 5, 4, 9, 1, 2, 5, 3, 2, 4, 2, 3, 3, 4, 6, 10, 3, 2 +2, 3, 5, 4, 9, 1, 2, 5, 3, 2, 4, 2, 3, 3, 4, 6, 10, 3, 2, diff --git a/rolls2.txt b/rolls2.txt new file mode 100644 index 0000000..2daa3f9 --- /dev/null +++ b/rolls2.txt @@ -0,0 +1 @@ +10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 diff --git a/rolls3.txt b/rolls3.txt new file mode 100644 index 0000000..b32232c --- /dev/null +++ b/rolls3.txt @@ -0,0 +1 @@ +5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 diff --git a/src/NumberHelper.cpp b/src/NumberHelper.cpp index bc45262..d13a7f5 100644 --- a/src/NumberHelper.cpp +++ b/src/NumberHelper.cpp @@ -14,4 +14,14 @@ vector NumberHelper::getRolls(string csv){ } return rolls; +} + +bool NumberHelper::validateRolls(vector rolls){ + for(int i = 0; i < rolls.size(); ++i) { + if(rolls[i] > 10 || rolls[i] < 0) { + return false; + } + } + + return true; } \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 91b7114..edc4b39 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,6 +22,11 @@ int main(int argc, char *argv[]) { string file = FileReader::getFile(argv[1]); vector rolls = NumberHelper::getRolls(file); + if (!NumberHelper::validateRolls(rolls)) { + cerr << "Non-valid number in rolls."; + return 0; + } + PrintFrames::printHeader(rolls); PrintFrames::printValue(rolls);