Changeset 7661:5ecfb83c6b5b

Timestamp:

11/26/07 22:14:25 (6 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Parents:

7660:62b7be191970 (diff), 7422:dc8dedef562f (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:

Merge with 2.8.14

Files:

• sage/rings/polynomial/polynomial_element.pyx (modified) (2 diffs)
• setup.py (modified) (1 diff)
• setup.py (modified) (3 diffs)

sage/rings/polynomial/polynomial_element.pyx

@@ -2312 +2312 @@
             sage: f.roots()
             [(1, 1)]
-            sage: f.roots(ring=CC)
-            [(1.00000000000000, 1), (-0.500000000000000 + 0.866025403784438*I, 1), (-0.500000000000000 - 0.866025403784...*I, 1)]
+            sage: f.roots(ring=CC)   # note -- low order bits slightly different on ppc.
+            [(1.00000000000000, 1), (-0.500000000000000 + 0.86602540378443...*I, 1), (-0.500000000000000 - 0.86602540378443...*I, 1)]
             sage: f = (x^3 - 1)^2
             sage: f.roots()
@@ -2747 +2747 @@
         EXAMPLES:
             sage: x = polygen(ZZ)
-            sage: (x^3 - 1).complex_roots()
-            [1.00000000000000, -0.500000000000000 + 0.866025403784438*I, -0.500000000000000 - 0.866025403784...*I]
+            sage: (x^3 - 1).complex_roots()   # note: low order bits slightly different on ppc.
+            [1.00000000000000, -0.500000000000000 + 0.86602540378443...*I, -0.500000000000000 - 0.86602540378443...*I]
 
         TESTS:

setup.py

@@ -1205 +1205 @@
 
       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

@@ -211 +211 @@
                  sources = ["sage/libs/pari/gen.pyx"],
                  libraries = ['pari', 'gmp'])
+
+cremona_mat = Extension('sage.libs.cremona.mat',
+                       sources = ["sage/libs/cremona/mat.pyx"],
+                       libraries = ['g0nntl', 'jcntl', 'gmpxx', 'ntl', 'gmp', 'm', 'stdc++', ],
+                       language='c++',
+                       define_macros = [("NTL_ALL",None)]
+                       )
+
+cremona_homspace = Extension('sage.libs.cremona.homspace',
+                       sources = ["sage/libs/cremona/homspace.pyx"],
+                       libraries = ['g0nntl', 'jcntl', 'gmpxx', 'ntl', 'gmp', 'm', 'stdc++', 'pari', 'curvesntl'],
+                       language='c++',
+                       define_macros = [("NTL_ALL",None)]
+                       )
 
 
@@ -507 +521 @@
      matrix_mod2_dense,
      matrix_mpolynomial_dense, \
+
+     cremona_mat, \
+     cremona_homspace, \
 
      finite_field_givaro, \
@@ -1105 +1122 @@
                      'sage.libs.pari',
                      'sage.libs.singular',
-                     'sage.libs.symmetrica', 
+                     'sage.libs.symmetrica',
+                     'sage.libs.cremona',
 
                      'sage.logic',