Changeset 8382:63030fe75bbc

Timestamp:

12/11/07 18:31:36 (6 years ago)

Author:

jvoight@…

Branch:

default

Parents:

8381:8af290b3f48d (diff), 7543:7110a20969c8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged.

Files:

• .hgtags (modified) (1 diff)
• sage/combinat/combinat.py (modified) (2 diffs)
• sage/rings/algebraic_real.py (deleted)
• sage/rings/number_field/number_field_element.pyx (modified) (1 diff)
• sage/rings/number_field/number_field_element.pyx (modified) (11 diffs)
• setup.py (modified) (2 diffs)
• setup.py (modified) (5 diffs)

.hgtags

@@ -151 +151 @@
 d36d439bc32c0006b1ba3b1e13e3272ab445f403 2.8.14.rc3
 7db04fcb81ab2504e1a76648c2fcd01b30418b28 2.8.14
+10ffb2e25cf62efa95179fb7f097904ed1af4a86 2.8.15.alpha0
+1a7f1fcb0a5c8221c4b2c45ac431e4aa85bbe750 2.8.15.alpha1
+92dacf17ba7774d65157131d4ce0e5265ea8f8fb 2.8.15.alpha2
+f45713981d79e0b74adbf002011043f16d8982f3 2.8.15.rc0
+612d5a72a9e1a9c4eb90a0c746da5a358882b5a0 2.9.15.rc1
+f70aef4f56461965fbbc68b0945a07f38b3ecf4c 2.8.15

sage/combinat/combinat.py

@@ -193 +193 @@
 
 from sage.interfaces.all import gap, maxima
-from sage.rings.all import QQ, RR, ZZ, RealField
+from sage.rings.all import QQ, ZZ
 from sage.rings.arith import binomial
 from sage.misc.sage_eval import sage_eval
@@ -2536 +2536 @@
     """
     return sage_eval(maxima.eval("bernpoly(x,%s)"%n), {'x':x})
-
-
-def rencontres_number(n, k):
-    r"""
-    Returns the Rencontres number D(n,k), the number of permutations of
-    {1, 2,..., n} with k fixed points.
-
-    EXAMPLES:
-    Because 312 and 231 are the two permutations of {1, 2, 3} with 0
-    fixed points, we have:
-    
-        sage: rencontres_number(3,0)
-        2
-
-    More examples:
-        sage: rencontres_number(6,1)
-        264
-          
-
-    REFERENCES:
-        http://en.wikipedia.org/wiki/Rencontres_number
-        
-        Sequence A008290 in the OEIS.
-
-    AUTHORS:
-        -- Dan Drake, 2007-11-27: post to sage-devel
-        -- William Stein, 2007-11-27: referee and clean up for inclusion in sage
-    """
-    F = factorial(n - k)
-    # Sufficient precision needed to guarantee the correct result (this is overkill somewhat)
-    R = RealField(10*F.bits() + 53)
-    e = R(1).exp()
-    if (n - k) % 2 == 0:
-        return binomial(n, k) * (F/e).ceil()
-    else:
-        return binomial(n, k) * (F/e).floor()
-

sage/rings/number_field/number_field_element.pyx

@@ -601 +601 @@
         """
         return self.number_field().complex_embeddings(prec)[i](self)
+
+    def is_totally_positive(self):
+        """
+        Returns True if self is positive for all real embeddings of 
+        its parent number field.  We do nothing at complex places,
+        so e.g. any element of a totally complex number field will return
+        True.
+
+        EXAMPLES:
+            sage: F.<b> = NumberField(x^3-3*x-1)
+            sage: b.is_totally_positive()
+            False
+            sage: (b^2).is_totally_positive()
+            True
+        """
+        for v in self.number_field().real_embeddings():
+            if v(self) <= 0:
+                return False
+        return True    
 
     def is_square(self, root=False):

sage/rings/number_field/number_field_element.pyx

@@ -126 +126 @@
         x = <NumberFieldElement>PY_NEW_SAME_TYPE(self)
         x._parent = self._parent
+        x.__fld_numerator = self.__fld_numerator
+        x.__fld_denominator = self.__fld_denominator
         return x
 
