Issue #2850 solved. Integration doesn't halt now. #2976

Merged
merged 5 commits into from Mar 10, 2014

Conversation

Projects
None yet
4 participants
@rajat974
Contributor

rajat974 commented Feb 28, 2014

In issue #2850 it was mentioned that integrate(asin(x)*log(x), x) does not give any answer. It just give Integral(log(x)*asin(x), x) which is probably wrong. The reason was asin and acos was not implemented in manualintegrate.py. It is now done.

sympy/integrals/tests/test_manual.py
@@ -149,3 +149,11 @@ def test_issue_3647():
with assuming(Q.negative(a)):
assert manualintegrate(1 / (a + b*x**2), x) == \
Integral(1/(a + b*x**2), x)
+
+def test_issue_2850():

This comment has been minimized.

@skirpichev

skirpichev Feb 28, 2014

Contributor

Please change to something like test_gh_issue_2850. We have issues on the google code too.

@skirpichev

skirpichev Feb 28, 2014

Contributor

Please change to something like test_gh_issue_2850. We have issues on the google code too.

This comment has been minimized.

@rajat974

rajat974 Feb 28, 2014

Contributor

Done !

@rajat974

rajat974 Feb 28, 2014

Contributor

Done !

@rajat974

This comment has been minimized.

Show comment
Hide comment
@rajat974

rajat974 Feb 28, 2014

Contributor

Its weird that earlier it passed the Travis build but now its giving error due to slow tests.
@skirpichev should it be spilt ?

Contributor

rajat974 commented Feb 28, 2014

Its weird that earlier it passed the Travis build but now its giving error due to slow tests.
@skirpichev should it be spilt ?

@asmeurer

This comment has been minimized.

Show comment
Hide comment
Member

asmeurer commented Feb 28, 2014

@rajat974

This comment has been minimized.

Show comment
Hide comment
@rajat974

rajat974 Feb 28, 2014

Contributor

@asmeurer how to solve travis issue?

Contributor

rajat974 commented Feb 28, 2014

@asmeurer how to solve travis issue?

@lidavidm

This comment has been minimized.

Show comment
Hide comment
@lidavidm

lidavidm Feb 28, 2014

Member

This looks fine. I'm not sure why Travis is timing out though.

Member

lidavidm commented Feb 28, 2014

This looks fine. I'm not sure why Travis is timing out though.

sympy/integrals/manualintegrate.py
pull_out_polys, pull_out_u(sympy.sin, sympy.cos),
pull_out_u(sympy.exp)]
dummy = sympy.Dummy("temporary")
# we can integrate log(x) and atan(x) by setting dv = 1
- if isinstance(integrand, sympy.log) or isinstance(integrand, sympy.atan):
+ if isinstance(integrand, sympy.log) or isinstance(integrand, sympy.atan) or isinstance(integrand, sympy.asin) or isinstance(integrand, sympy.acos):

This comment has been minimized.

@lidavidm

lidavidm Feb 28, 2014

Member

Perhaps for clarity isinstance(integrand, (sympy.log, sympy.asin, sympy.acos, sympy.atan)) would be best.

@lidavidm

lidavidm Feb 28, 2014

Member

Perhaps for clarity isinstance(integrand, (sympy.log, sympy.asin, sympy.acos, sympy.atan)) would be best.

This comment has been minimized.

@rajat974

rajat974 Feb 28, 2014

Contributor

ya sure !

@rajat974

rajat974 Feb 28, 2014

Contributor

ya sure !

@rajat974

This comment has been minimized.

Show comment
Hide comment
@rajat974

rajat974 Mar 1, 2014

Contributor

@lidavidm Can it be merge now ?

Contributor

rajat974 commented Mar 1, 2014

@lidavidm Can it be merge now ?

@rajat974

This comment has been minimized.

Show comment
Hide comment
@rajat974

rajat974 Mar 3, 2014

Contributor

@asmeurer Is there any change i have to do to get it merge??

Contributor

rajat974 commented Mar 3, 2014

@asmeurer Is there any change i have to do to get it merge??

@rajat974

This comment has been minimized.

Show comment
Hide comment
@rajat974

rajat974 Mar 9, 2014

Contributor

@asmeurer please review this and guide me , so that i can get it merged.

Contributor

rajat974 commented Mar 9, 2014

@asmeurer please review this and guide me , so that i can get it merged.

asmeurer added a commit that referenced this pull request Mar 10, 2014

Merge pull request #2976 from rajat974/2850_seq
Issue #2850 solved. Integration doesn't halt now.

@asmeurer asmeurer merged commit e0034ed into sympy:master Mar 10, 2014

1 check passed

default The Travis CI build passed
Details
@asmeurer

This comment has been minimized.

Show comment
Hide comment
@asmeurer

asmeurer Mar 10, 2014

Member

How should I spell your name for the AUTHORS file?

Member

asmeurer commented Mar 10, 2014

How should I spell your name for the AUTHORS file?

@rajat974

This comment has been minimized.

Show comment
Hide comment
@rajat974

rajat974 Mar 10, 2014

Contributor

Rajat Aggarwal , rajataggarwal1975@gmail.com

Contributor

rajat974 commented Mar 10, 2014

Rajat Aggarwal , rajataggarwal1975@gmail.com

@asmeurer

This comment has been minimized.

Show comment
Hide comment
@asmeurer

asmeurer Mar 15, 2014

Member

Thanks, I fixed it.

Member

asmeurer commented Mar 15, 2014

Thanks, I fixed it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment