templog virtuallycomplete

3 files changed, 58 insertions, 16 deletions

diff --git a/CST 126/Homework 1/MenuHelper.hpp b/CST 126/Homework 1/MenuHelper.hpp
index b850c4b..df2a0e7 100644
--- a/CST 126/Homework 1/MenuHelper.hpp
+++ b/CST 126/Homework 1/MenuHelper.hpp
@@ -1,6 +1,6 @@
 #ifndef MENU_HELPER_HPP
 #define MENU_HELPER_HPP
-#include "GuessingHelper.hpp"
+#include "TempLogHelper.hpp"
 
 void UserMenu();
 void MenuOptions();
@@ -19,7 +19,7 @@ void UserMenu()
 			break;
 		case 2: GuessingGame();
 			break;
-		case 3:
+		case 3: WeeklyTemp("What was the highest temperature reached?", "What was the lowest temperature?");
 			break;
 		case 4:
 			Prompts("Have a wonderful day!!!");
diff --git a/CST 126/Homework 1/TempLogHelper.hpp b/CST 126/Homework 1/TempLogHelper.hpp
index 3e53dea..87b0f04 100644
--- a/CST 126/Homework 1/TempLogHelper.hpp
+++ b/CST 126/Homework 1/TempLogHelper.hpp
@@ -1,15 +1,48 @@
 #ifndef TEMP_LOG_HELPER_HPP
 #define TEMP_LOG_HELPER_HPP
-#include "MenuHelper.hpp"
 
+#include "GuessingHelper.hpp"
 struct Temperature {
 	float High;
 	float Low;
 };
 
-inline void GreatHighGreatLow(Temperature* WeekLog)
+float FarenheitToCelsius(float Temp);
+void GreatLow(Temperature* WeekLog);
+void GreatHigh(Temperature* WeekLog);
+void TemperatureAverage(Temperature* WeekLog);
+void TemperatureDifference(Temperature* WeekLog);
+void WeeklyTemp(const char* Prompt1, const char* Prompt2);
+
+
+float FarenheitToCelsius(float Temp)
+{
+	float Celsius = 0.0;
+
+	Celsius = (Temp - 32) * 5 / 9;
+
+	return Celsius;
+}
+
+void GreatLow(Temperature* WeekLog)
 {
 	float GreatestLow = 0.0;
+
+	GreatestLow = WeekLog[0].Low;
+
+	for (auto i = 1u; i < 6; i++)
+	{
+		if (WeekLog[i].Low < GreatestLow)
+		{
+			GreatestLow = WeekLog[i].Low;
+		}
+	}
+	std::cout << "Your weekly low was " << GreatestLow << " degrees Farenheit! That is " <<
+		FarenheitToCelsius(GreatestLow) << " degrees Celsius!\n" << std::endl;
+}
+
+void GreatHigh(Temperature* WeekLog)
+{
 	float GreatestHigh = 0.0;
 
 	for (auto i = 0u; i < 7; i++)
@@ -19,10 +52,12 @@ inline void GreatHighGreatLow(Temperature* WeekLog)
 			GreatestHigh = WeekLog[i].High;
 		}
 	}
-	std::cout << "Your weekly high was " << GreatestHigh << std::endl;
+
+	std::cout << "Your weekly high was " << GreatestHigh  << " degrees Farenheit! That is " <<
+		FarenheitToCelsius(GreatestHigh) << " degrees Celsius!\n" << std::endl;
 }
 
-inline void TemperatureAverage(Temperature* WeekLog)
+void TemperatureAverage(Temperature* WeekLog)
 {
 	float AverageTemp = 0.0;
 	float Sum = 0.0;
@@ -33,11 +68,14 @@ inline void TemperatureAverage(Temperature* WeekLog)
 	}
 	AverageTemp = Sum / 14;
 
+	std::cout << "Your weekly average temperature was " << AverageTemp << " degrees Farenheit! That is " <<
+		FarenheitToCelsius(AverageTemp) << " degrees Celsius!\n" << std::endl;
+
 }
-inline void TemperatureDifference(Temperature* WeekLog)
+
+void TemperatureDifference(Temperature* WeekLog)
 {
 	float HighLowDifference = 0.0;
-
 	float HighLowStorage[7]{};
 
 	for (auto i = 0u; i < 7; i++)
@@ -54,10 +92,11 @@ inline void TemperatureDifference(Temperature* WeekLog)
 			GreatestDifference = HighLowStorage[j];
 		}
 	}
-	std::cout << "The largest temperature differential was " << GreatestDifference << " degrees Farenheit!" << std::endl;
+	std::cout << "The largest temperature differential was " << GreatestDifference << " degrees Farenheit! That is " << 
+		FarenheitToCelsius(GreatestDifference) << " degrees Celsius!\n" << std::endl;
 }
 
-inline Temperature* TempInput(const char* Prompt1, const char* Prompt2)
+void WeeklyTemp(const char* Prompt1, const char* Prompt2)
 {
 	Temperature WeekTemp[7];
 	for (auto i = 0u; i <7; i++)
@@ -66,12 +105,16 @@ inline Temperature* TempInput(const char* Prompt1, const char* Prompt2)
 		WeekTemp[i].Low = InputFloat(Prompt2);
 		system("cls");
 	}
-	GreatHighGreatLow(WeekTemp);
-	return WeekTemp;
+	TemperatureDifference(WeekTemp);
+	TemperatureAverage(WeekTemp);
+	GreatHigh(WeekTemp);
+	GreatLow(WeekTemp);
 }
 
 
 
 
 
+
+
 #endif
\ No newline at end of file
diff --git a/CST 126/Homework 1/main.cpp b/CST 126/Homework 1/main.cpp
index 7a400ca..8946c16 100644
--- a/CST 126/Homework 1/main.cpp
+++ b/CST 126/Homework 1/main.cpp
@@ -5,13 +5,12 @@
 
 //clear the screen after each menu choice&& change text color??
 
-#include "TempLogHelper.hpp"
+#include "MenuHelper.hpp"
 
 int main() 
 {
 
-	//UserMenu();
-	TempInput("What was the high?", "What was the low?");
-	//TemperatureArithmetic(TempInput("What was the high?", "What was the low?"));
+	UserMenu();
+
 	return 0;
 }
\ No newline at end of file