Skip to content

Commit 9ecfef4

Browse files
author
SymPy (Travis CI)
committed
Update dev doc after building 11935
1 parent a4fbac8 commit 9ecfef4

File tree

9 files changed

+83
-32
lines changed

9 files changed

+83
-32
lines changed

dev/_modules/sympy/parsing/sympy_parser.html

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,13 @@ <h1>Source code for sympy.parsing.sympy_parser</h1><div class="highlight"><pre>
442442
<span class="k">def</span> <span class="nf">_split_symbols</span><span class="p">(</span><span class="n">tokens</span><span class="p">,</span> <span class="n">local_dict</span><span class="p">,</span> <span class="n">global_dict</span><span class="p">):</span>
443443
<span class="n">result</span> <span class="o">=</span> <span class="p">[]</span>
444444
<span class="n">split</span> <span class="o">=</span> <span class="bp">False</span>
445+
<span class="n">split_previous</span><span class="o">=</span><span class="bp">False</span>
445446
<span class="k">for</span> <span class="n">tok</span> <span class="ow">in</span> <span class="n">tokens</span><span class="p">:</span>
447+
<span class="k">if</span> <span class="n">split_previous</span><span class="p">:</span>
448+
<span class="c"># throw out closing parenthesis of Symbol that was split</span>
449+
<span class="n">split_previous</span><span class="o">=</span><span class="bp">False</span>
450+
<span class="k">continue</span>
451+
<span class="n">split_previous</span><span class="o">=</span><span class="bp">False</span>
446452
<span class="k">if</span> <span class="n">tok</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">==</span> <span class="n">NAME</span> <span class="ow">and</span> <span class="n">tok</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="o">==</span> <span class="s">&#39;Symbol&#39;</span><span class="p">:</span>
447453
<span class="n">split</span> <span class="o">=</span> <span class="bp">True</span>
448454
<span class="k">elif</span> <span class="n">split</span> <span class="ow">and</span> <span class="n">tok</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">==</span> <span class="n">NAME</span><span class="p">:</span>
@@ -452,17 +458,18 @@ <h1>Source code for sympy.parsing.sympy_parser</h1><div class="highlight"><pre>
452458
<span class="k">if</span> <span class="n">char</span> <span class="ow">in</span> <span class="n">local_dict</span> <span class="ow">or</span> <span class="n">char</span> <span class="ow">in</span> <span class="n">global_dict</span><span class="p">:</span>
453459
<span class="c"># Get rid of the call to Symbol</span>
454460
<span class="k">del</span> <span class="n">result</span><span class="p">[</span><span class="o">-</span><span class="mi">2</span><span class="p">:]</span>
455-
<span class="n">result</span><span class="o">.</span><span class="n">extend</span><span class="p">([(</span><span class="n">OP</span><span class="p">,</span> <span class="s">&#39;(&#39;</span><span class="p">),</span> <span class="p">(</span><span class="n">NAME</span><span class="p">,</span> <span class="s">&quot;</span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="n">char</span><span class="p">),</span> <span class="p">(</span><span class="n">OP</span><span class="p">,</span> <span class="s">&#39;)&#39;</span><span class="p">),</span>
461+
<span class="n">result</span><span class="o">.</span><span class="n">extend</span><span class="p">([(</span><span class="n">NAME</span><span class="p">,</span> <span class="s">&quot;</span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="n">char</span><span class="p">),</span>
456462
<span class="p">(</span><span class="n">NAME</span><span class="p">,</span> <span class="s">&#39;Symbol&#39;</span><span class="p">),</span> <span class="p">(</span><span class="n">OP</span><span class="p">,</span> <span class="s">&#39;(&#39;</span><span class="p">)])</span>
457463
<span class="k">else</span><span class="p">:</span>
458464
<span class="n">result</span><span class="o">.</span><span class="n">extend</span><span class="p">([(</span><span class="n">NAME</span><span class="p">,</span> <span class="s">&quot;&#39;</span><span class="si">%s</span><span class="s">&#39;&quot;</span> <span class="o">%</span> <span class="n">char</span><span class="p">),</span> <span class="p">(</span><span class="n">OP</span><span class="p">,</span> <span class="s">&#39;)&#39;</span><span class="p">),</span>
459465
<span class="p">(</span><span class="n">NAME</span><span class="p">,</span> <span class="s">&#39;Symbol&#39;</span><span class="p">),</span> <span class="p">(</span><span class="n">OP</span><span class="p">,</span> <span class="s">&#39;(&#39;</span><span class="p">)])</span>
460-
<span class="c"># Delete the last three tokens: get rid of the extraneous</span>
461-
<span class="c"># Symbol( we just added, and also get rid of the last )</span>
462-
<span class="c"># because the closing parenthesis of the original Symbol is</span>
463-
<span class="c"># still there</span>
464-
<span class="k">del</span> <span class="n">result</span><span class="p">[</span><span class="o">-</span><span class="mi">3</span><span class="p">:]</span>
466+
<span class="c"># Delete the last two tokens: get rid of the extraneous</span>
467+
<span class="c"># Symbol( we just added</span>
468+
<span class="c"># Also, set split_previous=True so will skip</span>
469+
<span class="c"># the closing parenthesis of the original Symbol</span>
470+
<span class="k">del</span> <span class="n">result</span><span class="p">[</span><span class="o">-</span><span class="mi">2</span><span class="p">:]</span>
465471
<span class="n">split</span> <span class="o">=</span> <span class="bp">False</span>
472+
<span class="n">split_previous</span> <span class="o">=</span> <span class="bp">True</span>
466473
<span class="k">continue</span>
467474
<span class="k">else</span><span class="p">:</span>
468475
<span class="n">split</span> <span class="o">=</span> <span class="bp">False</span>
@@ -816,6 +823,10 @@ <h1>Source code for sympy.parsing.sympy_parser</h1><div class="highlight"><pre>
816823
<span class="sd"> undefined variables into SymPy symbols, and allow the use of standard</span>
817824
<span class="sd"> mathematical factorial notation (e.g. ``x!``).</span>
818825

826+
<span class="sd"> evaluate : bool, optional</span>
827+
<span class="sd"> When False, the order of the arguments will remain as they were in the</span>
828+
<span class="sd"> string and automatic simplification that would normally occur is</span>
829+
<span class="sd"> suppressed. (see examples)</span>
819830

820831
<span class="sd"> Examples</span>
821832
<span class="sd"> ========</span>
@@ -832,6 +843,23 @@ <h1>Source code for sympy.parsing.sympy_parser</h1><div class="highlight"><pre>
832843
<span class="sd"> &gt;&gt;&gt; parse_expr(&quot;2x&quot;, transformations=transformations)</span>
833844
<span class="sd"> 2*x</span>
834845

846+
<span class="sd"> When evaluate=False, some automatic simplifications will not occur:</span>
847+
848+
<span class="sd"> &gt;&gt;&gt; parse_expr(&quot;2**3&quot;), parse_expr(&quot;2**3&quot;, evaluate=False)</span>
849+
<span class="sd"> (8, 2**3)</span>
850+
851+
<span class="sd"> In addition the order of the arguments will not be made canonical.</span>
852+
<span class="sd"> This feature allows one to tell exactly how the expression was entered:</span>
853+
854+
<span class="sd"> &gt;&gt;&gt; a = parse_expr(&#39;1 + x&#39;, evaluate=False)</span>
855+
<span class="sd"> &gt;&gt;&gt; b = parse_expr(&#39;x + 1&#39;, evaluate=0)</span>
856+
<span class="sd"> &gt;&gt;&gt; a == b</span>
857+
<span class="sd"> False</span>
858+
<span class="sd"> &gt;&gt;&gt; a.args</span>
859+
<span class="sd"> (1, x)</span>
860+
<span class="sd"> &gt;&gt;&gt; b.args</span>
861+
<span class="sd"> (x, 1)</span>
862+
835863
<span class="sd"> See Also</span>
836864
<span class="sd"> ========</span>
837865

dev/modules/core.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6993,7 +6993,7 @@ <h3>Dict<a class="headerlink" href="#dict" title="Permalink to this headline">¶
69936993
<h3>iterable<a class="headerlink" href="#iterable" title="Permalink to this headline">¶</a></h3>
69946994
<dl class="function">
69956995
<dt id="sympy.core.compatibility.iterable">
6996-
<tt class="descclassname">sympy.core.compatibility.</tt><tt class="descname">iterable</tt><big>(</big><em>i</em>, <em>exclude=((&lt;type 'str'&gt;</em>, <em>&lt;type 'unicode'&gt;)</em>, <em>&lt;type 'dict'&gt;</em>, <em>&lt;class sympy.core.compatibility.NotIterable at 0x2b8bb30&gt;)</em><big>)</big><a class="reference internal" href="../_modules/sympy/core/compatibility.html#iterable"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#sympy.core.compatibility.iterable" title="Permalink to this definition">¶</a></dt>
6996+
<tt class="descclassname">sympy.core.compatibility.</tt><tt class="descname">iterable</tt><big>(</big><em>i</em>, <em>exclude=((&lt;type 'str'&gt;</em>, <em>&lt;type 'unicode'&gt;)</em>, <em>&lt;type 'dict'&gt;</em>, <em>&lt;class sympy.core.compatibility.NotIterable at 0x2a89b30&gt;)</em><big>)</big><a class="reference internal" href="../_modules/sympy/core/compatibility.html#iterable"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#sympy.core.compatibility.iterable" title="Permalink to this definition">¶</a></dt>
69976997
<dd><p>Return a boolean indicating whether <tt class="docutils literal"><span class="pre">i</span></tt> is SymPy iterable.
69986998
True also indicates that the iterator is finite, i.e. you e.g.
69996999
call list(...) on the instance.</p>

dev/modules/matrices/dense.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ <h2>Matrix Class Reference<a class="headerlink" href="#matrix-class-reference" t
305305

306306
<dl class="method">
307307
<dt id="sympy.matrices.dense.MutableDenseMatrix.simplify">
308-
<tt class="descname">simplify</tt><big>(</big><em>ratio=1.7</em>, <em>measure=&lt;function count_ops at 0x331bd70&gt;</em><big>)</big><a class="reference internal" href="../../_modules/sympy/matrices/dense.html#MutableDenseMatrix.simplify"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#sympy.matrices.dense.MutableDenseMatrix.simplify" title="Permalink to this definition"></a></dt>
308+
<tt class="descname">simplify</tt><big>(</big><em>ratio=1.7</em>, <em>measure=&lt;function count_ops at 0x3219d70&gt;</em><big>)</big><a class="reference internal" href="../../_modules/sympy/matrices/dense.html#MutableDenseMatrix.simplify"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#sympy.matrices.dense.MutableDenseMatrix.simplify" title="Permalink to this definition"></a></dt>
309309
<dd><p>Applies simplify to the elements of a matrix in place.</p>
310310
<p>This is a shortcut for M.applyfunc(lambda x: simplify(x, ratio, measure))</p>
311311
<div class="admonition-see-also admonition seealso">

0 commit comments

Comments
 (0)