Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 47f0796

Browse files
rwstrwst
committed
Merge branch 'develop' into t/16719/replace_gap_eval_with_libgap_eval_in_combinat_combinat_py
* develop: (52 commits) Updated Sage version to 6.3.rc0 Reverted change of using format instead of %. Last minor tweak. Some tweaks fixing things from #2516. trac #16709: Broken doc Do not add /usr/local/{lib,include} to paths remove stray without-flint trac #15181: Reviewer's remarks fixed typos in dostrings Stupid typo... Some more review tweaks and fixes. trac #16738 removing tests again trac #16738 better choice of what to test in reasonable amount of time trac #15191 change bad syntax of 2 input blocks added a non-generic examples, and some minor changes trac #16741: Bug in IncidenceStructure.relabel when the ground set consists of pairs trac 16XXX shortening some cluster doctests trac #16732: make _maxima_init_evaled_ implementations and some bracket translations more robust The changes here make sure that a few _maxima_init_evaled_ routines process their arguments with _maxima_init_ rather than just make strings out of them, as well as fix the maxima_string_to_expression parser to properly handle possible nested square brackets. Micro-optimizations to the *_generators. Fixed trivial failing doctests. ...
2 parents 240cc10 + 0ce5b99 commit 47f0796

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1246
-310
lines changed

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Sage version 6.3.beta8, released 2014-07-30
1+
Sage version 6.3.rc0, released 2014-08-04

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=61fb4cbbbefb498d245eb64838975626532b3a5b
3-
md5=f5327ad7b301cf4f9d082b7d4d530deb
4-
cksum=4233956904
2+
sha1=3a3b255183c9f8537e1d8178114827ea8c763ae3
3+
md5=8b03b871bca328d65cdcac7859e6a811
4+
cksum=3461275129

‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
40
1+
41

‎build/pkgs/singular/SPKG.txt

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ See spkg-src.
6262
* singular-3.1.6-no_return_type.patch:
6363
State return type of main functions so that Singular builds
6464
with clang.
65+
* no_usr_local.patch: Do not add /usr/local/{lib,include} "just in
66+
case" to the LDFLAGS/CPPFLAGS. Especially not at the end ...
6567

6668
Other notes
6769
* The option '--without-dynamic-kernel' is used on *all*

‎build/pkgs/singular/patches/no_usr_local.patch

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
diff -ur orig/Singular/configure latest/Singular/configure
2+
--- orig/Singular/configure 2014-08-02 09:16:46.762463059 -0400
3+
+++ latest/Singular/configure 2014-08-02 09:22:26.284787562 -0400
4+
@@ -4745,15 +4745,6 @@
5+
# expand includedir
6+
test "x$includedir" = 'x${prefix}/include' && includedir="${exec_prefix}/include"
7+
8+
-# add to -I to CPPFLAGS and and -L to LDFLAGS, just to be sure
9+
-if test "$ac_cv_c_cpp" = gcc3 ; then
10+
- LDFLAGS="-L${libdir} ${LDFLAGS}"
11+
- CPPFLAGS="-I${includedir} ${CPPFLAGS}"
12+
-else
13+
- LDFLAGS="-L${libdir} ${LDFLAGS} -L/usr/local/lib"
14+
- CPPFLAGS="-I${includedir} ${CPPFLAGS} -I/usr/local/include"
15+
-fi
16+
-
17+
# this is a work-around to include the right term.h
18+
if test "$ac_cv_singuname" = SunOS-5; then
19+
CPPFLAGS="-I/usr/xpg4/include ${CPPFLAGS}"
20+
diff -ur orig/Singular/configure.in latest/Singular/configure.in
21+
--- orig/Singular/configure.in 2014-08-02 09:16:46.762463059 -0400
22+
+++ latest/Singular/configure.in 2014-08-02 09:22:11.013528822 -0400
23+
@@ -681,15 +681,6 @@
24+
# expand includedir
25+
test "x$includedir" = 'x${prefix}/include' && includedir="${exec_prefix}/include"
26+
27+
-# add to -I to CPPFLAGS and and -L to LDFLAGS, just to be sure
28+
-if test "$ac_cv_c_cpp" = gcc3 ; then
29+
- LDFLAGS="-L${libdir} ${LDFLAGS}"
30+
- CPPFLAGS="-I${includedir} ${CPPFLAGS}"
31+
-else
32+
- LDFLAGS="-L${libdir} ${LDFLAGS} -L/usr/local/lib"
33+
- CPPFLAGS="-I${includedir} ${CPPFLAGS} -I/usr/local/include"
34+
-fi
35+
-
36+
# this is a work-around to include the right term.h
37+
if test "$ac_cv_singuname" = SunOS-5; then
38+
CPPFLAGS="-I/usr/xpg4/include ${CPPFLAGS}"

