From dc4114d7b68268956c0eac4f643986b7ce696b36 Mon Sep 17 00:00:00 2001 From: LeottaAlberto Date: Tue, 4 Nov 2025 14:16:34 +0100 Subject: [PATCH 1/2] refactor: improve an array --- exercises/ex2.cpp | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/exercises/ex2.cpp b/exercises/ex2.cpp index 9e8cd8e4..a7b200d7 100644 --- a/exercises/ex2.cpp +++ b/exercises/ex2.cpp @@ -7,43 +7,16 @@ #include using namespace std; -int main() -{ +string arr[] = {"Monday", "Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"}; + +int main(){ int week; cout << "Enter week number(1-7): " << endl; cin >> week; - if (week == 1) - { - cout << "Monday" << endl; - } - else if (week == 2) - { - cout << "Tuesday" << endl; - } - else if (week == 3) - { - cout << "Wednesday" << endl; - } - else if (week == 4) - { - cout << "Thursday" << endl; - } - else if (week == 5) - { - cout << "Friday" << endl; - } - else if (week == 6) - { - cout << "Saturday" << endl; - } - else if (week == 7) - { - cout << "Sunday" << endl; - } - else - { + if (week < 8) cout << arr[week]; + else{ cout << "Invalid input! Please enter week number between 1-7." << endl; } From 50c8cea36093c03ca6a06792399d2402b07cfb89 Mon Sep 17 00:00:00 2001 From: LeottaAlberto Date: Fri, 7 Nov 2025 23:59:50 +0100 Subject: [PATCH 2/2] refactor(ex2.cpp): Add range check and fix input handling in week day program --- exercises/ex2.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/exercises/ex2.cpp b/exercises/ex2.cpp index a7b200d7..337083c3 100644 --- a/exercises/ex2.cpp +++ b/exercises/ex2.cpp @@ -7,18 +7,25 @@ #include using namespace std; -string arr[] = {"Monday", "Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"}; +const string week[] = {"Monday", "Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"}; + +const int DAY_IN_WEEK = 7; int main(){ - int week; + int weekDay; + + cout << "Enter weekDay number(1-7): " << endl; - cout << "Enter week number(1-7): " << endl; - cin >> week; + if(!(cin >> weekDay)){ + cerr << "Invalid input! Please enter week number between 1-7."; + return EXIT_FAILURE; + } - if (week < 8) cout << arr[week]; - else{ - cout << "Invalid input! Please enter week number between 1-7." << endl; + if (weekDay == 0 || weekDay > DAY_IN_WEEK) { + cerr << "Invalid input! Please enter week number between 1-7." << endl; + return EXIT_FAILURE; } - return 0; + cout << week[weekDay-1] << endl; + return EXIT_SUCCESS; } \ No newline at end of file