Parse unevaluated integral from giac

[Marcelo Forets]

If integrate(..., algorithm='giac') does not find a solution, Sage should return an unevaluated expression.

For example, consider integrate(exp(-x^2)*log(x), x, algorithm='giac').

It returns either

Traceback (most recent call last):
...
NotImplementedError: Unable to parse Giac output: integrate(ln(x)*exp(-x^2),x)

or

integration(e^(-x^2)*ln(x), x)

depending on the user's locale settings (EN and FR respectively).

OTOH, both Maxima and SymPy? return integrate(e^(-x^2)*log(x), x).

[Marcelo Forets]

does it correspond at the level or giac_integrator (see symbolic/integration/external.py)? or at the level of the giac interface? (see def _sage_(self, locals={})).

in the former case, is this correct?

...
if 'integrate' in format(result) or 'integration' in format(result):
    return integrate(expr, v, a, b, hold=True) # ???
else:
    return result._sage_()

---

New commits:

​f3c9d15

add one doctest

[git]

Branch pushed to git repo; I updated commit sha1. New commits:

​2bba41d

parse result in giac_integrator

[Steven Trogdon]

Perhaps this exposes a bug in sympy_integrator. These work

sage: integrate(e^(-x^2)*log(x), x, algorithm='giac')
integrate(e^(-x^2)*log(x), x)
sage: integrate(e^(-x^2)*log(x), x, algorithm='maxima')
integrate(e^(-x^2)*log(x), x)

although algorithm='maxima' was not doctested, but

integrate(e^(-x^2)*log(x), x, algorithm='sympy')

just hangs.

[Marcelo Forets]

here it works only after a looong time:

sage: integrate(e^(-x^2)*log(x), x, algorithm='sympy') # 15-20 minutes, processor intensive
integrate(e^(-x^2)*log(x), x)

[Steven Trogdon]

OK, I was impatient. It took 30+ minutes here.

[Marcelo Forets]

Replying to strogdon:

OK, I was impatient. It took 30+ minutes here.

Thanks for the review!

[Volker Braun]

Merge conflict

[Steven Trogdon]

This really should have depended on #22833 since src/sage/symbolic/integration/external.py was touched there. I though I had that ticket merged when I tested things here, but apparently not, or else I would have noticed the conflict. #22833 is now in 8.0.beta7 and so this will have to be rebased. Just change it back to positive_review when that is done.

[Marcelo Forets]

Replying to strogdon:

This really should have depended on #22833 since src/sage/symbolic/integration/external.py was touched there.

my fault, thanks for pointing it out.

I though I had that ticket merged when I tested things here, but apparently not, or else I would have noticed the conflict. #22833 is now in 8.0.beta7 and so this will have to be rebased.

there's something that i don't understand. i do:

(in t/mforets/22997) $ git rebase develop
(... solve the merge conflict manually ...)
(in t/mforets/22997) $ git add src/sage/symbolic/integration/external.py
(in t/mforets/22997) $ git status
rebase in progress; onto 7a36941
You are currently rebasing branch 't/22997/22997' on '7a36941'.
  (all conflicts fixed: run "git rebase --continue")

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	modified:   src/sage/symbolic/integration/external.py
(in t/mforets/22997) $ git rebase --continue
Applying: parse result in giac_integrator

up to now everything seems to work fine, locally. however i try to push to the remote branch and it breaks:

(in t/mforets/22997) $ git push trac HEAD:u/mforets/22997
To trac.sagemath.org:sage.git
 ! [rejected]        HEAD -> u/mforets/22997 (non-fast-forward)
error: failed to push some refs to 'git@trac.sagemath.org:sage.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

it also breaks if i use the automatic command:

(in t/mforets/22997) $ git trac push
Pushing to Trac #22997...
Guessed remote branch: u/mforets/22997
Traceback (most recent call last):
  File "/usr/local/bin/git-trac", line 18, in <module>
    cmdline.launch()
  File "/Users/forets/sage-src/sage/git-trac-command/git_trac/cmdline.py", line 223, in launch
    app.push(ticket_number, remote=args.remote, force=args.force)
  File "/Users/forets/sage-src/sage/git-trac-command/git_trac/app.py", line 216, in push
    self.repo.push(remote, force)
  File "/Users/forets/sage-src/sage/git-trac-command/git_trac/git_repository.py", line 197, in push
    self.git.echo.push('trac', refspec)
  File "/Users/forets/sage-src/sage/git-trac-command/git_trac/git_interface.py", line 341, in meth
    return self.execute(git_cmd, *args, **kwds)
  File "/Users/forets/sage-src/sage/git-trac-command/git_trac/git_interface.py", line 98, in execute
    popen_stderr=subprocess.PIPE)
  File "/Users/forets/sage-src/sage/git-trac-command/git_trac/git_interface.py", line 263, in _run
    raise GitError(result)
git_trac.git_error.GitError: git returned with non-zero exit code (1) when executing "git push trac HEAD:refs/heads/u/mforets/22997"
    STDERR: To trac.sagemath.org:sage.git
    STDERR:  ! [rejected]        HEAD -> u/mforets/22997 (non-fast-forward)
    STDERR: error: failed to push some refs to 'git@trac.sagemath.org:sage.git'
    STDERR: hint: Updates were rejected because a pushed branch tip is behind its remote
    STDERR: hint: counterpart. Check out this branch and integrate the remote changes
    STDERR: hint: (e.g. 'git pull ...') before pushing again.
    STDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details.

[git]

Branch pushed to git repo; I updated commit sha1. New commits:

​0e5bdf0

Merge branch 'develop' into t/mforets/22997

[Marcelo Forets]

(merged into v.8.0.beta7)

[Frédéric Chapoton]

The doctest is going to fail with the French locale:

sage: from sage.symbolic.integration.external import *
sage:  giac_integrator(e^(-x^2)*log(x), x)
integration(e^(-x^2)*ln(x), x)

[Frédéric Chapoton]

oops, sorry.