Merge branch 'develop' into public/combinat/rigged_configurations/met…

…hods-15560 * develop: (59 commits) Updated Sage version to 6.1.beta4 trac #15572: DiGraph.is_directed_acyclic handles loops pretty well Fixed bug in uniform matroid. trac #15619: Pickling multigraphs with loops and labels Trac 15619: Review commit Trac 15603: More doctests, nicer error message No need to specify caller_name in verbose() Add comments, small cosmetic changes Make q monic before computing cubic resolvent Implement splitting fields for number fields trac #15619: bug in the former definition; exception to avoid it in the future trac 8723: fix one line in isogeny_small_degree Use "in" instead of PyDict_Contains() test for membership with `x in self`; minor doc formatting change trac #15619: Pickling of immutable graphs Rebased on sage-6.1.beta2 # User Thomas Feulner <[email protected]> Implemented IntegerVectors_nk.rank(). Fixes #15609 Trac #5153: small change in documentation. Trac 7695: Variable name for all subfields where the name ends with a digit ...
sagemath · Jan 5, 2014 · fd8b9c0 · fd8b9c0
2 parents e17c7c8 + 037277a
commit fd8b9c0
Show file tree

Hide file tree

Showing 61 changed files with 5,471 additions and 724 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-Sage version 6.1.beta3, released 2014-01-04
+Sage version 6.1.beta4, released 2014-01-05
diff --git a/build/pkgs/ecl/patches/disable_sigchdl_handler.patch b/build/pkgs/ecl/patches/disable_sigchdl_handler.patch
diff --git a/src/bin/sage-banner b/src/bin/sage-banner
@@ -1,5 +1,5 @@
 ┌────────────────────────────────────────────────────────────────────┐
-│ Sage Version 6.1.beta3, Release Date: 2014-01-04                   │
+│ Sage Version 6.1.beta4, Release Date: 2014-01-05                   │
 │ Type "notebook()" for the browser-based notebook interface.        │
 │ Type "help()" for help.                                            │
 └────────────────────────────────────────────────────────────────────┘

diff --git a/src/bin/sage-version.sh b/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.1.beta3'
-SAGE_RELEASE_DATE='2014-01-04'
+SAGE_VERSION='6.1.beta4'
+SAGE_RELEASE_DATE='2014-01-05'
diff --git a/src/doc/en/reference/coding/index.rst b/src/doc/en/reference/coding/index.rst
@@ -10,6 +10,7 @@ Coding Theory
    sage/coding/guava
    sage/coding/sd_codes
    sage/coding/code_bounds
+   sage/coding/codecan/autgroup_can_label
    sage/coding/delsarte_bounds
    sage/coding/source_coding/huffman
 

diff --git a/src/doc/en/reference/number_fields/index.rst b/src/doc/en/reference/number_fields/index.rst
@@ -19,6 +19,7 @@ Algebraic Number Fields
    sage/rings/number_field/galois_group
    sage/rings/number_field/unit_group
    sage/rings/number_field/small_primes_of_degree_one
+   sage/rings/number_field/splitting_field
    sage/rings/number_field/totallyreal
    sage/rings/number_field/totallyreal_rel
    sage/rings/qqbar

diff --git a/src/doc/en/tutorial/latex.rst b/src/doc/en/tutorial/latex.rst
@@ -123,16 +123,6 @@ for display in the worksheet.  Affecting and controlling this
 process is discussed below in the section
 :ref:`sec-custom-generation`.
 
-The internal ``pretty_print()`` command illustrates the
-conversion of Sage objects to HTML code that employs MathJax in
-the notebook.  ::
-
-    sage: from sage.misc.latex import pretty_print
-    sage: pretty_print(x^12)
-    <html><script type="math/tex">\newcommand{\Bold}[1]{\mathbf{#1}}x^{12}</script></html>
-    sage: pretty_print(integrate(sin(x), x))
-    <html><script type="math/tex">\newcommand{\Bold}[1]{\mathbf{#1}}-\cos\left(x\right)</script></html>
-
 The notebook has two other features for employing TeX.
 The first is the "Typeset" button just above the first cell of a
 worksheet, to the right of the four drop-down boxes.  When

diff --git a/src/module_list.py b/src/module_list.py
@@ -182,6 +182,15 @@ def uname_specific(name, value, alternative):
     Extension('sage.coding.binary_code',
               sources = ['sage/coding/binary_code.pyx']),
 
+    Extension('sage.coding.codecan.codecan',
+              sources = ['sage/coding/codecan/codecan.pyx'],
+              libraries = ['gmp', 'flint'],
+              include_dirs = [SAGE_INC + 'FLINT/']+['sage/groups/perm_gps/partn_ref2/'],
+              depends = flint_depends),
+
+    Extension('sage.coding.codecan.autgroup_can_label',
+          sources = ['sage/coding/codecan/autgroup_can_label.pyx']),
+
     ################################
     ##
     ## sage.combinat
@@ -566,6 +575,20 @@ def uname_specific(name, value, alternative):
               extra_compile_args = ['-std=c99'],
               depends = flint_depends),
 
+        ###################################
+        ##
+        ## sage.groups.perm_gps.partn_ref2
+        ##
+        ###################################
+
+    Extension('sage.groups.perm_gps.partn_ref2.refinement_generic',
+              sources = ['sage/groups/perm_gps/partn_ref2/refinement_generic.pyx'],
+              libraries = ["csage", "flint", "gmp", "gmpxx", "stdc++"],
+              include_dirs = [SAGE_INC + 'FLINT/'],
+              extra_compile_args=["-std=c99"],
+              depends = [SAGE_ROOT + "/local/include/FLINT/flint.h"]+
+              ['sage/groups/perm_gps/partn_ref2/refinement_generic.h']),
+
     ################################
     ##
     ## sage.gsl

diff --git a/src/sage/categories/rings.py b/src/sage/categories/rings.py
@@ -616,8 +616,35 @@ def __div__(self, I):
             raise TypeError, "Use self.quo(I) or self.quotient(I) to construct the quotient ring."
 
     class ElementMethods:
-        pass
+        def is_unit(self):
+            r"""
+            Return whether this element is a unit in the ring.
+
+            .. NOTE::
+
+                This is a generic implementation for (non-commutative) rings
+                which only works for the one element, its additive inverse, and
+                the zero element.  Most rings should provide a more specialized
+                implementation.
+
+            EXAMPLES::
 
+                sage: MS = MatrixSpace(ZZ, 2)
+                sage: MS.one().is_unit()
+                True
+                sage: MS.zero().is_unit()
+                False
+                sage: MS([1,2,3,4]).is_unit()
+                Traceback (most recent call last):
+                ...
+                NotImplementedError
+
+            """
+            if self == 1 or self == -1:
+                return True
+            if self == 0: # now 0 != 1
+                return False
+            raise NotImplementedError
 
     class HomCategory(HomCategory):
         pass
diff --git a/src/sage/coding/codecan/__init__.py b/src/sage/coding/codecan/__init__.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Sage version 6.1.beta3, released 2014-01-04
		Sage version 6.1.beta4, released 2014-01-05