@@ -176 +178 @@
         """
         sage.rings.field_element.FieldElement.__init__(self, parent)
+        if isinstance(parent, number_field.NumberField_relative):
+            self.__fld_numerator, self.__fld_denominator = parent.absolute_polynomial_ntl()
+        else:
+            self.__fld_numerator, self.__fld_denominator = parent.polynomial_ntl()
 
         cdef ZZ_c coeff
@@ -277 +283 @@
         cdef NumberFieldElement x = <NumberFieldElement>PY_NEW_SAME_TYPE(self)
         x._parent = <ParentWithBase>new_parent
+        x.__fld_numerator, x.__fld_denominator = new_parent.polynomial_ntl()
         x.__denominator = self.__denominator
         cdef ZZX_c result
@@ -757 +764 @@
         cdef ZZX_c temp
         cdef ZZ_c temp1
-        cdef ZZ_c parent_den
-        cdef ZZX_c parent_num
-        self._parent_poly_c_( &parent_num, &parent_den )
         x = self._new()
         _sig_on
         # MulMod doesn't handle non-monic polynomials.
         # Therefore, we handle the non-monic case entirely separately.
-        if ZZX_is_monic( &parent_num ):
+        if ZZX_is_monic( &self.__fld_numerator.x ):
             ZZ_mul(x.__denominator, self.__denominator, _right.__denominator)
-            ZZX_MulMod(x.__numerator, self.__numerator, _right.__numerator, parent_num)
+            ZZX_MulMod(x.__numerator, self.__numerator, _right.__numerator, self.__fld_numerator.x)
         else:
             ZZ_mul(x.__denominator, self.__denominator, _right.__denominator)
             ZZX_mul(x.__numerator, self.__numerator, _right.__numerator)
-            if ZZX_deg(x.__numerator) >= ZZX_deg(parent_num):
-                ZZX_mul_ZZ( x.__numerator, x.__numerator, parent_den )
-                ZZX_mul_ZZ( temp, parent_num, x.__denominator )
-                ZZ_power(temp1,ZZX_LeadCoeff(temp),ZZX_deg(x.__numerator)-ZZX_deg(parent_num)+1)
+            if ZZX_deg(x.__numerator) >= ZZX_deg(self.__fld_numerator.x):
+                ZZX_mul_ZZ( x.__numerator, x.__numerator, self.__fld_denominator.x )
+                ZZX_mul_ZZ( temp, self.__fld_numerator.x, x.__denominator )
+                ZZ_power(temp1,ZZX_LeadCoeff(temp),ZZX_deg(x.__numerator)-ZZX_deg(self.__fld_numerator.x)+1)
                 ZZX_PseudoRem(x.__numerator, x.__numerator, temp)
-                ZZ_mul(x.__denominator, x.__denominator, parent_den)
+                ZZ_mul(x.__denominator, x.__denominator, self.__fld_denominator.x)
                 ZZ_mul(x.__denominator, x.__denominator, temp1)
         _sig_off
@@ -815 +819 @@
         cdef ZZX_c inv_num
         cdef ZZ_c inv_den
-        cdef ZZ_c parent_den
-        cdef ZZX_c parent_num
         cdef ZZX_c temp
         cdef ZZ_c temp1
         if not _right:
             raise ZeroDivisionError, "Number field element division by zero"
-        self._parent_poly_c_( &parent_num, &parent_den )
         x = self._new()
         _sig_on
         _right._invert_c_(&inv_num, &inv_den)
-        if ZZX_is_monic( &parent_num ):
+        if ZZX_is_monic( &self.__fld_numerator.x ):
             ZZ_mul(x.__denominator, self.__denominator, inv_den)
-            ZZX_MulMod(x.__numerator, self.__numerator, inv_num, parent_num)
+            ZZX_MulMod(x.__numerator, self.__numerator, inv_num, self.__fld_numerator.x)
         else:
             ZZ_mul(x.__denominator, self.__denominator, inv_den)
             ZZX_mul(x.__numerator, self.__numerator, inv_num)
-            if ZZX_deg(x.__numerator) >= ZZX_deg(parent_num):
-                ZZX_mul_ZZ( x.__numerator, x.__numerator, parent_den )
-                ZZX_mul_ZZ( temp, parent_num, x.__denominator )
-                ZZ_power(temp1,ZZX_LeadCoeff(temp),ZZX_deg(x.__numerator)-ZZX_deg(parent_num)+1)
+            if ZZX_deg(x.__numerator) >= ZZX_deg(self.__fld_numerator.x):
+                ZZX_mul_ZZ( x.__numerator, x.__numerator, self.__fld_denominator.x )
+                ZZX_mul_ZZ( temp, self.__fld_numerator.x, x.__denominator )
+                ZZ_power(temp1,ZZX_LeadCoeff(temp),ZZX_deg(x.__numerator)-ZZX_deg(self.__fld_numerator.x)+1)
                 ZZX_PseudoRem(x.__numerator, x.__numerator, temp)
-                ZZ_mul(x.__denominator, x.__denominator, parent_den)
+                ZZ_mul(x.__denominator, x.__denominator, self.__fld_denominator.x)
                 ZZ_mul(x.__denominator, x.__denominator, temp1)
         x._reduce_c_()
@@ -942 +943 @@
 
     cdef void _parent_poly_c_(self, ZZX_c *num, ZZ_c *den):
+        """
+        I believe this function should be removed since I've put the pointer 
+        __fld_numerator and __fld_denominator in the element class.  I'm not 
+        going to remove it quite yet, but feel free to remove it if you agree 
+        with me that it should go.
+        """
         raise NotImplementedError, "NumberFieldElement subclasses must override _parent_poly_c_()"
 
@@ -958 +965 @@
             Check __invert__ for doc-tests that rely on this functionality.
         """
