28574: Merge #28572 into 'public/interfaces/m2/28574'

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.0.beta0, Release Date: 2019-10-05
+SageMath version 9.0.beta2, Release Date: 2019-10-20

build/pkgs/4ti2/spkg-install

@@ -1,7 +1,7 @@
 cd src/
 CFLAGS="-I $SAGE_LOCAL/include -L$SAGE_LOCAL/lib $CFLAGS"
 export CFLAGS
-sdh_configure $SAGE_CONFIGURE_GMP --with-glpk=$SAGE_LOCAL \
+sdh_configure $SAGE_CONFIGURE_GMP --with-glpk=$SAGE_GLPK_PREFIX \
     --enable-shared=yes --enable-static=no
 sdh_make
 sdh_make_install

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=88c64d8e89617f7b817b4c64c86f178bb3492197
-md5=8597ab2ea667727bac68a2d0dad07fab
-cksum=1280714849
+sha1=b42fa76b2a3615bf81f6004f3b270112048a9e58
+md5=097fafd456b102324154db9dbe5e88c8
+cksum=2363138578

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-34c16c3013c6f6d041875509edc8fb6bb84f4d3c
+ae783de99b3a4d4960eaabadc7622c100939541b

build/pkgs/giacpy_sage/checksums.ini

@@ -1,4 +1,4 @@
 tarball=giacpy_sage-VERSION.tar.gz
-sha1=f23909396c6464c7b8a05538ced73ba34152c7bf
-md5=9d250194dc1c7c0ea391e36e3f7a07e2
-cksum=2377016266
+sha1=3227503e88e65ef3a05b27647b5279fedc988569
+md5=41c5a32ea525d6a2a7de4cee8693e1f1
+cksum=4142736489

build/pkgs/giacpy_sage/package-version.txt

@@ -1 +1 @@
-0.6.7
+0.6.8

build/pkgs/glpk/spkg-configure.m4

