correct round
parent
0ebe0b799c
commit
4b5e59c755
|
@ -144,7 +144,7 @@ def main(args):
|
|||
cf=open(configfile,"r")
|
||||
log_conf=json.load(cf)
|
||||
cf.close()
|
||||
parameter={"device":socket.gethostname(),"mean_count":5,"ring_length":10,"wait":0.5,"sigma":2}
|
||||
parameter={"device":socket.gethostname(),"mean_count":5,"ring_length":10,"wait":0.5,"sigma":2,"cycle":5}
|
||||
for n in parameter:
|
||||
if n in log_conf:
|
||||
parameter[n]=log_conf[n]
|
||||
|
@ -176,8 +176,8 @@ def main(args):
|
|||
for n in range(5):
|
||||
pm_data=sensor_read()
|
||||
if(pm_data[0]>0):
|
||||
pm25.append(1000*pm_data[0])
|
||||
pm10.append(1000*pm_data[1])
|
||||
pm25.append(pm_data[0])
|
||||
pm10.append(pm_data[1])
|
||||
time.sleep(2)
|
||||
# export_data(round(pm25/pm_count,1),round(pm10/pm_count,1))
|
||||
# sensor_sleep()
|
||||
|
|
|
@ -79,7 +79,7 @@ class meas_data:
|
|||
if self.stat_val_std==0:
|
||||
self.stat_val_std=abs(self.stat_val_mean/100)
|
||||
nmean=numpy.mean(self.mval)
|
||||
nstd=10**round(numpy.log10(numpy.maximum(0.001,numpy.std(self.mval))))
|
||||
nstd=10**(round(numpy.log10(numpy.maximum(0.001,numpy.std(self.mval))))-1)
|
||||
nmean=round(nmean/nstd,0)*nstd
|
||||
self.act_value=int(self.mult*nmean)
|
||||
self.act_std=int(self.mult*numpy.std(self.mval))
|
||||
|
|
Loading…
Reference in New Issue