-        cdef ZZ_c parent_den
-        cdef ZZX_c parent_num
-        self._parent_poly_c_( &parent_num, &parent_den )
-
         cdef ZZX_c t # unneeded except to be there
         cdef ZZX_c a, b
-        ZZX_mul_ZZ( a, self.__numerator, parent_den )
-        ZZX_mul_ZZ( b, parent_num, self.__denominator )
+        ZZX_mul_ZZ( a, self.__numerator, self.__fld_denominator.x )
+        ZZX_mul_ZZ( b, self.__fld_numerator.x, self.__denominator )
         ZZX_XGCD( den[0], num[0],  t, a, b, 1 )
-        ZZX_mul_ZZ( num[0], num[0], parent_den )
+        ZZX_mul_ZZ( num[0], num[0], self.__fld_denominator.x )
         ZZX_mul_ZZ( num[0], num[0], self.__denominator )
 
@@ -1648 +1651 @@
         
     cdef void _parent_poly_c_(self, ZZX_c *num, ZZ_c *den):
+        """
+        I believe this function should be removed since I've put the pointer 
+        __fld_numerator and __fld_denominator in the element class.  I'm not 
+        going to remove it quite yet, but feel free to remove it if you agree 
+        with me that it should go.
+        """
         cdef ntl_ZZX _num
         cdef ntl_ZZ _den
@@ -1762 +1771 @@
 
     cdef void _parent_poly_c_(self, ZZX_c *num, ZZ_c *den):
+        """
+        I believe this function should be removed since I've put the pointer 
+        __fld_numerator and __fld_denominator in the element class.  I'm not 
+        going to remove it quite yet, but feel free to remove it if you agree 
+        with me that it should go.
+        """
         f = self.number_field().absolute_polynomial()
         _ntl_poly(f, num, den)
@@ -1859 +1874 @@
         """
         cdef OrderElement_absolute x
-        x = <NumberFieldElement>PY_NEW_SAME_TYPE(self)
+        x = <OrderElement_absolute>PY_NEW_SAME_TYPE(self)
         x._parent = self._parent
         x._number_field = self._parent.number_field()
+        x.__fld_numerator = self.__fld_numerator
+        x.__fld_denominator = self.__fld_denominator
         return x
 
@@ -1902 +1919 @@
         """
         cdef OrderElement_relative x
