marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

[bugfix] due to changes in the usage of ProbabiltyDensityFunction.data expectation and standard deviation were wrongly calculated

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2016-07-12 16:19:27 +02:00
parent 39184ef150
commit 8cef8ff2db
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pylot/core/util/pdf.py
View File

@ -187,7 +187,7 @@ class ProbabilityDensityFunction(object):
func, params = fit_curve(axis, pdf)
return ProbabilityDensityFunction(x0, incr, npts, branches['gauss'], mu,
return ProbabilityDensityFunction(x0, incr, npts, func, mu,
params, eta)
def __nonzero__(self):
@ -303,16 +303,15 @@ class ProbabilityDensityFunction(object):
'''
rval = 0
axis = self.axis - self.x0
for n, x in enumerate(axis):
rval += x * self.data(n)
return rval * self.incr + self.x0
for x in self.axis:
rval += x * self.data(x)
return rval * self.incr
def standard_deviation(self):
mu = self.mu
rval = 0
for n, x in enumerate(self.axis):
rval += (x - mu) ** 2 * self.data(n)
for x in self.axis:
rval += (x - mu) ** 2 * self.data(x)
return rval * self.incr
def prob_lt_val(self, value):