completed

1 files changed, 27 insertions, 14 deletions

diff --git a/CST 126/Homework 1/TempLogHelper.hpp b/CST 126/Homework 1/TempLogHelper.hpp
index 3696814..37ecddf 100644
--- a/CST 126/Homework 1/TempLogHelper.hpp
+++ b/CST 126/Homework 1/TempLogHelper.hpp
@@ -8,7 +8,8 @@ struct Temperature {
 };
 
 void DayPrinter(int Choice);
-
+void AvgDiffOutStatement(float Temp, const char* Prompt1, const char* Prompt2, const char* Prompt3);
+void HighLowOutStatement(int Choice, float Temp, const char* Prompt1, const char* Prompt2, const char* Prompt3, const char* Prompt4);
 float FarenheitToCelsius(float Temp);
 void GreatLow(Temperature* WeekLog);
 void GreatHigh(Temperature* WeekLog);
@@ -44,7 +45,28 @@ void DayPrinter(int Choice)
 	default:
 		std::cout << "Invalid Input!!" << std::endl;
 	}
+}
 
+void AvgDiffOutStatement(float Temp, const char* Prompt1, const char* Prompt2, const char* Prompt3)
+{
+	Prompts(Prompt1);
+	std::cout << Temp;
+	Prompts(Prompt2);
+	std::cout << FarenheitToCelsius(Temp);
+	Prompts(Prompt3);
+	std::cout << " \n" << std::endl;
+}
+
+void HighLowOutStatement(int Choice, float Temp, const char* Prompt1, const char* Prompt2, const char* Prompt3, const char* Prompt4)
+{
+	Prompts(Prompt1);
+	DayPrinter(Choice);
+	Prompts(Prompt2);
+	std::cout << Temp;
+	Prompts(Prompt3);
+	std::cout << FarenheitToCelsius(Temp);
+	Prompts(Prompt4);
+	std::cout << " \n" << std::endl;
 }
 
 float FarenheitToCelsius(float Temp)
@@ -69,11 +91,8 @@ void GreatLow(Temperature* WeekLog)
 			GreatestLow = WeekLog[i].Low;
 			Choice = i;
 		}
-
 	}
-	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;
+	HighLowOutStatement(Choice, GreatestLow, "Your weekly low was on "," with a temperature of ", " degrees Farenheit! That is ", " degrees Celsius");
 }
 
 void GreatHigh(Temperature* WeekLog)
@@ -88,10 +107,7 @@ void GreatHigh(Temperature* WeekLog)
 			Choice = i;
 		}
 	}
-
-	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;
+	HighLowOutStatement(Choice, GreatestHigh, "Your weekly high was on ", " with a temperature of ", " degrees Farenheit! That is ", " degrees Celsius");
 }
 
 void TemperatureAverage(Temperature* WeekLog)
@@ -105,9 +121,7 @@ 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;
-
+	AvgDiffOutStatement(AverageTemp, "Your weekly average temperature was ", " degrees Farenheit! That is ", " degrees Celsius!");
 }
 
 void TemperatureDifference(Temperature* WeekLog)
@@ -129,8 +143,7 @@ void TemperatureDifference(Temperature* WeekLog)
 			GreatestDifference = HighLowStorage[j];
 		}
 	}
-	std::cout << "The largest temperature differential was " << GreatestDifference << " degrees Farenheit! That is " << 
-		FarenheitToCelsius(GreatestDifference) << " degrees Celsius!\n" << std::endl;
+	AvgDiffOutStatement(GreatestDifference, "The largest temperature differential was ", " degrees Farenheit! That is ", " degrees Celsius!");
 }
 
 void WeeklyTemp(const char* Prompt1, const char* Prompt2)