Commit a7591dda authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Updates the way last_rho is computed in OhmPiHardware

Showing with 3 additions and 1 deletion
+3 -1
......@@ -206,7 +206,8 @@ class OhmPiHardware:
def last_rho(self):
v = self.readings[:, 2] != 0
if len(v) > 1:
return np.mean(np.abs(self.readings[v, 4] - self.sp) / self.readings[v, 3])
# return np.mean(np.abs(self.readings[v, 4] - self.sp) / self.readings[v, 3])
return np.mean((self.readings[v, 2] * self.readings[v, 4] - self.sp) / self.readings[v, 3])
else:
return np.nan
......
......@@ -459,6 +459,7 @@ class OhmPi(object):
else:
delay = 0.
x = np.where((self._hw.readings[:, 0] >= delay) & (self._hw.readings[:, 2] != 0))
print(f'length of series: {len(x)}')
R = np.mean((self._hw.readings[x, 2] * self._hw.readings[x, 4] - self._hw.sp) / self._hw.readings[x, 3])
R_std = 100. * np.std((self._hw.readings[x, 2] * self._hw.readings[x, 4] - self._hw.sp) / self._hw.readings[x, 3]) / R
d = {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment