Skip to content

Commit

Permalink
Cleanup of comments 2
Browse files Browse the repository at this point in the history
  • Loading branch information
jonas-eschle committed Feb 14, 2019
1 parent 27601f5 commit 7fe3b0d
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions zfit/models/functor.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,20 +291,20 @@ def _analytic_integrate(self, limits, norm_range): # TODO: deal with norm_range
integral = tf.reduce_sum(integral)
return integral

@supports()
def _partial_analytic_integrate(self, x, limits, norm_range):
pdfs = self.pdfs
frac = self.fracs
try:
partial_integral = [pdf.analytic_integrate(limits=limits, norm_range=norm_range) for pdf in pdfs]
except NotImplementedError as original_error:
raise NotImplementedError("partial_analytic_integrate of pdf {name} is not implemented in this"
" SumPDF, as at least one sub-pdf does not implement it."
"Original message:\n{error}".format(name=self.name,
error=original_error))
partial_integral = tf.stack([partial_integral * s for pdf, s in zip(partial_integral, frac)])
partial_integral = tf.reduce_sum(partial_integral, axis=0)
return partial_integral
# @supports()
# def _partial_analytic_integrate(self, x, limits, norm_range):
# pdfs = self.pdfs
# frac = self.fracs
# try:
# partial_integral = [pdf.analytic_integrate(limits=limits, norm_range=norm_range) for pdf in pdfs]
# except NotImplementedError as original_error:
# raise NotImplementedError("partial_analytic_integrate of pdf {name} is not implemented in this"
# " SumPDF, as at least one sub-pdf does not implement it."
# "Original message:\n{error}".format(name=self.name,
# error=original_error))
# partial_integral = tf.stack([partial_integral * s for pdf, s in zip(partial_integral, frac)])
# partial_integral = tf.reduce_sum(partial_integral, axis=0)
# return partial_integral


class ProductPDF(BaseFunctor): # TODO: unfinished
Expand Down

0 comments on commit 7fe3b0d

Please sign in to comment.