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

[change] moved recursive function for broadcasting pdf in a new shape into the class' body

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2016-03-09 06:19:41 +01:00
parent c651b5ca78
commit 2de79eac77
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,14 +10,6 @@ from pylot.core.util.version import get_git_version as _getVersionString
__version__ = _getVersionString() __version__ = _getVersionString()
__author__ = 'sebastianw' __author__ = 'sebastianw'
def broadcast(pdf, si, ei, data):
try:
pdf[si:ei] = data
except ValueError as e:
warnings.warn(str(e), Warning)
return broadcast(pdf, si, ei, data[:-1])
return pdf
def create_axis(x0, incr, npts): def create_axis(x0, incr, npts):
ax = np.zeros(npts) ax = np.zeros(npts)
for i in range(npts): for i in range(npts):
@ -224,6 +216,14 @@ class ProbabilityDensityFunction(object):
# return the object # return the object
return ProbabilityDensityFunction(x0, incr, npts, pdf) return ProbabilityDensityFunction(x0, incr, npts, pdf)
def broadcast(self, pdf, si, ei, data):
try:
pdf[si:ei] = data
except ValueError as e:
warnings.warn(str(e), Warning)
return self.broadcast(pdf, si, ei, data[:-1])
return pdf
def expectation(self): def expectation(self):
''' '''
returns the expectation value of the actual pdf object returns the expectation value of the actual pdf object
@ -355,8 +355,7 @@ class ProbabilityDensityFunction(object):
ostart = find_nearest(x, other.x0) ostart = find_nearest(x, other.x0)
o_end = ostart + other.data.size o_end = ostart + other.data.size
broadcast(pdf_self, sstart, s_end, self.data) pdf_self = self.broadcast(pdf_self, sstart, s_end, self.data)
broadcast(pdf_other, ostart, o_end, other.data) pdf_other = self.broadcast(pdf_other, ostart, o_end, other.data)
return x0, incr, npts, pdf_self, pdf_other return x0, incr, npts, pdf_self, pdf_other