Skip to content

Commit 0acb7c0

Browse files
author
Matthias Koeppe
committed
Use more block tags
1 parent ba9d246 commit 0acb7c0

24 files changed

+245
-206
lines changed

‎src/sage/misc/cachefunc.pyx

Lines changed: 81 additions & 70 deletions
Large diffs are not rendered by default.

‎src/sage/misc/converting_dict.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
This is used e.g. in the result of a variety, to allow access to the
2727
result no matter how a generator is identified::
2828
29+
sage: # needs sage.rings.number_field
2930
sage: K.<x,y> = QQ[]
3031
sage: I = ideal([x^2 + 2*y - 5, x + y + 3])
31-
sage: V = sorted(I.variety(AA), key=str) # needs sage.rings.number_field
32-
sage: v = V[0] # needs sage.rings.number_field
33-
sage: v['x'], v['y'] # needs sage.rings.number_field
32+
sage: V = sorted(I.variety(AA), key=str)
33+
sage: v = V[0]
34+
sage: v['x'], v['y']
3435
(-2.464101615137755?, -0.535898384862246?)
35-
sage: list(v)[0].parent() # needs sage.rings.number_field
36+
sage: list(v)[0].parent()
3637
Multivariate Polynomial Ring in x, y over Algebraic Real Field
3738
"""
3839
# ****************************************************************************

‎src/sage/misc/decorators.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,15 @@ class infix_operator():
199199
200200
An infix element-wise addition operator::
201201
202+
sage: # needs sage.modules
202203
sage: @infix_operator('add')
203204
....: def eadd(a, b):
204205
....: return a.parent([i + j for i, j in zip(a, b)])
205-
sage: u = vector([1, 2, 3]) # needs sage.modules
206-
sage: v = vector([5, 4, 3]) # needs sage.modules
207-
sage: u +eadd+ v # needs sage.modules
206+
sage: u = vector([1, 2, 3])
207+
sage: v = vector([5, 4, 3])
208+
sage: u +eadd+ v
208209
(6, 6, 6)
209-
sage: 2*u +eadd+ v # needs sage.modules
210+
sage: 2*u +eadd+ v
210211
(7, 8, 9)
211212
212213
A hack to simulate a postfix operator::

‎src/sage/misc/dev_tools.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,13 @@ def find_objects_from_name(name, module_name=None):
222222
sage: dt.find_objects_from_name('FareySymbol') # needs sage.modular
223223
[<class 'sage.modular.arithgroup.farey_symbol.Farey'>]
224224
225-
sage: import sympy # needs sympy
226-
sage: dt.find_objects_from_name('RR') # needs sympy
225+
sage: # needs sympy
226+
sage: import sympy
227+
sage: dt.find_objects_from_name('RR')
227228
[Real Field with 53 bits of precision, RR]
228-
sage: dt.find_objects_from_name('RR', 'sage') # needs sympy
229+
sage: dt.find_objects_from_name('RR', 'sage')
229230
[Real Field with 53 bits of precision]
230-
sage: dt.find_objects_from_name('RR', 'sympy') # needs sympy
231+
sage: dt.find_objects_from_name('RR', 'sympy')
231232
[RR]
232233
233234
Examples that do not belong to the global namespace but in a loaded module::

‎src/sage/misc/element_with_label.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ class ElementWithLabel():
3333
sage: print(P.plot(element_labels=labs)) # needs sage.plot
3434
Graphics object consisting of 6 graphics primitives
3535
36-
sage: # needs sage.combinat sage.modules
36+
sage: # needs sage.combinat sage.graphs sage.modules
3737
sage: from sage.misc.element_with_label import ElementWithLabel
3838
sage: W = WeylGroup("A1")
39-
sage: P = W.bruhat_poset(facade=True) # needs sage.graphs
40-
sage: D = W.domain() # needs sage.graphs
41-
sage: v = D.rho() - D.fundamental_weight(1) # needs sage.graphs
42-
sage: nP = P.relabel(lambda w: ElementWithLabel(w, w.action(v))) # needs sage.graphs
43-
sage: list(nP) # needs sage.graphs
39+
sage: P = W.bruhat_poset(facade=True)
40+
sage: D = W.domain()
41+
sage: v = D.rho() - D.fundamental_weight(1)
42+
sage: nP = P.relabel(lambda w: ElementWithLabel(w, w.action(v)))
43+
sage: list(nP)
4444
[(0, 0), (0, 0)]
4545
"""
4646
def __init__(self, element, label):

