This repository has been archived by the owner on Jan 30, 2023. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 't/21295/sequences/recognizable' into t/21203/sequences/…
…k-regular
* t/21295/sequences/recognizable: (54 commits)
Updated SageMath version to 9.3
build/pkgs/fplll/spkg-install.in: Configure --without-qd if we use gcc from spkg
build/pkgs/fplll/spkg-configure.m4: Add depcheck on gcc
build/pkgs/ppl/spkg-configure.m4: Add depcheck on gcc
build/pkgs/brial/spkg-configure.m4: Add depcheck on gcc
build/pkgs/{freetype,libgd}/spkg-configure.m4: Add depcheck for gcc
build/pkgs/zeromq/spkg-configure.m4: Add depcheck for gcc
build/pkgs/ntl/spkg-configure.m4: Add depcheck for gcc
Trac #21295 review issue 29: notice minimize vs field
Trac #21295 review issue 7: document accessing coefficients
Trac #21295 review issue 33: rename to number_of_zeros (as it should be)
Updated SageMath version to 9.3.rc5
#31628: two doctests
Trac #25034: move reference to master bib
Trac #25034: formatting + typos
Trac #25034: eval_poly deprecation + doc improved
increment pynac patch level again
add doctest
trac 31645 handling of constant term in series
fix doctest for 32-bit
...- Loading branch information
Showing
50 changed files
with
667 additions
and
243 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| SageMath version 9.3.rc3, Release Date: 2021-04-12 | ||
| SageMath version 9.3, Release Date: 2021-05-09 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| tarball=configure-VERSION.tar.gz | ||
| sha1=8e87b8d927704c25058ba2d9595e48e22062197f | ||
| md5=ebdea78d9fb120ab8e31f4ea5dd01d8e | ||
| cksum=3284139585 | ||
| sha1=2d5d2d8a2a6dbc721935f6b3d3ada9a6bd977e19 | ||
| md5=d84b8fcb2ddd6949d3461f49fae01702 | ||
| cksum=2508666370 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| c0dc957ff06d230f943cad6ae12dc3b028eec49c | ||
| 3f4547f2cc40338ba42329d53f7fb48c31ff9fc8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| tarball=freetype-VERSION.tar.bz2 | ||
| sha1=3296b64ad1e7540289f22e4b6383e26e928b0a20 | ||
| md5=c50a3c9e5e62bdc938a6e1598a782947 | ||
| cksum=2822306030 | ||
| sha1=040d6a4be23708132c85ef9df837eb3f8a04c4ab | ||
| md5=4934a8b61b636920bcce58e7c7f3e1a2 | ||
| cksum=2814275332 | ||
| upstream_url=https://download.savannah.gnu.org/releases/freetype/freetype-VERSION.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2.10.1 | ||
| 2.10.4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,6 @@ | ||
| SAGE_SPKG_CONFIGURE([libgd], [ | ||
| AC_REQUIRE([SAGE_SPKG_CONFIGURE_LIBPNG]) | ||
| AC_REQUIRE([SAGE_SPKG_CONFIGURE_FREETYPE]) | ||
| AC_MSG_CHECKING([Installing freetype? ]) | ||
| if test x$sage_spkg_install_freetype = xyes; then | ||
| AC_MSG_RESULT([Yes. Install libgd as well.]) | ||
| sage_spkg_install_libgd=yes | ||
| else | ||
| dnl do not just rely on libpng being a dependency of freetype | ||
| AC_MSG_CHECKING([Installing libpng? ]) | ||
| if test x$sage_spkg_install_libpng = xyes; then | ||
| AC_MSG_RESULT([Yes. Install libgd as well.]) | ||
| sage_spkg_install_libgd=yes | ||
| else | ||
| AC_MSG_RESULT([No.]) | ||
| dnl Trac #31624: Avoid C++ ABI issues | ||
| SAGE_SPKG_DEPCHECK([gcc libpng freetype], [ | ||
| PKG_CHECK_MODULES([LIBGD], [gdlib >= 2.1], [], [sage_spkg_install_libgd=yes]) | ||
| fi | ||
| fi | ||
| ]) | ||
| ]) | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 0.7.27.p4 | ||
| 0.7.27.p7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| diff --git a/ginac/mul.cpp b/ginac/mul.cpp | ||
| index 1a29c01..c800cbf 100644 | ||
| --- a/ginac/mul.cpp | ||
| +++ b/ginac/mul.cpp | ||
| @@ -1325,18 +1325,22 @@ ex mul::expand(unsigned options) const | ||
| const auto& add2end = add2.seq.end(); | ||
| epvector distrseq; | ||
| auto s = add1.seq.size()+add2.seq.size(); | ||
| - if (s > 400) { | ||
| -// // the condition is probably too simple | ||
| - try { | ||
| - // can it be converted/expanded via Singular? | ||
| - last_expanded = poly_mul_expand(last_expanded, | ||
| - elem.rest); | ||
| - continue; | ||
| - } | ||
| - catch (std::runtime_error) { | ||
| - std::cerr << "can't happen while calling poly_mul_expand\n"; | ||
| - } | ||
| - } | ||
| +// // the poly_mul_expand function is buggy and | ||
| +// // therefore cannot be used (see sage :trac:`31478`), | ||
| +// // so we comment out this section of code until the | ||
| +// // function has been fixed | ||
| +// if (s > 400) { | ||
| +//// // the condition is probably too simple | ||
| +// try { | ||
| +// // can it be converted/expanded via Singular? | ||
| +// last_expanded = poly_mul_expand(last_expanded, | ||
| +// elem.rest); | ||
| +// continue; | ||
| +// } | ||
| +// catch (std::runtime_error) { | ||
| +// std::cerr << "can't happen while calling poly_mul_expand\n"; | ||
| +// } | ||
| +// } | ||
|
|
||
| distrseq.reserve(s); | ||
| // Multiply add2 with the overall coefficient of add1 and append it to distrseq: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| diff --git a/ginac/useries.cpp b/ginac/useries.cpp | ||
| index fd68d49..3af04d8 100644 | ||
| --- a/ginac/useries.cpp | ||
| +++ b/ginac/useries.cpp | ||
| @@ -462,7 +462,16 @@ void symbol::useries(flint_series_t& fp, int order) const | ||
|
|
||
| void add::useries(flint_series_t& fp, int order) const | ||
| { | ||
| - fmpq_poly_set_ui(fp.ft, 0); | ||
| + const numeric& oc = overall_coeff; | ||
| + if (oc.is_zero()) | ||
| + fmpq_poly_set_ui(fp.ft, 0); | ||
| + else if (oc.is_long()) | ||
| + fmpq_poly_set_si(fp.ft, oc.to_long()); | ||
| + else if (oc.is_mpz()) | ||
| + fmpq_poly_set_mpz(fp.ft, oc.as_mpz()); | ||
| + else | ||
| + fmpq_poly_set_mpq(fp.ft, oc.as_mpq()); | ||
| + | ||
| for (const auto & elem : seq) { | ||
| const ex& t = recombine_pair_to_ex(elem); | ||
| flint_series_t fp1; | ||
| @@ -477,18 +486,6 @@ void add::useries(flint_series_t& fp, int order) const | ||
| } | ||
| fmpq_poly_add(fp.ft, fp.ft, fp1.ft); | ||
| } | ||
| - const numeric& oc = overall_coeff; | ||
| - if (oc.is_zero()) | ||
| - return; | ||
| - | ||
| - flint_series_t fp1; | ||
| - if (oc.is_long()) | ||
| - fmpq_poly_set_si(fp1.ft, oc.to_long()); | ||
| - else if (oc.is_mpz()) | ||
| - fmpq_poly_set_mpz(fp1.ft, oc.as_mpz()); | ||
| - else | ||
| - fmpq_poly_set_mpq(fp1.ft, oc.as_mpq()); | ||
| - fmpq_poly_add(fp.ft, fp.ft, fp1.ft); | ||
| } | ||
|
|
||
| void mul::useries(flint_series_t& fp, int order) const |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 9.3.rc3 | ||
| 9.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| tarball=setuptools_scm-VERSION.tar.gz | ||
| sha1=af08a257a725dbdde9795859249ddf79caf4fc22 | ||
| md5=c11bf23d80224691a46ee5deb84c42db | ||
| cksum=929248754 | ||
| sha1=183e0947ee14f8107a3ad6a7f635f04f54a30011 | ||
| md5=aa7f0efbbf46c5576db5994dd1ce3f8d | ||
| cksum=4017375148 | ||
| upstream_url=https://pypi.io/packages/source/s/setuptools_scm/setuptools_scm-VERSION.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 5.0.1 | ||
| 6.0.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| SAGE_SPKG_CONFIGURE([zeromq], [ | ||
| AX_ZMQ([4.2.5], [], [sage_spkg_install_zeromq=yes]) | ||
| dnl Trac #31624: Avoid C++ ABI issues | ||
| SAGE_SPKG_DEPCHECK([gcc], [ | ||
| AX_ZMQ([4.2.5], [], [sage_spkg_install_zeromq=yes]) | ||
| ]) | ||
| ]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 9.3.rc3 | ||
| 9.3 |
Oops, something went wrong.