Ticket #11948: trac_11948-reviewer.patch

File trac_11948-reviewer.patch, 2.6 KB (added by kcrisman, 7 years ago)

Apply after main patch

  • sage/functions/other.py

    # HG changeset patch
    # User Karl-Dieter Crisman <kcrisman@gmail.com>
    # Date 1324003722 18000
    # Node ID e90f29ec1a460c6bc2560f13ae9e0144d2a6b4e9
    # Parent  9df9a2ffbdf0d8474a5e25e712471e6c4b973b14
    #11948 - reviewer patch redoing a bit of documentation
    
    diff --git a/sage/functions/other.py b/sage/functions/other.py
    a b  
    3535
    3636        Sage implements the error function via the ``erfc()`` function in PARI.
    3737
    38         EXAMPLES::
     38        EXAMPLES:
     39
     40        We can evaluate the error function at varying precisions::
    3941
    4042            sage: erf(2)
    4143            erf(2)
    4244            sage: erf(2).n()
    4345            0.995322265018953
     46            sage: erf(2).n(200)
     47            0.99532226501895273416206925636725292861089179704006007673835
     48
     49        Complex values can be evaluated as well::
     50
     51            sage: erf(3*I).n()
     52            1.00000000000000 + 1629.86732385786*I
     53
     54        TESTS:
     55
     56        Test pickling::
     57
    4458            sage: loads(dumps(erf))
    4559            erf
    4660
    47         TESTS:
    48 
    4961        Check if conversion from maxima elements work::
    5062
    5163            sage: merf = maxima(erf(x)).sage().operator()
  • sage/symbolic/expression.pyx

    diff --git a/sage/symbolic/expression.pyx b/sage/symbolic/expression.pyx
    a b  
    75477547        -  ``multiplicities`` - bool (default: False); if True,
    75487548           return corresponding multiplicities.  This keyword is
    75497549           incompatible with ``to_poly_solve=True`` and does not make
    7550            any sense when solving inequality.
     7550           any sense when solving an inequality.
    75517551       
    75527552        -  ``solution_dict`` - bool (default: False); if True or non-zero,
    75537553           return a list of dictionaries containing solutions. Not used
    7554            when solving inequality.
     7554           when solving an inequality.
    75557555
    75567556        -  ``explicit_solutions`` - bool (default: False); require that
    75577557           all roots be explicit rather than implicit. Not used
    7558            when solving inequality.
     7558           when solving an inequality.
    75597559       
    75607560        -  ``to_poly_solve`` - bool (default: False) or string; use
    75617561           Maxima's ``to_poly_solver`` package to search for more possible
    75627562           solutions, but possibly encounter approximate solutions.
    75637563           This keyword is incompatible with ``multiplicities=True``
    7564            and is not used when solving inequality. Setting ``to_poly_solve``
     7564           and is not used when solving an inequality. Setting ``to_poly_solve``
    75657565           to 'force' (string) omits Maxima's solve command (usefull when
    75667566           some solution of trigonometric equations are lost).
    75677567