@@ -0,0 +1,25 @@
+SAGE_SPKG_CONFIGURE([glpk], [
+    m4_pushdef([SAGE_GLPK_MINVER],["4.63"])
+    SAGE_SPKG_DEPCHECK([gmp mpir zlib], [
+        AC_PATH_PROG([GLPSOL], [glpsol])
+        AS_IF([test x$GLPSOL = x], [
+           AC_MSG_NOTICE([glpsol not found. Installing glpk])
+           sage_spkg_install_glpk=yes], [
+           glpk_ver=`$GLPSOL --version | grep ^GLPSOL | $SED -e 's/GLPSOL.*ver, v//g' 2>> config.log`
+           AX_COMPARE_VERSION([$glpk_ver], [ge], [$SAGE_GLPK_MINVER], [
+               AC_CHECK_HEADER([glpk.h], [], [sage_spkg_install_glpk=yes])
+               AC_SEARCH_LIBS([glp_config], [glpk],
+                  [AC_MSG_RESULT([yes. Use system's glpk])], [
+                  AC_MSG_RESULT([no. Install glpk])
+                  sage_spkg_install_glpk=yes])dnl end-AC_SEARCH_LIBS
+                  ], [sage_spkg_install_glpk=yes])dnl end-AX_COMPARE_VERSION
+         ])dnl end-AS_IF
+    ])
+    m4_popdef([SAGE_GLPK_MINVER])
+], [], [], [
+    AS_IF([test x$sage_spkg_install_glpk = xyes], [
+        AC_SUBST(SAGE_GLPK_PREFIX, ['$SAGE_LOCAL'])
+        AC_MSG_RESULT([using Sage's glpk SPKG])], [
+        AC_SUBST(SAGE_GLPK_PREFIX, [''])
+        AC_MSG_RESULT([using glpk from the system])])
+])

build/pkgs/sqlite/checksums.ini

@@ -1,4 +1,4 @@
 tarball=sqlite-autoconf-VERSION.tar.gz
-sha1=6cdb46a153b0e88f8a5fd80e29b3966885f39ea4
-md5=cb72c5f93235cd56b18ee2aa1504cdaf
-cksum=1443188914
+sha1=053d8237eb9741b0e297073810668c2611a8e38e
+md5=8f3dfe83387e62ecb91c7c5c09c688dc
+cksum=1918823569

build/pkgs/sqlite/package-version.txt

@@ -1 +1 @@
-3270100
+3290000

src/bin/sage-env-config.in

@@ -99,6 +99,7 @@ if [ -n "$SAGE_PARI_PREFIX" ]; then
 fi
 export SAGE_PARI_CFG="@SAGE_PARI_CFG@"
 
+export SAGE_GLPK_PREFIX="@SAGE_GLPK_PREFIX@"
 export SAGE_FREETYPE_PREFIX="@SAGE_FREETYPE_PREFIX@"
 export SAGE_ARB_LIBRARY="@SAGE_ARB_LIBRARY@"
 

src/bin/sage-version.sh

@@ -1,5 +1,5 @@
 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='9.0.beta0'
-SAGE_RELEASE_DATE='2019-10-05'
-SAGE_VERSION_BANNER='SageMath version 9.0.beta0, Release Date: 2019-10-05'
+SAGE_VERSION='9.0.beta2'
+SAGE_RELEASE_DATE='2019-10-20'
+SAGE_VERSION_BANNER='SageMath version 9.0.beta2, Release Date: 2019-10-20'

src/doc/en/reference/algebras/index.rst

@@ -54,6 +54,7 @@ Named associative algebras
    sage/combinat/grossman_larson_algebras
    sage/combinat/posets/moebius_algebra
    sage/algebras/nil_coxeter_algebra
+   sage/algebras/orlik_terao
    sage/algebras/orlik_solomon
    sage/algebras/quantum_matrix_coordinate_algebra
    sage/combinat/partition_algebra

src/doc/en/reference/plot3d/threejs.rst

@@ -33,7 +33,7 @@ Options currently supported by the viewer:
 - ``axes_labels`` -- (default: ['x','y','z']) list or tuple of three strings;
   set to False to remove all labels
 
-- ``color`` -- (default: 'blue') color of the 3d object
+- ``color`` -- (default: 'blue') color of the 3D object
 
 - ``decimals`` -- (default: 2) integer determining decimals displayed in labels
 
@@ -51,6 +51,9 @@ Options currently supported by the viewer:
   lines thicker than available using ``thickness`` or on Windows platforms where
   ``thickness`` is ignored
 
+- ``render_order`` -- (default: 0) numeric value for rendering order of transparent surfaces;
+  objects render from lowest to highest value ensuring that lower-valued objects render completely
+
 - ``thickness`` -- (default: 1) numeric value for thickness of lines
 
 AUTHORS:

src/doc/en/reference/polynomial_rings/invariant_theory.rst

@@ -6,4 +6,5 @@ Classical Invariant Theory
    :maxdepth: 2
 
    sage/rings/invariants/invariant_theory
+   sage/rings/invariants/reconstruction
 

src/doc/en/reference/references/index.rst

@@ -1227,6 +1227,10 @@ REFERENCES:
              Theory*. Morgan & Claypool Publishers, (2011). ISBN
              9781608456529, :doi:`10.2200/S00355ED1V01Y201107AIM016`.
 
+.. [CF2005] Raul Cordovil and David Forge.
+            *Gröbner and diagonal bases in Orlik-Solomon type algebras*
+            Cubo **7** (2), (2005). pp. 1-20.
+
 .. [CFHM2013] Wei Chen, Wenjie Fang, Guangda Hu, Michael W. Mahoney,
               *On the Hyperbolicity of Small-World and Treelike Random Graphs*,
               Internet Mathematics 9:4 (2013), 434-491.
@@ -2000,8 +2004,8 @@ REFERENCES:
             Vol. 15, number 3, pages 835--855.
             :doi:`10.2140/pjm.1965.15.835`.
 
-.. [FH2015] \J. A. de Faria, B. Hutz. Combinatorics of Cycle Lengths on
-            Wehler K3 Surfaces over finite fields. New Zealand Journal
+.. [FH2015] \J. A. de Faria, B. Hutz. *Combinatorics of Cycle Lengths on
+            Wehler K3 Surfaces over finite fields*. New Zealand Journal
             of Mathematics 45 (2015), 19–31.
 
 .. [FIV2012] \H. Fournier, A. Ismail, and A. Vigneron. *Computing the Gromov
@@ -2010,14 +2014,18 @@ REFERENCES:
 
 .. [FK1991] \I. A. Faradjev and M. H. Klin,
             *Computer package for computations with coherent configurations*,
-            Proc. ISSAC-91, ACM Press, Bonn, 1991, pages 219–223;
+            Proc. ISSAC-91, ACM Press, Bonn, 1991, pages 219-223;
             code, by I.A.Faradjev (with contributions by A.E.Brouwer,
             D.V.Pasechnik). https://github.com/dimpase/coco
 
-.. [FM2014] Cameron Franc and Marc Masdeu, "Computing fundamental
+.. [FL2001] David Forge and Michel Las Vergnas.
+            *Orlik-Solomon type algebras*. European J. Combin.
+            **22** (5), (2001). pp. 699-704.
+
+.. [FM2014] Cameron Franc and Marc Masdeu, *Computing fundamental
             domains for the Bruhat-Tits tree for GL_2(Qp), p-adic
             automorphic forms, and the canonical embedding of Shimura
-            curves". LMS Journal of Computation and Mathematics
+            curves*. LMS Journal of Computation and Mathematics
             (2014), volume 17, issue 01, pp. 1-23.
 
 .. [FMSS1995] Fulton, MacPherson, Sottile, Sturmfels:
@@ -4028,6 +4036,10 @@ REFERENCES:
          Possibly newer version at
          http://www.wisdom.weizmann.ac.il/~regev/papers/FrobeniusSchurFunctions.ps
 
+.. [OT1994] Peter Orlik and Hiroaki Terao.
+            *Commutative algebras for arrangements*. Nagoya Math. J. **134**
+            (1994), 65-73.
+
 .. [OS2018] Se-jin Oh and Travis Scrimshaw. *Categorical relations between
             Langlands dual quantum affine algebras: Exceptional cases*.
             Preprint: :arxiv:`1802.09253` (2018).

src/doc/en/thematic_tutorials/coercion_and_categories.rst

@@ -155,7 +155,6 @@ This base class provides a lot more methods than a general parent::
      'is_integrally_closed',
      'is_noetherian',
      'is_prime_field',
-     'is_ring',
      'is_subring',
      'krull_dimension',
      'ngens',

src/doc/en/thematic_tutorials/lie/weyl_character_ring.rst

@@ -208,7 +208,7 @@ Suppose that we wish to compute the integral
    \int_{U(n)} |tr(g)|^{2k}\,dg
 
 for various `n`. Here `U(n)` is the unitary group, which is the maximal
-compact subroup of `GL(n,\mathbb{C})`. The irreducible unitary representations
+compact subgroup of `GL(n,\mathbb{C})`. The irreducible unitary representations
 of `U(n)` may be regarded as the basis elements of the WeylCharacterRing of
 type `A_r`, where `r=n-1` so we might work in that ring. The trace `tr(g)` is
 then just the character of the standard representation. We may realize
@@ -462,7 +462,7 @@ Suppose that we wish to compute the integral
    \int_{U(n)} |tr(g)|^{2k}\,dg
 
 for various `n`. Here `U(n)` is the unitary group, which is the maximal
-compact subroup of `GL(n,\mathbf{C})`, and `dg` is the Haar measure on
+compact subgroup of `GL(n,\mathbf{C})`, and `dg` is the Haar measure on
 `U(n)`, normalized so that the volume of the group is 1.
 
 The irreducible unitary representations of `U(n)` may be regarded as the basis

src/ext/threejs/threejs_template.html

@@ -317,6 +317,7 @@
 
         var mesh = new THREE.Mesh( geometry, material );
         mesh.position.set( c.x, c.y, c.z );
+        if ( transparent && json.renderOrder ) mesh.renderOrder = json.renderOrder
         scene.add( mesh );
 
         if ( 'showMeshGrid' in json ) {

src/mac-app/loading-page.html

@@ -95,14 +95,14 @@
 	},
 
 	showone:function(){
-		for (group in this.divholders){ //loop thru each array within object
+		for (var group in this.divholders){ //loop thru each array within object
 			var chosenOne=Math.floor(Math.random()*this.divholders[group].length) //randomly pick one entry from array
 			this.divholders[group][chosenOne].style.display="block" //display content corresponding to the chosen entry
 		}
 	},
 
 	showall:function(){
-		for (group in this.divholders){ //loop thru each array within object
+		for (var group in this.divholders){ //loop thru each array within object
 			for (var i=0; i<this.divholders[group].length; i++) {
                 this.divholders[group][i].style.display="block" //display content corresponding to the chosen entry
             }

src/sage/algebras/catalog.py

@@ -40,6 +40,8 @@
 - :class:`algebras.MalvenutoReutenauer <sage.combinat.fqsym.FreeQuasisymmetricFunctions>`
 - :class:`algebras.NilCoxeter
   <sage.algebras.nil_coxeter_algebra.NilCoxeterAlgebra>`
+- :class:`algebras.OrlikTerao
+  <sage.algebras.orlik_terao.OrlikTeraoAlgebra>`
 - :class:`algebras.OrlikSolomon
   <sage.algebras.orlik_solomon.OrlikSolomonAlgebra>`
 - :class:`algebras.QuantumMatrixCoordinate
@@ -85,6 +87,7 @@
 lazy_import('sage.algebras.hall_algebra', 'HallAlgebra', 'Hall')
 lazy_import('sage.algebras.jordan_algebra', 'JordanAlgebra', 'Jordan')
 lazy_import('sage.algebras.orlik_solomon', 'OrlikSolomonAlgebra', 'OrlikSolomon')
+lazy_import('sage.algebras.orlik_terao', 'OrlikTeraoAlgebra', 'OrlikTerao')
 lazy_import('sage.algebras.shuffle_algebra', 'ShuffleAlgebra', 'Shuffle')
 lazy_import('sage.algebras.schur_algebra', 'SchurAlgebra', 'Schur')
 lazy_import('sage.algebras.commutative_dga', 'GradedCommutativeAlgebra', 'GradedCommutative')

src/sage/algebras/cellular_basis.py

@@ -4,7 +4,7 @@
 
 Cellular algebras are a class of algebras introduced by Graham and Lehrer
 [GrLe1996]_. The :class:`CellularBasis` class provides a general framework for
-implementing cellular algebras and their the cell modules and simple modules.
+implementing cellular algebras and their cell modules and simple modules.
 
 Let `R` be a commutative ring. A `R`-algebra `A` is a *cellular algebra*
 if it has a *cell datum*, which is a tuple `(\Lambda, i, M, C)`,
@@ -54,7 +54,7 @@
     a c^\mu_{s} = \sum_{u \in T(\mu)} r_a(s,u) c^\mu_{u},
 
 where the scalars `r_a(s,u)` are those appearing in the definition of the cell
-datum. It follows from the cellular basis axioms that that `C^\mu` comes
+datum. It follows from the cellular basis axioms that `C^\mu` comes
 equipped with a bilinear form `\langle\ ,\ \rangle` that is determined by:
 
 .. MATH::

src/sage/algebras/finite_dimensional_algebras/finite_dimensional_algebra.py

@@ -646,7 +646,7 @@ def random_element(self, *args, **kwargs):
         """
         return self(self.zero().vector().parent().random_element(*args, **kwargs))
 
-    def _is_valid_homomorphism_(self, other, im_gens):
+    def _is_valid_homomorphism_(self, other, im_gens, base_map=None):
         """
         TESTS::
 
@@ -679,11 +679,13 @@ def _is_valid_homomorphism_(self, other, im_gens):
         """
         assert len(im_gens) == self.degree()
 
+        if base_map is None:
+            base_map = lambda x: x
         B = self.table()
         for i,gi in enumerate(im_gens):
             for j,gj in enumerate(im_gens):
                 eiej = B[j][i]
-                if (sum([other(im_gens[k]) * v for k,v in enumerate(eiej)])
+                if (sum([other(im_gens[k]) * base_map(v) for k,v in enumerate(eiej)])
                         != other(gi) * other(gj)):
                     return False
         return True

src/sage/algebras/letterplace/free_algebra_element_letterplace.pyx

@@ -15,7 +15,6 @@ AUTHOR:
 - Simon King (2011-03-23): Trac ticket :trac:`7797`
 
 """
-from __future__ import print_function
 
 from sage.libs.singular.function import lib, singular_function
 from sage.misc.misc import repr_lincomb

src/sage/algebras/lie_algebras/lie_algebra_element.pyx

@@ -82,7 +82,7 @@ cdef class LieAlgebraElement(IndexedFreeModuleElement):
             right = (<LieAlgebraElement> right).lift()
         return left * right
 
-    def _im_gens_(self, codomain, im_gens):
+    def _im_gens_(self, codomain, im_gens, base_map=None):
         """
         Return the image of ``self`` in ``codomain`` under the
         map that sends the generators of the parent of ``self``
@@ -119,7 +119,9 @@ cdef class LieAlgebraElement(IndexedFreeModuleElement):
         if not self: # If we are 0
             return s
         names = self.parent().variable_names()
-        return codomain.sum(c * t._im_gens_(codomain, im_gens, names)
+        if base_map is None:
+            base_map = lambda x: x
+        return codomain.sum(base_map(c) * t._im_gens_(codomain, im_gens, names)
                             for t, c in self._monomial_coefficients.iteritems())
 
     cpdef lift(self):