‎build/pkgs/singular/spkg-install

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ build_factory()
234234
--with-gmp="$SAGE_LOCAL" \
235235
--enable-NTL \
236236
--with-NTL="$SAGE_LOCAL" \
237-
--without-flint \
237+
--with-flint="$SAGE_LOCAL" \
238238
--with-gmp="$SAGE_LOCAL" \
239239
$ENABLE_DEBUGOUTPUT
240240

‎src/bin/sage-banner

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
┌────────────────────────────────────────────────────────────────────┐
2-
│ Sage Version 6.3.beta8, Release Date: 2014-07-30 │
2+
│ Sage Version 6.3.rc0, Release Date: 2014-08-04 │
33
│ Type "notebook()" for the browser-based notebook interface. │
44
│ Type "help()" for help. │
55
└────────────────────────────────────────────────────────────────────┘

‎src/bin/sage-version.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sage version information for shell scripts
22
# This file is auto-generated by the sage-update-version script, do not edit!
3-
SAGE_VERSION='6.3.beta8'
4-
SAGE_RELEASE_DATE='2014-07-30'
3+
SAGE_VERSION='6.3.rc0'
4+
SAGE_RELEASE_DATE='2014-08-04'

‎src/doc/en/thematic_tutorials/coercion_and_categories.rst

+6
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,9 @@ Here are the tests that form the test suite of quotient fields::
14861486
'_test_elements_eq_symmetric',
14871487
'_test_elements_eq_transitive',
14881488
'_test_elements_neq',
1489+
'_test_euclidean_degree',
14891490
'_test_one', '_test_prod',
1491+
'_test_quo_rem',
14901492
'_test_some_elements',
14911493
'_test_zero']
14921494

@@ -1534,10 +1536,12 @@ Let us see what tests are actually performed::
15341536
running ._test_elements_eq_transitive() . . . pass
15351537
running ._test_elements_neq() . . . pass
15361538
running ._test_eq() . . . pass
1539+
running ._test_euclidean_degree() . . . pass
15371540
running ._test_not_implemented_methods() . . . pass
15381541
running ._test_one() . . . pass
15391542
running ._test_pickling() . . . pass
15401543
running ._test_prod() . . . pass
1544+
running ._test_quo_rem() . . . pass
15411545
running ._test_some_elements() . . . pass
15421546
running ._test_zero() . . . pass
15431547

@@ -1699,10 +1703,12 @@ interesting.
16991703
running ._test_elements_eq_transitive() . . . pass
17001704
running ._test_elements_neq() . . . pass
17011705
running ._test_eq() . . . pass
1706+
running ._test_euclidean_degree() . . . pass
17021707
running ._test_not_implemented_methods() . . . pass
17031708
running ._test_one() . . . pass
17041709
running ._test_pickling() . . . pass
17051710
running ._test_prod() . . . pass
1711+
running ._test_quo_rem() . . . pass
17061712
running ._test_some_elements() . . . pass
17071713
running ._test_zero() . . . pass
17081714

‎src/doc/en/thematic_tutorials/tutorial-objects-and-classes.rst

