completed

5 files changed, 47 insertions, 20 deletions

diff --git a/CST 126/Homework 1/CurrencyHelper.hpp b/CST 126/Homework 1/CurrencyHelper.hpp
index 0425fc7..5e965ea 100644
--- a/CST 126/Homework 1/CurrencyHelper.hpp
+++ b/CST 126/Homework 1/CurrencyHelper.hpp
@@ -13,6 +13,7 @@ double Rand_ZAR(double& Money);
 
 double CurrencyConversion(double& Money)
 {
+	system("cls");
 	int Selection = 0;
 
 	CurrencyList();
diff --git a/CST 126/Homework 1/GuessingHelper.hpp b/CST 126/Homework 1/GuessingHelper.hpp
index 1d12971..15875ca 100644
--- a/CST 126/Homework 1/GuessingHelper.hpp
+++ b/CST 126/Homework 1/GuessingHelper.hpp
@@ -11,12 +11,13 @@ int RandomNumberGenerator(const int& LowerBound, const int& UpperBound)
 	std::random_device dev;
 	std::mt19937 rng(dev());
 	std::uniform_int_distribution<std::mt19937::result_type> dist(LowerBound, UpperBound);
-
-	return dist(rng);
+	const int Random_Number = dist(rng);
+	return Random_Number;
 }
 
 void GuessingGame()
 {
+	system("cls");
 	int GoldenSnitch = 0;
 	int UserGuess = 0;
 	size_t NumberOfGuesses = 0;
diff --git a/CST 126/Homework 1/MenuHelper.hpp b/CST 126/Homework 1/MenuHelper.hpp
index df2a0e7..c68b85c 100644
--- a/CST 126/Homework 1/MenuHelper.hpp
+++ b/CST 126/Homework 1/MenuHelper.hpp
@@ -28,10 +28,7 @@ void UserMenu()
 			Prompts("Invalid input, try again!");
 		}
 
-
-
 	} while (InputChoice != 4);
-
 }
 
 void MenuOptions()
diff --git a/CST 126/Homework 1/TempLogHelper.hpp b/CST 126/Homework 1/TempLogHelper.hpp
index 18a8d35..3696814 100644
--- a/CST 126/Homework 1/TempLogHelper.hpp
+++ b/CST 126/Homework 1/TempLogHelper.hpp
@@ -7,16 +7,7 @@ struct Temperature {
 	float Low;
 };
 
-struct DaysOfWeek {
-	char First[7] = { "Monday" };
-	char Second[8] = { "Tuesday" };
-	char Third[10] = { "Wednesday" };
-	char Fourth[9] = { "Thursday" };
-	char Fifth[7] = { "Friday" };
-	char Sixth[9] = { "Saturday" };
-	char Seventh[7] = { "Sunday" };
-
-};
+void DayPrinter(int Choice);
 
 float FarenheitToCelsius(float Temp);
 void GreatLow(Temperature* WeekLog);
@@ -25,6 +16,36 @@ void TemperatureAverage(Temperature* WeekLog);
 void TemperatureDifference(Temperature* WeekLog);
 void WeeklyTemp(const char* Prompt1, const char* Prompt2);
 
+void DayPrinter(int Choice)
+{
+	switch (Choice)
+	{
+	case 0:
+		std::cout << "Monday";
+		break;
+	case 1:
+		std::cout << "Tuesday";
+		break;
+	case 2:
+		std::cout << "Wednesday";
+		break;
+	case 3:
+		std::cout << "Thursday";
+		break;
+	case 4:
+		std::cout << "Friday";
+		break;
+	case 5:
+		std::cout << "Saturday";
+		break;
+	case 6:
+		std::cout << "Sunday";
+		break;
+	default:
+		std::cout << "Invalid Input!!" << std::endl;
+	}
+
+}
 
 float FarenheitToCelsius(float Temp)
 {
@@ -38,7 +59,7 @@ float FarenheitToCelsius(float Temp)
 void GreatLow(Temperature* WeekLog)
 {
 	float GreatestLow = 0.0;
-
+	int Choice = 0u;
 	GreatestLow = WeekLog[0].Low;
 
 	for (auto i = 1u; i < 6; i++)
@@ -46,25 +67,30 @@ void GreatLow(Temperature* WeekLog)
 		if (WeekLog[i].Low < GreatestLow)
 		{
 			GreatestLow = WeekLog[i].Low;
+			Choice = i;
 		}
+
 	}
-	std::cout << "Your weekly low was " << GreatestLow << " degrees Farenheit! That is " <<
+	std::cout << "Your weekly low was on "; DayPrinter(Choice);
+	std::cout << " with a temperature of " << GreatestLow << " degrees Farenheit! That is " <<
 		FarenheitToCelsius(GreatestLow) << " degrees Celsius!\n" << std::endl;
 }
 
 void GreatHigh(Temperature* WeekLog)
 {
 	float GreatestHigh = 0.0;
-
+	int Choice = 0u;
 	for (auto i = 0u; i < 7; i++)
 	{
 		if (WeekLog[i].High > GreatestHigh)
 		{
 			GreatestHigh = WeekLog[i].High;
+			Choice = i;
 		}
 	}
 
-	std::cout << "Your weekly high was " << GreatestHigh  << " degrees Farenheit! That is " <<
+	std::cout << "Your weekly high was on "; DayPrinter(Choice);
+	std::cout << " with a temperature of " << GreatestHigh << " degrees Farenheit! That is " <<
 		FarenheitToCelsius(GreatestHigh) << " degrees Celsius!\n" << std::endl;
 }
 
@@ -109,9 +135,12 @@ void TemperatureDifference(Temperature* WeekLog)
 
 void WeeklyTemp(const char* Prompt1, const char* Prompt2)
 {
+	
 	Temperature WeekTemp[7];
 	for (auto i = 0u; i <7; i++)
 	{
+		DayPrinter(i);
+		std::cout << "************************************************************************************************************************" << std::endl;
 		WeekTemp[i].High = InputFloat(Prompt1);
 		WeekTemp[i].Low = InputFloat(Prompt2);
 		system("cls");
diff --git a/CST 126/UnitTest1/UnitTest1.cpp b/CST 126/UnitTest1/UnitTest1.cpp
index 9ee1ea5..0def1be 100644
--- a/CST 126/UnitTest1/UnitTest1.cpp
+++ b/CST 126/UnitTest1/UnitTest1.cpp
@@ -1,6 +1,5 @@
 #include "pch.h"
 #include "CppUnitTest.h"
-
 #include "TempLogHelper.hpp"
 
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;