From dc5d9b8fcacc510b395c473ea9ec8c5425be44ca Mon Sep 17 00:00:00 2001 From: Phoshoko Thabang Date: Sat, 21 Dec 2024 13:52:12 +0200 Subject: [PATCH 1/4] Renamed the initialised variables and re-arranged them --- 2-variables/piggy-bank/currency.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/2-variables/piggy-bank/currency.cpp b/2-variables/piggy-bank/currency.cpp index 9383f5a..782ad53 100644 --- a/2-variables/piggy-bank/currency.cpp +++ b/2-variables/piggy-bank/currency.cpp @@ -3,11 +3,7 @@ int main() { - double p; - double q; - double c; - - double dollars; + double pesos, reais, soles, dollars; std::cout << "πŸ‡²πŸ‡½ Enter number of Pesos: "; std::cin >> p; From 3a49ef0fda0471fc57e389801f6b9a31f37a9a03 Mon Sep 17 00:00:00 2001 From: Phoshoko Thabang Date: Sat, 21 Dec 2024 13:56:12 +0200 Subject: [PATCH 2/4] Replaced the old variables with the new once --- 2-variables/piggy-bank/currency.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/2-variables/piggy-bank/currency.cpp b/2-variables/piggy-bank/currency.cpp index 782ad53..68c14f2 100644 --- a/2-variables/piggy-bank/currency.cpp +++ b/2-variables/piggy-bank/currency.cpp @@ -6,13 +6,13 @@ int main() double pesos, reais, soles, dollars; std::cout << "πŸ‡²πŸ‡½ Enter number of Pesos: "; - std::cin >> p; + std::cin >> pesos; std::cout << "πŸ‡¬πŸ‡Ή Enter number of Guatemalan Quetzals: "; - std::cin >> q; + std::cin >> reais; std::cout << "πŸ‡ΈπŸ‡» Enter number of Salvadoran Colons: "; - std::cin >> c; + std::cin >> soles; dollars = 0.049 * p + 0.1305 * q + 0.1144 * c; From 7068cd74a85646f87700c034242f75079669010a Mon Sep 17 00:00:00 2001 From: Phoshoko Thabang Date: Sat, 21 Dec 2024 13:57:51 +0200 Subject: [PATCH 3/4] Added the conversion rates from different currencies to the Us Dollar --- 2-variables/piggy-bank/currency.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/2-variables/piggy-bank/currency.cpp b/2-variables/piggy-bank/currency.cpp index 68c14f2..0d825b7 100644 --- a/2-variables/piggy-bank/currency.cpp +++ b/2-variables/piggy-bank/currency.cpp @@ -14,6 +14,12 @@ int main() std::cout << "πŸ‡ΈπŸ‡» Enter number of Salvadoran Colons: "; std::cin >> soles; + /* + 1 Pesos = 0.050 usd + 1 Reais = 0.16 usd + 1 Soles = 0.27 usd + */ + dollars = 0.049 * p + 0.1305 * q + 0.1144 * c; std::cout << "Total USD = $" << dollars << "\n"; From bedcb7825567b4d08c143e1a55c1b8ef2de5052b Mon Sep 17 00:00:00 2001 From: Phoshoko Thabang Date: Sat, 21 Dec 2024 13:59:38 +0200 Subject: [PATCH 4/4] Revised the dollars variable to enable easy future changes or additions --- 2-variables/piggy-bank/currency.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/2-variables/piggy-bank/currency.cpp b/2-variables/piggy-bank/currency.cpp index 0d825b7..4dc5179 100644 --- a/2-variables/piggy-bank/currency.cpp +++ b/2-variables/piggy-bank/currency.cpp @@ -20,7 +20,11 @@ int main() 1 Soles = 0.27 usd */ - dollars = 0.049 * p + 0.1305 * q + 0.1144 * c; + double pesos_to_dollar = 0.050; + double reais_to_dollar = 0.16; + double soles_to_dollar = 0.27; + + dollars = (pesos_to_dollar * pesos) + (reais_to_dollar * reais) + (soles_to_dollar * soles); std::cout << "Total USD = $" << dollars << "\n";