+6-4
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,14 @@ Some particular actions modify the data structure of ``el``::
297297
<type 'sage.rings.integer.Integer'>
298298
sage: e.__dict__
299299
dict_proxy({'__module__': 'sage.categories.euclidean_domains',
300-
'__doc__': None, '_reduction': (<built-in function getattr>, (Category
301-
of euclidean domains, 'element_class')), 'gcd':
300+
'euclidean_degree': <abstract method euclidean_degree at 0x...>,
301+
'_reduction': (<built-in function getattr>, (Category of euclidean
302+
domains, 'element_class')), 'gcd':
302303
<sage.structure.element.NamedBinopMethod object at 0x...>,
303-
'_sage_src_lines_': <staticmethod object at 0x...>})
304+
'_sage_src_lines_': <staticmethod object at 0x...>, 'quo_rem':
305+
<abstract method quo_rem at 0x...>, '__doc__': None})
304306
sage: e.__dict__.keys()
305-
['__module__', '__doc__', '_reduction', 'gcd', '_sage_src_lines_']
307+
['__module__', 'euclidean_degree', '_reduction', 'gcd', '_sage_src_lines_', 'quo_rem', '__doc__']
306308

307309
sage: id4 = SymmetricGroup(4).one()
308310
sage: type(id4)

‎src/sage/calculus/calculus.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -1746,9 +1746,9 @@ def _inverse_laplace_latex_(self, *args):
17461746

17471747
sci_not = re.compile("(-?(?:0|[1-9]\d*))(\.\d+)?([eE][-+]\d+)")
17481748

1749-
polylog_ex = re.compile('li\[([0-9]+?)\]\(')
1749+
polylog_ex = re.compile('li\[([^\[\]]*)\]\(')
17501750

1751-
maxima_polygamma = re.compile("psi\[(\d*)\]\(") # matches psi[n]( where n is a number
1751+
maxima_polygamma = re.compile("psi\[([^\[\]]*)\]\(") # matches psi[n]( where n is a number
17521752

17531753
maxima_hyper = re.compile("\%f\[\d+,\d+\]") # matches %f[m,n]
17541754

@@ -1885,9 +1885,13 @@ def symbolic_expression_from_maxima_string(x, equals_sub=False, maxima=maxima):
18851885
s = s.replace("%","")
18861886

18871887
s = s.replace("#","!=") # a lot of this code should be refactored somewhere...
1888-
1889-
s = polylog_ex.sub('polylog(\\1,', s)
1890-
s = maxima_polygamma.sub('psi(\g<1>,', s) # this replaces psi[n](foo) with psi(n,foo), ensuring that derivatives of the digamma function are parsed properly below
1888+
#we apply the square-bracket replacing patterns repeatedly
1889+
#to ensure that nested brackets get handled (from inside to out)
1890+
while True:
1891+
olds = s
1892+
s = polylog_ex.sub('polylog(\\1,', s)
1893+
s = maxima_polygamma.sub('psi(\g<1>,', s) # this replaces psi[n](foo) with psi(n,foo), ensuring that derivatives of the digamma function are parsed properly below
1894+
if s == olds: break
18911895

18921896
if equals_sub:
18931897
s = s.replace('=','==')

