The Technology Partnership / Heater_V2

Heater for threaded program

Dependents:   LEX_Threaded_Programming_V3

Diff: Heater.cpp

Revision:
47:06a9691d0a7b
Parent:
46:47c394467c66
Child:
48:cd2a9b799e89
diff -r 47c394467c66 -r 06a9691d0a7b Heater.cpp
--- a/Heater.cpp	Mon Nov 18 13:48:31 2019 +0000
+++ b/Heater.cpp	Mon Nov 18 17:50:03 2019 +0000
@@ -118,15 +118,15 @@
 float Heater::Get_R_avg()
 {
     R_avg = R_acc / (float) n_acc;
-    R_var = (R2_acc*R2_acc - R_avg*R_avg) / n_acc;
-    R_acc = 0;
-    R2_acc = 0;
-    n_acc = 0;
     return R_avg;
 }
 
 float Heater::Get_R_var() // need to call Get_R_avg to calculate R_var before calling this function
 {
+    R_var = R2_acc / (float) n_acc - R_avg * R_avg;
+    R_acc = 0;
+    R2_acc = 0;
+    n_acc = 0;
     return R_var;
 }