[WIP] Removed ProductDiscretePSpace and ProductContinuousPSpace
#14777
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added classes `ProductDiscretePSpace`, `ProductDiscreteDomain` and `DiscreteDistributionHandmade` to allow expressions containing multiple random variables.
Replaced `DiracDelta` with `KroneckerDelta` functions for calculating probabilities with multiple discrete random variables. Added flag to probability to return unevaluated object. Added tests.
Modified test in test_discrete_rv.py to assert equality by comparing strings and made minor modification to drv.py
…probability_space
Added and removed some import statements in drv.py
Removed `compute_density` from the two classes and added a method to `ProductPSpace` to calculate the density of any given combination of continuous and/or discrete random variables.
Removed tests for `ProductDiscretePSpace` and `ProductContinuousPSpace` from core/tests/test_args.py, and added `conditional_space` method to `ProductPSpace`
jksuom
reviewed
Jun 9, 2018
sympy/stats/rv.py
Outdated
| if any(pspace(rv).is_Continuous for rv in rvs): | ||
| expr = self.integrate(DiracDelta(expr - z), | ||
| **kwargs) | ||
| elif any(pspace(rv).is_Discrete for rv in rvs): |
Upabjojr
reviewed
Jun 9, 2018
sympy/core/tests/test_args.py
Outdated
| @@ -761,7 +760,6 @@ def test_sympy__stats__crv__ConditionalContinuousDomain(): | |||
| D = SingleContinuousDomain(x, Interval(-oo, oo)) | |||
| assert _test_args(ConditionalContinuousDomain(D, x > 0)) | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
we usually leave 2 newlines on the base scope
|
What about mixed discrete and continuous product spaces? |
|
If the expression contains both discrete and continuous random variables, the product space is taken to be continuous, with a discrete component. The density is then calculated using |
|
OK, can you add a test for the mixed case? |
Upabjojr
reviewed
Jun 11, 2018
| from sympy import symbols | ||
| n = symbols('n') | ||
| oo = S.Infinity | ||
| assert str(P(X1 + X2 < 3, evaluate=False) == Sum(Piecewise((2**(X2 - n - 2)*(2/3)**(X2 - 1)/6, |
There was a problem hiding this comment.
this assert usage is wrong, you are evaluating a string.
There was a problem hiding this comment.
I would suggest str(P( ... )) == """ string expression """
There was a problem hiding this comment.
Thanks! I was struggling with this.
Corrected tests is test_discrete_rv.py and added tests to test_mix.py
Upabjojr
reviewed
Jun 11, 2018
| assert P(Eq(Y + E, 1)) == 0 | ||
| assert P(Ne(Y + E, 2)) == 1 | ||
| assert str(P(E + Y < 2, evaluate=False)) == """Integral(Sum(exp(-1)*Integral"""\ | ||
| +"""(exp(-E)*DiracDelta(-_z + E + Y - 2), (E, 0, oo))/factorial(Y), (Y, 0, oo)), (_z, -oo, 0))""" |
There was a problem hiding this comment.
I believe this integral diverges to infinity.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
References to other Issues or PR
Brief description of what is fixed or changed
Removed classes
ProductDiscretePSpaceandProductContinuousPSpaceand moved the methods toProductPSpace. No new tests have been added, as tests already present check for the functionality of these classes.Other comments
closes #14730