‎src/sage/misc/function_mangling.pyx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,7 @@ cdef class ArgumentFixer:
157157
EXAMPLES::
158158
159159
sage: from sage.misc.function_mangling import ArgumentFixer
160-
sage: g = ArgumentFixer(number_of_partitions) # needs sage.combinat
161-
sage: g # needs sage.combinat
160+
sage: g = ArgumentFixer(number_of_partitions); g # needs sage.combinat
162161
Argument Fixer of <function number_of_partitions at 0x...>
163162
"""
164163
return "Argument Fixer of %s"%self.f

‎src/sage/misc/functional.py

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ def characteristic_polynomial(x, var='x'):
139139
140140
EXAMPLES::
141141
142-
sage: # needs sage.modules
142+
sage: # needs sage.libs.pari sage.modules
143143
sage: M = MatrixSpace(QQ, 3, 3)
144144
sage: A = M([1,2,3,4,5,6,7,8,9])
145-
sage: charpoly(A) # needs sage.libs.pari
145+
sage: charpoly(A)
146146
x^3 - 15*x^2 - 18*x
147-
sage: charpoly(A, 't') # needs sage.libs.pari
147+
sage: charpoly(A, 't')
148148
t^3 - 15*t^2 - 18*t
149149
150150
sage: k.<alpha> = GF(7^10); k # needs sage.rings.finite_rings
@@ -728,11 +728,11 @@ def integral(x, *args, **kwds):
728728
sage: sage.calculus.calculus.maxima('domain: real')
729729
real
730730
sage: f = exp(-x) * sinh(sqrt(x))
731-
sage: t = integrate(f, x, 0, Infinity); t # long time
731+
sage: t = integrate(f, x, 0, Infinity); t # long time
732732
1/4*sqrt(pi)*(erf(1) - 1)*e^(1/4)
733733
- 1/4*(sqrt(pi)*(erf(1) - 1) - sqrt(pi) + 2*e^(-1) - 2)*e^(1/4)
734734
+ 1/4*sqrt(pi)*e^(1/4) - 1/2*e^(1/4) + 1/2*e^(-3/4)
735-
sage: t.canonicalize_radical() # long time
735+
sage: t.canonicalize_radical() # long time
736736
1/2*sqrt(pi)*e^(1/4)
737737
sage: sage.calculus.calculus.maxima('domain: complex')
738738
complex
@@ -770,10 +770,11 @@ def integral(x, *args, **kwds):
770770
sage: integrate(sin(x)*tan(x)/(1-cos(x)), x, a, b, algorithm='sympy')
771771
-integrate(sin(x)*tan(x)/(cos(x) - 1), x, a, b)
772772
773-
sage: import sympy # needs sympy
774-
sage: x, y, z = sympy.symbols('x y z') # needs sympy
775-
sage: f = sympy.Function('f') # needs sympy
776-
sage: SR(sympy.Integral(f(x,y,z), x, y, z)) # needs sympy sage.symbolic
773+
sage: # needs sympy
774+
sage: import sympy
775+
sage: x, y, z = sympy.symbols('x y z')
776+
sage: f = sympy.Function('f')
777+
sage: SR(sympy.Integral(f(x,y,z), x, y, z)) # needs sage.symbolic
777778
integrate(integrate(integrate(f(x, y, z), x), y), z)
778779
779780
Ensure that the following integral containing a signum term from
@@ -1225,15 +1226,15 @@ def minimal_polynomial(x, var='x'):
12251226
12261227
EXAMPLES::
12271228
1228-
sage: # needs sage.modules
1229+
sage: # needs sage.libs.pari sage.modules
12291230
sage: a = matrix(ZZ, 2, [1..4])
1230-
sage: minpoly(a) # needs sage.libs.pari
1231+
sage: minpoly(a)
12311232
x^2 - 5*x - 2
1232-
sage: minpoly(a, 't') # needs sage.libs.pari
1233+
sage: minpoly(a, 't')
12331234
t^2 - 5*t - 2
1234-
sage: minimal_polynomial(a) # needs sage.libs.pari
1235+
sage: minimal_polynomial(a)
12351236
x^2 - 5*x - 2
1236-
sage: minimal_polynomial(a, 'theta') # needs sage.libs.pari
1237+
sage: minimal_polynomial(a, 'theta')
12371238
theta^2 - 5*theta - 2
12381239
"""
12391240
try:
@@ -1248,7 +1249,7 @@ def minimal_polynomial(x, var='x'):
12481249
def multiplicative_order(x):
12491250
r"""
12501251
Return the multiplicative order of ``x``, if ``x`` is a unit, or
1251-
raise ``ArithmeticError`` otherwise.
1252+
raise :class:`ArithmeticError` otherwise.
12521253
12531254
EXAMPLES::
12541255
@@ -1725,18 +1726,20 @@ def round(x, ndigits=0):
17251726
17261727
EXAMPLES::
17271728
1728-
sage: round(sqrt(2), 2) # needs sage.symbolic
1729+
sage: # needs sage.symbolic
1730+
sage: round(sqrt(2), 2)
17291731
1.41
1730-
sage: q = round(sqrt(2), 5); q # needs sage.symbolic
1732+
sage: q = round(sqrt(2), 5); q
17311733
1.41421
1732-
sage: type(q) # needs sage.symbolic
1734+
sage: type(q)
17331735
<class 'sage.rings.real_double...RealDoubleElement...'>
1734-
sage: q = round(sqrt(2)); q # needs sage.symbolic
1736+
sage: q = round(sqrt(2)); q
17351737
1
1736-
sage: type(q) # needs sage.symbolic
1738+
sage: type(q)
17371739
<class 'sage.rings.integer.Integer'>
1738-
sage: round(pi) # needs sage.symbolic
1740+
sage: round(pi)
17391741
3
1742+
17401743
sage: b = 5.4999999999999999
17411744
sage: round(b)
17421745
5
@@ -1954,17 +1957,19 @@ def sqrt(x, *args, **kwds):
19541957
19551958
EXAMPLES::
19561959
1957-
sage: sqrt(-1) # needs sage.symbolic
1958-
I
1959-
sage: sqrt(2) # needs sage.symbolic
1960-
sqrt(2)
1961-
sage: sqrt(2)^2 # needs sage.symbolic
1962-
2
19631960
sage: sqrt(4)
19641961
2
19651962
sage: sqrt(4, all=True)
19661963
[2, -2]
1967-
sage: sqrt(x^2) # needs sage.symbolic
1964+
1965+
sage: # needs sage.symbolic
1966+
sage: sqrt(-1)
1967+
I
1968+
sage: sqrt(2)
1969+
sqrt(2)
1970+
sage: sqrt(2)^2
1971+
2
1972+
sage: sqrt(x^2)
19681973
sqrt(x^2)
19691974
19701975
For a non-symbolic square root, there are a few options.

‎src/sage/misc/gperftools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# sage.doctest: optional - sage.symbolic
1+
# sage.doctest: needs sage.symbolic
22
"""
33
C Function Profiler Using Google Perftools
44

