Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Open sidebar
SageMath
SageMath Developers
tracmirror
Compare Revisions
develop...u/jmantysalo/colorcolour
Commits (1)
Change colours to colors.
· c346d2cf
Jori Mäntysalo
authored
Oct 23, 2016
c346d2cf
Hide whitespace changes
Inline
Sidebyside
Showing
6 changed files
with
11 additions
and
11 deletions
+11
11
src/sage/combinat/words/finite_word.py
src/sage/combinat/words/finite_word.py
+3
3
src/sage/groups/braid.py
src/sage/groups/braid.py
+1
1
src/sage/matroids/catalog.py
src/sage/matroids/catalog.py
+2
2
src/sage/plot/colors.py
src/sage/plot/colors.py
+1
1
src/sage/repl/image.py
src/sage/repl/image.py
+3
3
src/sage/schemes/elliptic_curves/ell_number_field.py
src/sage/schemes/elliptic_curves/ell_number_field.py
+1
1
No files found.
src/sage/combinat/words/finite_word.py
View file @
c346d2cf
...
...
@@ 6586,11 +6586,11 @@ class FiniteWord_class(Word_class):
def
colored_vector
(
self
,
x
=
0
,
y
=
0
,
width
=
'default'
,
height
=
1
,
cmap
=
'hsv'
,
thickness
=
1
,
label
=
None
):
r
"""
Return a vector (Graphics object) illustrating ``self``. Each letter
is represented by a colo
u
red rectangle.
is represented by a colored rectangle.
If the parent of ``self`` is a class of words over a finite alphabet,
then each letter in the alphabet is assigned a unique colo
u
r, and
this colo
u
r will be the same every time this method is called. This
then each letter in the alphabet is assigned a unique color, and
this color will be the same every time this method is called. This
is especially useful when plotting and comparing words defined on
the same alphabet.
...
...
src/sage/groups/braid.py
View file @
c346d2cf
...
...
@@ 1923,7 +1923,7 @@ class BraidGroup_class(FinitelyPresentedGroup):
newforest
.
remove
(
tree
)
# Cut down the original tree
# Add two greater trees, admissibly. We need to check two
# things to ensure that the tree will eventually define a
# basis elements: that its 'colo
u
r' is not too large, and
# basis elements: that its 'color' is not too large, and
# that it is positive.
if
tree
[

1
]
<
treesize

len
(
tree
)
+
1
:
newtreeup
.
append
(
tree
[

1
]
+
1
)
...
...
src/sage/matroids/catalog.py
View file @
c346d2cf
...
...
@@ 684,7 +684,7 @@ def K33dual():
The matroid `M*(K_{3, 3})` is a 9element matroid of rank4.
It is an excluded minor for the class of graphic matroids.
It is the graft matroid of the 4wheel with every vertex except the hub
being colo
u
red. See [Oxl2011]_, p. 652.
being colored. See [Oxl2011]_, p. 652.
EXAMPLES::
...
...
@@ 1032,7 +1032,7 @@ def R10():
The matroid `R_{10}` is a 10element regular matroid of rank5.
It is the unique splitter for the class of regular matroids.
It is the graft matroid of `K_{3, 3}` in which every vertex is colo
u
red.
It is the graft matroid of `K_{3, 3}` in which every vertex is colored.
See [Oxl2011]_, p. 656.
EXAMPLES::
...
...
src/sage/plot/colors.py
View file @
c346d2cf
...
...
@@ 838,7 +838,7 @@ class Color(object):
def
__int__
(
self
):
"""
Return the integer representation of this colo
u
r.
Return the integer representation of this color.
OUTPUT:
...
...
src/sage/repl/image.py
View file @
c346d2cf
...
...
@@ 76,11 +76,11 @@ class Image(SageObject):
 ``size``  2tuple, containing (width, height) in pixels.
 ``color``  string or tuple of numeric. What colo
u
r to use
 ``color``  string or tuple of numeric. What color to use
for the image. Default is black. If given, this should be a
a tuple with one value per band. When creating RGB images,
you can also use colo
u
r strings as supported by the
ImageColor module. If the colo
u
r is None, the image is not
you can also use color strings as supported by the
ImageColor module. If the color is None, the image is not
initialised.
OUTPUT:
...
...
src/sage/schemes/elliptic_curves/ell_number_field.py
View file @
c346d2cf
...
...
@@ 2881,7 +2881,7 @@ class EllipticCurve_number_field(EllipticCurve_field):
sage: G = C.graph()
sage: G.show(edge_labels=False) # long time
It is possible to display a 3dimensional plot, with colo
u
rs
It is possible to display a 3dimensional plot, with colors
to represent the different edge labels, in a form which can be
rotated!::
...
...