Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/sage/calculus/calculus.py
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@
0.6321205588285577
sage: result = integral(exp(-300.0/(-0.064*x+14.0)),x,0.0,120.0)
...
sage: result
sage: result # abs tol 1e-10
4.62770039817000e-9

To check that :issue:`27092` is fixed::
Expand Down
4 changes: 2 additions & 2 deletions src/sage/functions/piecewise.py
Original file line number Diff line number Diff line change
Expand Up @@ -828,9 +828,9 @@ def integral(self, parameters, variable, x=None, a=None, b=None, definite=False,
Check that the algorithm keyword can be used::

sage: ex = piecewise([([0, 1], 1), ((1, oo), 1/x**2)])
sage: integral(ex, x, 0, 100, algorithm='giac')
sage: integral(ex, x, 0, 100, algorithm='sympy')
199/100
sage: integral(ex, x, algorithm='giac')
sage: integral(ex, x, algorithm='sympy')
piecewise(x|-->x on [0, 1], x|-->-1/x + 2 on (1, +oo); x)
"""
if a is not None and b is not None:
Expand Down
7 changes: 4 additions & 3 deletions src/sage/symbolic/integration/integral.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,13 @@ def __init__(self):
sage: (f*f).integrate(x, algorithm='mathematica_free') # optional -- internet
-b*log(e^(a/b) + e^(x/b)) + x + b/(e^(-(a - x)/b) + 1)

Check for :issue:`25119`::
After :issue:`25119` we can integrate the following function,
although giac and sympy give different-looking answers::

sage: result = integrate(sqrt(x^2)/x,x)
...
sage: result
x*sgn(x)
sage: result in [x*sgn(x), sqrt(x^2)]
True
"""
# The automatic evaluation routine will try these integrators
# in the given order. This is an attribute of the class instead of
Expand Down
Loading