‎src/sage/misc/inline_fortran.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ def eval(self, x, globals=None, locals=None):
9191
9292
EXAMPLES::
9393
94+
sage: # needs numpy
9495
sage: code = '''
9596
....: C FILE: FIB1.F
9697
....: SUBROUTINE FIB(A,N)
@@ -111,11 +112,11 @@ def eval(self, x, globals=None, locals=None):
111112
....: END
112113
....: C END FILE FIB1.F
113114
....: '''
114-
sage: fortran(code, globals()) # needs numpy
115-
sage: import numpy # needs numpy
116-
sage: a = numpy.array(range(10), dtype=float) # needs numpy
117-
sage: fib(a, 10) # needs numpy
118-
sage: a # needs numpy
115+
sage: fortran(code, globals())
116+
sage: import numpy
117+
sage: a = numpy.array(range(10), dtype=float)
118+
sage: fib(a, 10)
119+
sage: a
119120
array([ 0., 1., 1., 2., 3., 5., 8., 13., 21., 34.])
120121
121122
TESTS::

‎src/sage/misc/latex.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ class Latex(LatexCall):
967967
968968
sage: latex(x^20 + 1) # needs sage.symbolic
969969
x^{20} + 1
970-
sage: latex(FiniteField(25,'a')) # needs sage.libs.pari
970+
sage: latex(FiniteField(25,'a')) # needs sage.rings.finite_rings
971971
\Bold{F}_{5^{2}}
972972
sage: latex("hello")
973973
\text{\texttt{hello}}
@@ -1216,18 +1216,19 @@ def matrix_delimiters(self, left=None, right=None):
12161216
12171217
EXAMPLES::
12181218
1219-
sage: a = matrix(1, 1, [17]) # needs sage.modules
1220-
sage: latex(a) # needs sage.modules
1219+
sage: # needs sage.modules
1220+
sage: a = matrix(1, 1, [17])
1221+
sage: latex(a)
12211222
\left(\begin{array}{r}
12221223
17
12231224
\end{array}\right)
12241225
sage: latex.matrix_delimiters("[", "]")
1225-
sage: latex(a) # needs sage.modules
1226+
sage: latex(a)
12261227
\left[\begin{array}{r}
12271228
17
12281229
\end{array}\right]
12291230
sage: latex.matrix_delimiters(left="\\{")
1230-
sage: latex(a) # needs sage.modules
1231+
sage: latex(a)
12311232
\left\{\begin{array}{r}
12321233
17
12331234
\end{array}\right]
@@ -1277,14 +1278,15 @@ def vector_delimiters(self, left=None, right=None):
12771278
12781279
EXAMPLES::
12791280
1280-
sage: a = vector(QQ, [1,2,3]) # needs sage.modules
1281-
sage: latex(a) # needs sage.modules
1281+
sage: # needs sage.modules
1282+
sage: a = vector(QQ, [1,2,3])
1283+
sage: latex(a)
12821284
\left(1,\,2,\,3\right)
12831285
sage: latex.vector_delimiters("[", "]")
1284-
sage: latex(a) # needs sage.modules
1286+
sage: latex(a)
12851287
\left[1,\,2,\,3\right]
12861288
sage: latex.vector_delimiters(right="\\}")
1287-
sage: latex(a) # needs sage.modules
1289+
sage: latex(a)
12881290
\left[1,\,2,\,3\right\}
12891291
sage: latex.vector_delimiters()
12901292
['[', '\\}']
@@ -1322,18 +1324,19 @@ def matrix_column_alignment(self, align=None):
13221324
13231325
EXAMPLES::
13241326
1325-
sage: a = matrix(1, 1, [42]) # needs sage.modules
1326-
sage: latex(a) # needs sage.modules
1327+
sage: # needs sage.modules
1328+
sage: a = matrix(1, 1, [42])
1329+
sage: latex(a)
13271330
\left(\begin{array}{r}
13281331
42
13291332
\end{array}\right)
13301333
sage: latex.matrix_column_alignment('c')
1331-
sage: latex(a) # needs sage.modules
1334+
sage: latex(a)
13321335
\left(\begin{array}{c}
13331336
42
13341337
\end{array}\right)
13351338
sage: latex.matrix_column_alignment('l')
1336-
sage: latex(a) # needs sage.modules
1339+
sage: latex(a)
13371340
\left(\begin{array}{l}
13381341
42
13391342
\end{array}\right)
@@ -1971,7 +1974,7 @@ def png(x, filename, density=150, debug=False,
19711974
19721975
sage: from sage.misc.latex import png
19731976
sage: import tempfile
1974-
sage: with tempfile.NamedTemporaryFile(suffix=".png") as f: # optional - imagemagick latex, needs sage.plot
1977+
sage: with tempfile.NamedTemporaryFile(suffix=".png") as f: # random # optional - imagemagick latex, needs sage.plot
19751978
....: png(ZZ[x], f.name)
19761979
"""
19771980
if not pdflatex:

0 commit comments

Comments
 (0)