Merge tag '6.4.beta1' into ticket/15767

VERSION.txt

@@ -1 +1 @@
-Sage version 6.4.beta0, released 2014-08-14
+Sage version 6.4.beta1, released 2014-08-20

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=3bf450cfe7244e6f52ecfe602689f4cf792ac9d9
-md5=ff7ba3c70a9a1a332996af18b30bbb42
-cksum=4284066357
+sha1=80f834dff7baffd5306b4269dffe547df264a72a
+md5=90e5cd2fef68232a20ac565f8efea235
+cksum=3340757205

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-44
+45

build/pkgs/maxima/SPKG.txt

@@ -69,6 +69,10 @@ The following patches are applied:
 
  * infodir.patch: Correct the path to the Info directory.
 
+ * limit-replace-logs.patch: Fix for Maxima bug #2621 (gamma limit
+   error).  Introduced in Trac #15033 (Wrong limit value of expression
+   involving gamma function).
+
  * matrixexp.patch: Fix matrixexp(matrix([%i*%pi])), which broke after
    Maxima 5.29.1.  Introduced in Trac #13973.
 

build/pkgs/maxima/package-version.txt

@@ -1 +1 @@
-5.33.0.p0
+5.33.0.p1

build/pkgs/maxima/patches/limit-replace-logs.patch

@@ -0,0 +1,54 @@
+diff --git a/src/limit.lisp b/src/limit.lisp
+index 86492cc..a56569a 100644
+--- a/src/limit.lisp
++++ b/src/limit.lisp
+@@ -3160,6 +3160,26 @@ ignoring dummy variables and array indices."
+ 		    omega))
+     (cons exp logw)))
+
++;;; if log w(x) = h(x), rewrite all subexpressions of the form
++;;; log(f(x)) as log(w^-c f(x)) + c h(x) with c the unique constant
++;;; such that w^-c f(x) is strictly less rapidly varying than w.
++(defun mrv-rewrite-logs (exp wsym logw)
++  (cond ((atom exp) exp)
++	((and (mlogp exp)
++	      (not (freeof wsym exp)))
++	 (let* ((f (cadr exp))
++		(c ($lopow (calculate-series f wsym)
++			   wsym)))
++	   (m+ (list (car exp)
++		     (m* (m^ wsym (m- c))
++			 (mrv-rewrite-logs f wsym logw)))
++	       (m* c logw))))
++	(t
++	 (cons (car exp)
++	       (mapcar (lambda (e)
++			 (mrv-rewrite-logs e wsym logw))
++		       (cdr exp))))))
++
+ ;; returns list of two elements: coeff and exponent of leading term of exp,
+ ;; after rewriting exp in term of its MRV set omega.
+ (defun mrv-leadterm (exp var omega)
+@@ -3181,7 +3201,8 @@ ignoring dummy variables and array indices."
+ 			     lo
+ 			     coef
+ 			     ((f . logw) (mrv-rewrite exp omega var wsym))
+-			     (series (calculate-series f wsym)))
++			     (series (calculate-series (mrv-rewrite-logs f wsym logw)
++						       wsym)))
+ 			    (setq series (maxima-substitute logw `((%log) ,wsym) series))
+ 			    (setq lo ($lopow series wsym))
+ 			    (when (or (not ($constantp lo))
+diff --git a/tests/rtest_limit.mac b/tests/rtest_limit.mac
+index b255d40..80ec53a 100644
+--- a/tests/rtest_limit.mac
++++ b/tests/rtest_limit.mac
+@@ -625,3 +625,8 @@ limit(log(-1/3125*((-1/2*sqrt(5) + 1/2)^n - (1/2*sqrt(5) +
+ limit(x^2*exp(-%i*x - x), x, inf);
+ 0;
+
++/* bug #2621 gamma limit error */
++
++limit(gamma(x+1/2)/(sqrt(x)*gamma(x)), x, inf);
++1;
++

src/bin/sage-banner

@@ -1,5 +1,5 @@
 ┌────────────────────────────────────────────────────────────────────┐
-│ Sage Version 6.4.beta0, Release Date: 2014-08-14                   │
+│ Sage Version 6.4.beta1, Release Date: 2014-08-20                   │
 │ Type "notebook()" for the browser-based notebook interface.        │
 │ Type "help()" for help.                                            │
 └────────────────────────────────────────────────────────────────────┘

src/bin/sage-version.sh

@@ -1,4 +1,4 @@
 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='6.4.beta0'
-SAGE_RELEASE_DATE='2014-08-14'
+SAGE_VERSION='6.4.beta1'
+SAGE_RELEASE_DATE='2014-08-20'

src/doc/en/bordeaux_2008/nf_galois_groups.rst

@@ -309,7 +309,7 @@ ideal classes containing :math:`(5,\sqrt{-30})` and
     Class group of order 4 with structure C2 x C2 of Number Field
     in a with defining polynomial x^2 + 30
     sage: category(C)
-    Category of groups
+    Category of finite commutative groups
     sage: C.gens()
     (Fractional ideal class (2, a), Fractional ideal class (3, a))
 

src/doc/en/installation/source.rst

@@ -860,6 +860,11 @@ Here are some of the more commonly used variables affecting the build process:
     These will be notably slower but, for example, make it much easier to
     pinpoint memory allocation problems.
 
+- :envvar:`SAGE_PROFILE` - controls profiling support. If this is set
+  to ``yes``, profiling support is enabled where possible. Note that
+  Python-level profiling is always avaliable; This option enables
+  profiling in Cython modules.
+
 - :envvar:`SAGE_SPKG_LIST_FILES` - if set to ``yes``, then enable verbose
   extraction of tar files, i.e. Sage's spkg files.
   Since some spkgs contain such a huge number of files that the log files

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

@@ -7,6 +7,9 @@ Numerical Optimization
    sage/numerical/knapsack
    sage/numerical/mip
    sage/numerical/linear_functions
+   sage/numerical/linear_tensor
+   sage/numerical/linear_tensor_element
+   sage/numerical/linear_tensor_constraints
    sage/numerical/optimize
    sage/numerical/interactive_simplex_method
 
@@ -22,7 +25,7 @@ LP Solver backends
    sage/numerical/backends/ppl_backend
    sage/numerical/backends/cvxopt_backend
 
-Sage also supports CBC (COIN-OR), CPLEX (ILOG), Gurobi, CVXOPT and PPL. In order to find out
+Sage also supports, via optional packages, CBC (COIN-OR), CPLEX (ILOG), and Gurobi. In order to find out
 how to use them in Sage, please refer to the `Thematic Tutorial on Linear
 Programming
 <http://www.sagemath.org/doc/thematic_tutorials/linear_programming.html>`_.