‎src/sage/categories/algebras.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ def extra_super_categories(self):
138138
sage: sorted(C.super_categories(), key=str)
139139
[Category of Cartesian products of commutative additive groups,
140140
Category of Cartesian products of distributive magmas and additive magmas,
141-
Category of Cartesian products of semigroups,
142-
Category of Cartesian products of unital magmas,
141+
Category of Cartesian products of monoids,
143142
Category of algebras over Rational Field]
144143
"""
145144
return [self.base_category()]

‎src/sage/categories/cartesian_product.py

+39-43
Original file line numberDiff line numberDiff line change
@@ -39,55 +39,51 @@ class CartesianProductFunctor(CovariantFunctorialConstruction):
3939
monoids (hence in the category `Monoids()`), then the result is
4040
automatically endowed with its natural monoid structure::
4141
42-
sage: M = Monoids().example()
43-
sage: M
44-
An example of a monoid: the free monoid generated by ('a', 'b', 'c', 'd')
45-
sage: M.rename('M')
46-
sage: C = cartesian_product([M, ZZ, QQ])
47-
sage: C
48-
The cartesian product of (M, Integer Ring, Rational Field)
49-
sage: C.an_element()
50-
('abcd', 1, 1/2)
51-
sage: C.an_element()^2
52-
('abcdabcd', 1, 1/4)
53-
sage: C.category()
54-
Join of Category of monoids
55-
and Category of Cartesian products of semigroups
56-
and Category of Cartesian products of unital magmas
57-
58-
sage: Monoids().CartesianProducts()
59-
Join of Category of monoids
60-
and Category of Cartesian products of semigroups
61-
and Category of Cartesian products of unital magmas
42+
sage: M = Monoids().example()
43+
sage: M
44+
An example of a monoid: the free monoid generated by ('a', 'b', 'c', 'd')
45+
sage: M.rename('M')
46+
sage: C = cartesian_product([M, ZZ, QQ])
47+
sage: C
48+
The cartesian product of (M, Integer Ring, Rational Field)
49+
sage: C.an_element()
50+
('abcd', 1, 1/2)
51+
sage: C.an_element()^2
52+
('abcdabcd', 1, 1/4)
53+
sage: C.category()
54+
Category of Cartesian products of monoids
55+
56+
sage: Monoids().CartesianProducts()
57+
Category of Cartesian products of monoids
6258
6359
The Cartesian product functor is covariant: if ``A`` is a
6460
subcategory of ``B``, then ``A.CartesianProducts()`` is a
6561
subcategory of ``B.CartesianProducts()`` (see also
6662
:class:`~sage.categories.covariant_functorial_construction.CovariantFunctorialConstruction`)::
6763
68-
sage: C.categories()
69-
[Join of ...,
70-
Category of monoids,
71-
Category of Cartesian products of semigroups,
72-
Category of semigroups,
73-
Category of Cartesian products of unital magmas,
74-
Category of Cartesian products of magmas,
75-
Category of unital magmas,
76-
Category of magmas,
77-
Category of Cartesian products of sets,
78-
Category of sets, ...]
79-
80-
[Category of Cartesian products of monoids,
81-
Category of monoids,
82-
Category of Cartesian products of semigroups,
83-
Category of semigroups,
84-
Category of Cartesian products of magmas,
85-
Category of unital magmas,
86-
Category of magmas,
87-
Category of Cartesian products of sets,
88-
Category of sets,
89-
Category of sets with partial maps,
90-
Category of objects]
64+
sage: C.categories()
65+
[Category of Cartesian products of monoids,
66+
Category of monoids,
67+
Category of Cartesian products of semigroups,
68+
Category of semigroups,
69+
Category of Cartesian products of unital magmas,
70+
Category of Cartesian products of magmas,
71+
Category of unital magmas,
72+
Category of magmas,
73+
Category of Cartesian products of sets,
74+
Category of sets, ...]
75+
76+
[Category of Cartesian products of monoids,
77+
Category of monoids,
78+
Category of Cartesian products of semigroups,
79+
Category of semigroups,
80+
Category of Cartesian products of magmas,
81+
Category of unital magmas,
82+
Category of magmas,
83+
Category of Cartesian products of sets,
84+
Category of sets,
85+
Category of sets with partial maps,
86+
Category of objects]
9187
9288
Hence, the role of ``Monoids().CartesianProducts()`` is solely to
9389
provide mathematical information and algorithms which are relevant

‎src/sage/categories/covariant_functorial_construction.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,11 @@ def category_from_categories(self, categories):
161161
sage: Cat2 = Groups()
162162
sage: cartesian_product.category_from_categories((Cat1, Cat1, Cat1))
163163
Join of Category of rings and ...
164-
and Category of Cartesian products of semigroups and ...
164+
and Category of Cartesian products of monoids
165165
and Category of Cartesian products of commutative additive groups
166166
167167
sage: cartesian_product.category_from_categories((Cat1, Cat2))
168-
Join of Category of monoids
169-
and Category of Cartesian products of semigroups
170-
and Category of Cartesian products of unital magmas
168+
Category of Cartesian products of monoids
171169
"""
172170
assert(len(categories) > 0)
173171
return self.category_from_category(Category.meet(categories))

0 commit comments

Comments
 (0)