simple changes

1 files changed, 18 insertions, 2 deletions

diff --git a/BlankConsoleLab/cst116-lab2-wilson.cpp b/BlankConsoleLab/cst116-lab2-wilson.cpp
index a8e2729..9b61ba9 100644
--- a/BlankConsoleLab/cst116-lab2-wilson.cpp
+++ b/BlankConsoleLab/cst116-lab2-wilson.cpp
@@ -29,7 +29,7 @@ float CtoF(float Fahrenheit, float Celsius) { //float function so that it return
 }
 
 
-void WindSpeedFinder(int* windspeed) { //Float function to return float value
+float WindSpeedFinder(float* windspeed) { //Float function to return float value
 
 Loop2:
 
@@ -38,6 +38,7 @@ Loop2:
 
     if (*windspeed <= 231 && *windspeed >= 0) {
         cout << "\n\tThe windspeed is " << *windspeed << " mph." << endl;
+        return *windspeed;
     }
     else {
         goto Loop2; //Goes back to placeholder to Loop in case of invalid response (past limits)
@@ -46,11 +47,23 @@ Loop2:
 }
 
 
+float WindChill(float Fahrenheit, float* windspeed) {
+
+    float Chill = 0.0;
+
+    Chill = 35.74 + 0.6215 * Fahrenheit - 35.75 * pow(*windspeed, 0.16) + 0.4275 * Fahrenheit * pow(*windspeed, 0.16);
+   
+    return Chill;
+
+}
+
+
 int main()
 {
     float Celsius = 0.0; //Defines Celsius for the conversion function
     float Fahrenheit = 0.0; //Defines Fahrenheit for the conversion function
-    int windspeed = 0;
+    float windspeed = 0.0; //Defines windspeed
+
 
     Loop: //Placeholder to loop back to
 
@@ -67,5 +80,8 @@ int main()
 
     WindSpeedFinder(&windspeed);
 
+
+    cout << "\n\tThe windchill is: " << WindChill(Fahrenheit, &windspeed) << endl;
+
 }