-        x = <NumberFieldElement>PY_NEW_SAME_TYPE(self)
+        x = <OrderElement_relative>PY_NEW_SAME_TYPE(self)
         x._parent = self._parent
         x._number_field = self._parent.number_field()
+        x.__fld_numerator = self.__fld_numerator
+        x.__fld_denominator = self.__fld_denominator
         return x
 

setup.py

@@ -778 +778 @@
               sources = ['sage/rings/number_field/number_field_base.pyx']), \
 
+    Extension('sage.rings.number_field.totallyreal_data',
+              ['sage/rings/number_field/totallyreal_data.pyx'],
+              libraries = ['gmp']), \
+
     Extension('sage.rings.morphism',
-              sources = ['sage/rings/morphism.pyx']),
+              sources = ['sage/rings/morphism.pyx']), \
 
     Extension('sage.structure.wrapper_parent',
@@ -1209 +1213 @@
 
       data_files = [('dsage/web/static',                       
-                     ['sage/dsage/web/static/dsage_web.css',
-                      'sage/dsage/web/static/dsage_web.js',
-                      'sage/dsage/web/static/jquery-latest.js',
-                      'sage/dsage/web/static/jquery.tablesorter.pack.js',
-                      'sage/dsage/web/static/index.html'])],
+                    ['sage/dsage/web/static/dsage_web.css',
+                     'sage/dsage/web/static/dsage_web.js',
+                     'sage/dsage/web/static/jquery-latest.js',
+                     'sage/dsage/web/static/jquery.tablesorter.pack.js',
+                     'sage/dsage/web/static/jquery.history.js',
+                     'sage/dsage/web/static/asc.gif',
+                     'sage/dsage/web/static/desc.gif',
+                     'sage/dsage/web/static/bg.gif',
+                     'sage/dsage/README.html']),
+                    ('dsage/web/',
+                    ['sage/dsage/web/index.html'])],
       
       ext_modules = ext_modules,

setup.py

@@ -287 +287 @@
 libsingular = Extension('sage.libs.singular.singular',
                         sources = ['sage/libs/singular/singular.pyx'],
-                        libraries = ['gmp', 'm', 'readline', 'singular', 'singfac', 'singcf', 'omalloc', 'givaro', 'gmpxx'],
+                        libraries = ['m', 'readline', 'singular', 'singfac', 'singcf', 'omalloc', 'givaro', 'gmpxx', 'gmp'],
                         language="c++",
                         include_dirs=[SAGE_ROOT +'/local/include/singular']
@@ -363 +363 @@
 matrix_mpolynomial_dense = Extension('sage.matrix.matrix_mpolynomial_dense',
                                      ['sage/matrix/matrix_mpolynomial_dense.pyx'],
-                                     libraries = ['gmp', 'm', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx'],
+                                     libraries = ['m', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx', 'gmp'],
                                      language="c++",
                                      include_dirs=[SAGE_ROOT +'/local/include/singular'])
@@ -616 +616 @@
     Extension('sage.rings.polynomial.multi_polynomial_libsingular',
               sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx'],
-              libraries = ['gmp', 'm', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx'],
+              libraries = ['m', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx', 'gmp'],
               language="c++",
               include_dirs=[SAGE_ROOT +'/local/include/singular']), \
@@ -622 +622 @@
     Extension('sage.rings.polynomial.multi_polynomial_ideal_libsingular',
               sources = ['sage/rings/polynomial/multi_polynomial_ideal_libsingular.pyx'],
-              libraries = ['gmp', 'm', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx'],
+              libraries = ['m', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx', 'gmp'],
               language="c++",
               include_dirs=[SAGE_ROOT +'/local/include/singular']), \
@@ -659 +659 @@
     Extension('sage.rings.real_mpfi',
               sources = ['sage/rings/real_mpfi.pyx'],
+              libraries = ['mpfi', 'mpfr', 'gmp']), \
+
+    Extension('sage.rings.complex_interval',
+              sources = ['sage/rings/complex_interval.pyx'],
               libraries = ['mpfi', 'mpfr', 'gmp']), \