diff options
author | Antonio Rojas | 2020-03-09 08:08:43 +0000 |
---|---|---|
committer | Antonio Rojas | 2020-03-09 08:08:43 +0000 |
commit | 02e1d58bd1cd70935d69a4990469d18be6bd2c43 (patch) | |
tree | 6f45acd101e38029fb3e7ea9aad96ffa2376db10 /sagemath-ipython7.patch | |
parent | c56b151e3722a4f61c47e4182c982a95615189bb (diff) | |
download | aur-02e1d58bd1cd70935d69a4990469d18be6bd2c43.tar.gz |
Rebase patches
Diffstat (limited to 'sagemath-ipython7.patch')
-rw-r--r-- | sagemath-ipython7.patch | 141 |
1 files changed, 107 insertions, 34 deletions
diff --git a/sagemath-ipython7.patch b/sagemath-ipython7.patch index 4666b7571678..3a9f7b270f42 100644 --- a/sagemath-ipython7.patch +++ b/sagemath-ipython7.patch @@ -286,7 +286,7 @@ diff --git a/src/sage/coding/linear_code.py b/src/sage/coding/linear_code.py index 57ef7fb896..db347b9e2f 100644 --- a/src/sage/coding/linear_code.py +++ b/src/sage/coding/linear_code.py -@@ -3840,22 +3840,22 @@ class LinearCodeSyndromeDecoder(Decoder): +@@ -2677,22 +2677,22 @@ class LinearCodeSyndromeDecoder(Decoder): sage: D = codes.decoders.LinearCodeSyndromeDecoder(C, maximum_error_weight = 1) sage: D._build_lookup_table() {(0, 0, 0, 0): (0, 0, 0, 0, 0, 0, 0, 0), @@ -321,7 +321,7 @@ index 57ef7fb896..db347b9e2f 100644 TESTS: -@@ -3869,11 +3869,11 @@ class LinearCodeSyndromeDecoder(Decoder): +@@ -2706,11 +2706,11 @@ class LinearCodeSyndromeDecoder(Decoder): sage: D = codes.decoders.LinearCodeSyndromeDecoder(C) sage: D.syndrome_table() {(0, 0): (0, 0, 0), @@ -1897,7 +1897,7 @@ index 4281de7bf0..8bc045a34b 100644 sage: LatticePolytope_PPL((0,0), (4,0), (0,4)).embed_in_reflexive_polytope() Traceback (most recent call last): diff --git a/src/sage/geometry/triangulation/element.py b/src/sage/geometry/triangulation/element.py -index a80d9111e4..5930fd9396 100644 +index 6f8222d07c..5930fd9396 100644 --- a/src/sage/geometry/triangulation/element.py +++ b/src/sage/geometry/triangulation/element.py @@ -605,32 +605,32 @@ class Triangulation(Element): @@ -1917,39 +1917,112 @@ index a80d9111e4..5930fd9396 100644 sage: triangulation = polytopes.cube().triangulate(engine='internal') sage: triangulation._boundary_simplex_dictionary() - {(0, 1, 2): ((0, 1, 2, 7),), -- (0, 1, 4): ((0, 1, 4, 7),), -- (0, 1, 7): ((0, 1, 2, 7), (0, 1, 4, 7)), -- (0, 2, 4): ((0, 2, 4, 7),), +- (0, 1, 5): ((0, 1, 5, 7),), +- (0, 1, 7): ((0, 1, 2, 7), (0, 1, 5, 7)), +- (0, 2, 3): ((0, 2, 3, 7),), +- (0, 2, 7): ((0, 1, 2, 7), (0, 2, 3, 7)), +- (0, 3, 4): ((0, 3, 4, 7),), +- (0, 3, 7): ((0, 2, 3, 7), (0, 3, 4, 7)), +- (0, 4, 5): ((0, 4, 5, 7),), +- (0, 4, 7): ((0, 3, 4, 7), (0, 4, 5, 7)), +- (0, 5, 7): ((0, 1, 5, 7), (0, 4, 5, 7)), +- (1, 2, 7): ((0, 1, 2, 7),), +- (1, 5, 6): ((1, 5, 6, 7),), +- (1, 5, 7): ((0, 1, 5, 7), (1, 5, 6, 7)), +- (1, 6, 7): ((1, 5, 6, 7),), +- (2, 3, 7): ((0, 2, 3, 7),), +- (3, 4, 7): ((0, 3, 4, 7),), +- (4, 5, 7): ((0, 4, 5, 7),), +- (5, 6, 7): ((1, 5, 6, 7),)} + {(1, 2, 7): ((0, 1, 2, 7), (1, 2, 3, 7)), - (0, 2, 7): ((0, 1, 2, 7), (0, 2, 4, 7)), ++ (0, 2, 7): ((0, 1, 2, 7), (0, 2, 4, 7)), + (0, 1, 7): ((0, 1, 2, 7), (0, 1, 4, 7)), + (0, 1, 2): ((0, 1, 2, 7),), + (1, 4, 7): ((0, 1, 4, 7), (1, 4, 5, 7)), - (0, 4, 7): ((0, 1, 4, 7), (0, 2, 4, 7)), -- (1, 2, 3): ((1, 2, 3, 7),), -- (1, 2, 7): ((0, 1, 2, 7), (1, 2, 3, 7)), ++ (0, 4, 7): ((0, 1, 4, 7), (0, 2, 4, 7)), + (0, 1, 4): ((0, 1, 4, 7),), + (2, 4, 7): ((0, 2, 4, 7), (2, 4, 6, 7)), + (0, 2, 4): ((0, 2, 4, 7),), + (2, 3, 7): ((1, 2, 3, 7),), - (1, 3, 7): ((1, 2, 3, 7),), -- (1, 4, 5): ((1, 4, 5, 7),), -- (1, 4, 7): ((0, 1, 4, 7), (1, 4, 5, 7)), ++ (1, 3, 7): ((1, 2, 3, 7),), + (1, 2, 3): ((1, 2, 3, 7),), + (4, 5, 7): ((1, 4, 5, 7),), - (1, 5, 7): ((1, 4, 5, 7),), -- (2, 3, 7): ((1, 2, 3, 7),), -- (2, 4, 6): ((2, 4, 6, 7),), -- (2, 4, 7): ((0, 2, 4, 7), (2, 4, 6, 7)), ++ (1, 5, 7): ((1, 4, 5, 7),), + (1, 4, 5): ((1, 4, 5, 7),), + (4, 6, 7): ((2, 4, 6, 7),), - (2, 6, 7): ((2, 4, 6, 7),), -- (4, 5, 7): ((1, 4, 5, 7),), -- (4, 6, 7): ((2, 4, 6, 7),)} ++ (2, 6, 7): ((2, 4, 6, 7),), + (2, 4, 6): ((2, 4, 6, 7),)} """ result = dict() for simplex in self: +@@ -655,22 +655,22 @@ class Triangulation(Element): + + sage: triangulation = polytopes.cube().triangulate(engine='internal') + sage: triangulation +- (<0,1,2,7>, <0,1,5,7>, <0,2,3,7>, <0,3,4,7>, <0,4,5,7>, <1,5,6,7>) ++ (<0,1,2,7>, <0,1,4,7>, <0,2,4,7>, <1,2,3,7>, <1,4,5,7>, <2,4,6,7>) + sage: triangulation.boundary() + frozenset({(0, 1, 2), +- (0, 1, 5), +- (0, 2, 3), +- (0, 3, 4), +- (0, 4, 5), +- (1, 2, 7), +- (1, 5, 6), +- (1, 6, 7), ++ (0, 1, 4), ++ (0, 2, 4), ++ (1, 2, 3), ++ (1, 3, 7), ++ (1, 4, 5), ++ (1, 5, 7), + (2, 3, 7), +- (3, 4, 7), ++ (2, 4, 6), ++ (2, 6, 7), + (4, 5, 7), +- (5, 6, 7)}) ++ (4, 6, 7)}) + sage: triangulation.interior_facets() +- frozenset({(0, 1, 7), (0, 2, 7), (0, 3, 7), (0, 4, 7), (0, 5, 7), (1, 5, 7)}) ++ frozenset({(0, 1, 7), (0, 2, 7), (0, 4, 7), (1, 2, 7), (1, 4, 7), (2, 4, 7)}) + """ + return frozenset(facet for facet, bounded_simplices + in iteritems(self._boundary_simplex_dictionary()) +@@ -691,22 +691,22 @@ class Triangulation(Element): + + sage: triangulation = polytopes.cube().triangulate(engine='internal') + sage: triangulation +- (<0,1,2,7>, <0,1,5,7>, <0,2,3,7>, <0,3,4,7>, <0,4,5,7>, <1,5,6,7>) ++ (<0,1,2,7>, <0,1,4,7>, <0,2,4,7>, <1,2,3,7>, <1,4,5,7>, <2,4,6,7>) + sage: triangulation.boundary() + frozenset({(0, 1, 2), +- (0, 1, 5), +- (0, 2, 3), +- (0, 3, 4), +- (0, 4, 5), +- (1, 2, 7), +- (1, 5, 6), +- (1, 6, 7), ++ (0, 1, 4), ++ (0, 2, 4), ++ (1, 2, 3), ++ (1, 3, 7), ++ (1, 4, 5), ++ (1, 5, 7), + (2, 3, 7), +- (3, 4, 7), ++ (2, 4, 6), ++ (2, 6, 7), + (4, 5, 7), +- (5, 6, 7)}) ++ (4, 6, 7)}) + sage: triangulation.interior_facets() +- frozenset({(0, 1, 7), (0, 2, 7), (0, 3, 7), (0, 4, 7), (0, 5, 7), (1, 5, 7)}) ++ frozenset({(0, 1, 7), (0, 2, 7), (0, 4, 7), (1, 2, 7), (1, 4, 7), (2, 4, 7)}) + """ + return frozenset(facet for facet, bounded_simplices + in iteritems(self._boundary_simplex_dictionary()) diff --git a/src/sage/graphs/base/boost_graph.pyx b/src/sage/graphs/base/boost_graph.pyx index 6ba0a44c9a..c50374c542 100644 --- a/src/sage/graphs/base/boost_graph.pyx @@ -2161,7 +2234,7 @@ index 8b8c98cb15..6823e13b26 100644 Weighted case:: -@@ -18864,18 +18864,18 @@ class GenericGraph(GenericGraph_pyx): +@@ -18906,18 +18906,18 @@ class GenericGraph(GenericGraph_pyx): '#00ff00': [((1,3,2,4), (1,4)(2,3), 3), ...], '#ff0000': [((1,3,2,4), (1,3)(2,4), 1), ...]} sage: G._color_by_label() # py3 @@ -2186,7 +2259,7 @@ index 8b8c98cb15..6823e13b26 100644 TESTS: -@@ -19020,8 +19020,8 @@ class GenericGraph(GenericGraph_pyx): +@@ -19062,8 +19062,8 @@ class GenericGraph(GenericGraph_pyx): sage: g.layout(layout="acyclic_dummy", save_pos=True) {('0', 0): [0.3..., 0], @@ -2196,7 +2269,7 @@ index 8b8c98cb15..6823e13b26 100644 ('1', 1): [0.6..., 1]} sage: D3 = g.layout(dim=3); D3 # random -@@ -19157,10 +19157,10 @@ class GenericGraph(GenericGraph_pyx): +@@ -19199,10 +19199,10 @@ class GenericGraph(GenericGraph_pyx): sage: g = graphs.LadderGraph(3) sage: g.layout_ranked(heights={i: (i, i+3) for i in range(3)}) {0: [0.668..., 0], @@ -2209,7 +2282,7 @@ index 8b8c98cb15..6823e13b26 100644 5: [1.33..., 2]} sage: g = graphs.LadderGraph(7) sage: g.plot(layout="ranked", heights={i: (i, i+7) for i in range(7)}) -@@ -19344,13 +19344,13 @@ class GenericGraph(GenericGraph_pyx): +@@ -19386,13 +19386,13 @@ class GenericGraph(GenericGraph_pyx): sage: G = graphs.BalancedTree(2, 2) sage: G.layout_tree(tree_root=0) @@ -2228,7 +2301,7 @@ index 8b8c98cb15..6823e13b26 100644 sage: G = graphs.BalancedTree(2, 4) sage: G.plot(layout="tree", tree_root=0, tree_orientation="up") -@@ -19362,15 +19362,15 @@ class GenericGraph(GenericGraph_pyx): +@@ -19404,15 +19404,15 @@ class GenericGraph(GenericGraph_pyx): sage: T.set_embedding({0: [1, 6, 3], 1: [2, 5, 0], 2: [1], 3: [4, 7, 8, 0], ....: 4: [3], 5: [1], 6: [0], 7: [3], 8: [3]}) sage: T.layout_tree() @@ -2251,7 +2324,7 @@ index 8b8c98cb15..6823e13b26 100644 sage: T.plot(layout="tree", tree_root=3) Graphics object consisting of 18 graphics primitives -@@ -23529,7 +23529,8 @@ class GenericGraph(GenericGraph_pyx): +@@ -23571,7 +23571,8 @@ class GenericGraph(GenericGraph_pyx): sage: G = DiGraph({1: [10], 2:[10,11], 3:[10,11], 4:[], 5:[11, 4], 6:[11], 7:[10,11], 8:[10,11], 9:[10], 10:[11, 5, 8], 11:[6]}) sage: G.katz_centrality(.85) @@ -2261,7 +2334,7 @@ index 8b8c98cb15..6823e13b26 100644 2: 0.000000000000000, 3: 0.000000000000000, 4: 16.7319819819820, -@@ -23538,7 +23539,6 @@ class GenericGraph(GenericGraph_pyx): +@@ -23581,7 +23581,6 @@ class GenericGraph(GenericGraph_pyx): 7: 0.000000000000000, 8: 18.6846846846847, 9: 0.000000000000000, @@ -2269,7 +2342,7 @@ index 8b8c98cb15..6823e13b26 100644 11: 202.778914049184} -@@ -23558,7 +23558,7 @@ class GenericGraph(GenericGraph_pyx): +@@ -23600,7 +23600,7 @@ class GenericGraph(GenericGraph_pyx): sage: graphs.PathGraph(4).katz_centrality(1/20,3) 21/379 sage: (graphs.PathGraph(3) + graphs.PathGraph(4)).katz_centrality(1/20) @@ -2308,7 +2381,7 @@ diff --git a/src/sage/graphs/graph_coloring.pyx b/src/sage/graphs/graph_coloring index 47b93c1f38..7493fd8dd1 100644 --- a/src/sage/graphs/graph_coloring.pyx +++ b/src/sage/graphs/graph_coloring.pyx -@@ -1029,10 +1029,10 @@ def edge_coloring(g, value_only=False, vizing=False, hex_colors=False, solver=No +@@ -1028,10 +1028,10 @@ def edge_coloring(g, value_only=False, vizing=False, hex_colors=False, solver=No [(0, 5), (2, 7)], [(1, 6), (3, 4), (5, 8), (7, 9)]] sage: edge_coloring(g, value_only=False, hex_colors=True, solver='GLPK') @@ -3830,7 +3903,7 @@ diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sa index 0311cd71bb..4f26f35011 100644 --- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx +++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx -@@ -3018,7 +3018,7 @@ cdef class MPolynomial_libsingular(MPolynomial): +@@ -3015,7 +3015,7 @@ cdef class MPolynomial_libsingular(MPolynomial): sage: R.<x,y,z> = QQ[] sage: f=2*x*y^3*z^2 + 1/7*x^2 + 2/3 sage: f.dict() @@ -3882,7 +3955,7 @@ diff --git a/src/sage/rings/polynomial/polynomial_ring.py b/src/sage/rings/polyn index 5e170e635b..5d5cb2f7ad 100644 --- a/src/sage/rings/polynomial/polynomial_ring.py +++ b/src/sage/rings/polynomial/polynomial_ring.py -@@ -1206,7 +1206,7 @@ class PolynomialRing_general(sage.algebras.algebra.Algebra): +@@ -1203,7 +1203,7 @@ class PolynomialRing_general(sage.algebras.algebra.Algebra): sage: R.<y,x,a42> = RR[] sage: R.gens_dict() @@ -4542,7 +4615,7 @@ diff --git a/src/sage/geometry/polyhedron/base.py b/src/sage/geometry/polyhedron index 8f740b7621..1a2ff5a135 100644 --- a/src/sage/geometry/polyhedron/base.py +++ b/src/sage/geometry/polyhedron/base.py -@@ -6035,20 +6035,20 @@ class Polyhedron_base(Element): +@@ -6072,20 +6072,20 @@ class Polyhedron_base(Element): sage: P = polytopes.twenty_four_cell() sage: P.flag_f_vector() {(-1,): 1, @@ -4571,7 +4644,7 @@ index 8f740b7621..1a2ff5a135 100644 (3,): 24, (4,): 1} -@@ -6078,18 +6078,18 @@ class Polyhedron_base(Element): +@@ -6115,18 +6115,18 @@ class Polyhedron_base(Element): sage: P = (Polyhedron(lines=[[1]]) * polytopes.cross_polytope(3)) sage: P.flag_f_vector() {(-1,): 1, @@ -4595,7 +4668,7 @@ index 8f740b7621..1a2ff5a135 100644 (2,): 12, (3,): 8, 4: 1} -@@ -6129,22 +6129,22 @@ class Polyhedron_base(Element): +@@ -6166,22 +6166,22 @@ class Polyhedron_base(Element): sage: polytopes.hypercube(4)._flag_f_vector() {(-1,): 1, |