Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 9b329d5

Browse files
committed
some more specific imports in combinat
1 parent 3832350 commit 9b329d5

36 files changed

+109
-78
lines changed

src/sage/combinat/cluster_algebra_quiver/mutation_class.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from sage.groups.perm_gps.partn_ref.refinement_graphs import search_tree, get_orbits
2323
from sage.rings.integer_ring import ZZ
2424
from sage.rings.infinity import infinity
25-
from sage.graphs.all import DiGraph
25+
from sage.graphs.digraph import DiGraph
2626
from sage.combinat.cluster_algebra_quiver.quiver_mutation_type import _edge_list_to_matrix
2727

2828

src/sage/combinat/cluster_algebra_quiver/mutation_type.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
from sage.misc.cachefunc import cached_function
2929
from sage.misc.flatten import flatten
30-
from sage.graphs.all import DiGraph
31-
from sage.combinat.all import Combinations
30+
from sage.graphs.digraph import DiGraph
31+
from sage.combinat.combination import Combinations
3232
from sage.combinat.cluster_algebra_quiver.quiver_mutation_type import QuiverMutationType
3333

3434

src/sage/combinat/cluster_algebra_quiver/quiver.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
from sage.rings.integer_ring import ZZ
4343
from sage.rings.cc import CC
4444
from sage.rings.infinity import infinity
45-
from sage.graphs.all import Graph, DiGraph
45+
from sage.graphs.digraph import DiGraph
46+
from sage.graphs.graph import Graph
4647
from sage.graphs.views import EdgesView
4748
from sage.arith.misc import gcd
4849
from sage.modules.free_module_element import vector

src/sage/combinat/cluster_algebra_quiver/quiver_mutation_type.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
from sage.misc.cachefunc import cached_method
2626
from sage.rings.integer_ring import ZZ
2727
from sage.rings.infinity import infinity
28-
from sage.graphs.all import Graph, DiGraph
28+
from sage.graphs.digraph import DiGraph
29+
from sage.graphs.graph import Graph
2930
from sage.arith.all import binomial, euler_phi
3031
from sage.misc.misc_c import prod
3132
from sage.matrix.constructor import matrix

src/sage/combinat/combinat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ def bell_number(n, algorithm='flint', **options) -> Integer:
417417
break
418418
b += v
419419
k += si
420-
from sage.rings.all import RealField
420+
from sage.rings.real_mpfr import RealField
421421
R = RealField(b.exact_log(2) + 1, rnd='RNDD')
422422
return ((R(-1).exp() / q) * b).ceil()
423423

src/sage/combinat/combination.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
# ****************************************************************************
2727
import itertools
2828

29-
from sage.rings.all import ZZ, Integer
29+
from sage.rings.integer import Integer
30+
from sage.rings.integer_ring import ZZ
3031
from sage.arith.all import binomial
3132
from .integer_vector import IntegerVectors
3233
from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets

src/sage/combinat/crystals/alcove_path.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@
88
- Travis Scrimshaw (2016-06-23): implemented `\mathcal{B}(\infty)`
99
1010
Special thanks to: Nicolas Borie, Anne Schilling, Travis Scrimshaw, and
11-
Nicolas Thiery.
11+
Nicolas Thiéry.
1212
"""
13-
14-
#*****************************************************************************
13+
# ****************************************************************************
1514
# Copyright (C) 2008 Brant Jones <brant at math.ucdavis.edu>
1615
# Copyright (C) 2013 Arthur Lubovsky <alubovsky at albany.edu>
1716
#
1817
# This program is free software: you can redistribute it and/or modify
1918
# it under the terms of the GNU General Public License as published by
2019
# the Free Software Foundation, either version 2 of the License, or
2120
# (at your option) any later version.
22-
# http://www.gnu.org/licenses/
23-
#*****************************************************************************
21+
# https://www.gnu.org/licenses/
22+
# ****************************************************************************
2423

2524
from sage.structure.parent import Parent
2625
from sage.structure.element import Element
@@ -29,7 +28,7 @@
2928
from sage.structure.richcmp import richcmp
3029
from sage.categories.classical_crystals import ClassicalCrystals
3130
from sage.categories.loop_crystals import LoopCrystals
32-
from sage.graphs.all import DiGraph
31+
from sage.graphs.digraph import DiGraph
3332
from sage.combinat.root_system.cartan_type import CartanType
3433
from sage.combinat.root_system.root_system import RootSystem
3534
from sage.all import vector

src/sage/combinat/crystals/crystals.py

+4-10
Original file line numberDiff line numberDiff line change
@@ -155,20 +155,14 @@
155155
# The full text of the GPL is available at:
156156
#
157157
# http://www.gnu.org/licenses/
158-
#****************************************************************************
158+
# ***************************************************************************
159159
# Acknowledgment: most of the design and implementation of this
160160
# library is heavily inspired from MuPAD-Combinat.
161-
#****************************************************************************
162-
163-
#from sage.structure.unique_representation import UniqueRepresentation
164-
#from sage.structure.parent import Parent
165-
#from sage.structure.element import Element
166-
#from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
167-
#from sage.graphs.all import DiGraph
168-
#from sage.combinat import ranker
169-
#from sage.combinat.root_system.weyl_characters import WeylCharacter
161+
# ***************************************************************************
162+
170163
from sage.combinat.backtrack import GenericBacktracker
171164

165+
172166
class CrystalBacktracker(GenericBacktracker):
173167
def __init__(self, crystal, index_set=None):
174168
r"""

src/sage/combinat/interval_posets.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
from sage.misc.latex import latex
4949
from sage.misc.lazy_attribute import lazy_attribute
5050
from sage.rings.integer import Integer
51-
from sage.rings.all import NN
51+
from sage.rings.semirings.non_negative_integer_semiring import NN
5252
from sage.sets.non_negative_integers import NonNegativeIntegers
5353
from sage.sets.disjoint_union_enumerated_sets import DisjointUnionEnumeratedSets
5454
from sage.sets.family import Family

src/sage/combinat/non_decreasing_parking_function.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
from sage.categories.infinite_enumerated_sets import InfiniteEnumeratedSets
3939
from sage.categories.sets_with_grading import SetsWithGrading
4040
from sage.categories.monoids import Monoids
41-
from sage.rings.all import NN
41+
from sage.rings.semirings.non_negative_integer_semiring import NN
4242
from sage.rings.integer import Integer
4343
from sage.structure.element import Element
4444
from sage.structure.parent import Parent

src/sage/combinat/partition.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,10 @@
304304
from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
305305

306306
from sage.sets.non_negative_integers import NonNegativeIntegers
307-
from sage.rings.all import QQ, ZZ, NN, IntegerModRing
307+
from sage.rings.finite_rings.integer_mod_ring import IntegerModRing
308+
from sage.rings.integer_ring import ZZ
309+
from sage.rings.rational_field import QQ
310+
from sage.rings.semirings.non_negative_integer_semiring import NN
308311
from sage.arith.all import factorial, gcd
309312
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
310313
from sage.rings.integer import Integer

src/sage/combinat/partition_kleshchev.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@
8383
from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
8484
from sage.categories.infinite_enumerated_sets import InfiniteEnumeratedSets
8585
from sage.misc.lazy_attribute import lazy_attribute
86-
from sage.rings.all import NN, ZZ, IntegerModRing
86+
from sage.rings.finite_rings.integer_mod_ring import IntegerModRing
87+
from sage.rings.integer_ring import ZZ
88+
from sage.rings.semirings.non_negative_integer_semiring import NN
8789
from sage.cpython.getattr import getattr_from_other_class
8890

8991
from collections import defaultdict

src/sage/combinat/partition_shifting_algebras.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
from sage.combinat.sf.sf import SymmetricFunctions
2929
from sage.misc.fast_methods import Singleton
3030
from sage.misc.cachefunc import cached_method
31-
from sage.rings.all import QQ, NonNegativeIntegerSemiring
31+
from sage.rings.rational_field import QQ
32+
from sage.rings.semirings.non_negative_integer_semiring import NonNegativeIntegerSemiring
3233
from sage.rings.integer_ring import ZZ
3334

3435

src/sage/combinat/partition_tuple.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,9 @@ class of modules for the algebras, which are generalisations of the Specht
265265
from sage.groups.perm_gps.permgroup import PermutationGroup
266266
from sage.libs.pari.all import pari
267267
from sage.misc.cachefunc import cached_method
268-
from sage.rings.all import NN, ZZ, IntegerModRing
268+
from sage.rings.finite_rings.integer_mod_ring import IntegerModRing
269+
from sage.rings.integer_ring import ZZ
270+
from sage.rings.semirings.non_negative_integer_semiring import NN
269271
from sage.rings.integer import Integer
270272
from sage.sets.positive_integers import PositiveIntegers
271273
from sage.structure.parent import Parent

src/sage/combinat/path_tableaux/semistandard.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,11 @@
8585
from sage.combinat.tableau import Tableau
8686
from sage.combinat.gelfand_tsetlin_patterns import GelfandTsetlinPattern
8787
from sage.combinat.partition import _Partitions
88-
from sage.rings.all import NN
88+
from sage.rings.semirings.non_negative_integer_semiring import NN
8989

9090
###############################################################################
9191

92+
9293
class SemistandardPathTableau(PathTableau):
9394
r"""
9495
An instance is a sequence of lists. Usually the entries will be non-negative integers

src/sage/combinat/permutation.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,9 @@
246246
from sage.structure.list_clone import ClonableArray
247247
from sage.structure.global_options import GlobalOptions
248248
from sage.libs.gap.libgap import libgap
249-
from sage.rings.all import ZZ, Integer, PolynomialRing
249+
from sage.rings.integer import Integer
250+
from sage.rings.integer_ring import ZZ
251+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
250252
from sage.arith.all import factorial, multinomial
251253
from sage.matrix.matrix_space import MatrixSpace
252254
from sage.combinat.tools import transitive_ideal
@@ -7503,7 +7505,7 @@ def bistochastic_as_sum_of_permutations(M, check = True):
75037505
"""
75047506
from sage.graphs.bipartite_graph import BipartiteGraph
75057507
from sage.combinat.free_module import CombinatorialFreeModule
7506-
from sage.rings.all import RR
7508+
from sage.rings.real_mpfr import RR
75077509

75087510
n = M.nrows()
75097511

src/sage/combinat/root_system/coxeter_matrix.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
from sage.misc.classcall_metaclass import ClasscallMetaclass, typecall
2525
from sage.matrix.matrix_generic_dense import Matrix_generic_dense
2626
from sage.graphs.graph import Graph
27-
from sage.rings.all import ZZ, QQ, RR
27+
from sage.rings.integer_ring import ZZ
28+
from sage.rings.rational_field import QQ
29+
from sage.rings.real_mpfr import RR
2830
from sage.rings.infinity import infinity
2931
from sage.combinat.root_system.cartan_type import CartanType
3032
from sage.combinat.root_system.coxeter_type import CoxeterType

src/sage/combinat/schubert_polynomial.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
# ****************************************************************************
1818
from sage.combinat.free_module import CombinatorialFreeModule
1919
from sage.categories.all import GradedAlgebrasWithBasis
20-
from sage.rings.all import Integer, PolynomialRing, ZZ
20+
from sage.rings.integer import Integer
21+
from sage.rings.integer_ring import ZZ
22+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
2123
from sage.rings.polynomial.multi_polynomial import is_MPolynomial
2224
from sage.combinat.permutation import Permutations, Permutation
2325
import sage.libs.symmetrica.all as symmetrica

src/sage/combinat/sf/jack.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
The Clarendon Press, Oxford University Press, New York, 1995, With contributions
1919
by A. Zelevinsky, Oxford Science Publications.
2020
"""
21-
22-
#*****************************************************************************
21+
# ****************************************************************************
2322
# Copyright (C) 2007 Mike Hansen <[email protected]>
2423
# 2012 Mike Zabrocki <[email protected]>
2524
#
2625
# This program is free software: you can redistribute it and/or modify
2726
# it under the terms of the GNU General Public License as published by
2827
# the Free Software Foundation, either version 2 of the License, or
2928
# (at your option) any later version.
30-
# http://www.gnu.org/licenses/
31-
#*****************************************************************************
29+
# https://www.gnu.org/licenses/
30+
# ****************************************************************************
3231

3332
from sage.structure.unique_representation import UniqueRepresentation
3433
import sage.categories.all
35-
from sage.rings.all import Integer, QQ
34+
from sage.rings.integer import Integer
35+
from sage.rings.rational_field import QQ
3636
from sage.arith.all import gcd, lcm
3737
from sage.rings.fraction_field import is_FractionField
3838
from sage.misc.misc_c import prod

src/sage/combinat/sf/k_dual.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
- Mike Zabrocki - `k`-bounded Hall Littlewood P and dual `k`-Schur functions (2012-12-02)
1414
"""
15-
#*****************************************************************************
15+
# ****************************************************************************
1616
# Copyright (C) 2012 Chris Berg <[email protected]>
1717
# Based off of similar code of Jason Bandlow, Anne Schilling
1818
# and Mike Zabrocki
@@ -26,8 +26,8 @@
2626
#
2727
# The full text of the GPL is available at:
2828
#
29-
# http://www.gnu.org/licenses/
30-
#*****************************************************************************
29+
# https://www.gnu.org/licenses/
30+
# ****************************************************************************
3131

3232
from sage.structure.parent import Parent
3333
from sage.structure.unique_representation import UniqueRepresentation
@@ -38,7 +38,8 @@
3838
from sage.misc.cachefunc import cached_method
3939
from sage.misc.constant_function import ConstantFunction
4040
from sage.categories.graded_hopf_algebras_with_basis import GradedHopfAlgebrasWithBasis
41-
from sage.rings.all import Integer, ZZ
41+
from sage.rings.integer import Integer
42+
from sage.rings.integer_ring import ZZ
4243
from sage.cpython.getattr import raw_getattr
4344

4445

src/sage/combinat/sf/new_kschur.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
#
1717
# https://www.gnu.org/licenses/
1818
# ****************************************************************************
19-
from sage.rings.all import Integer, ZZ
19+
from sage.rings.integer import Integer
20+
from sage.rings.integer_ring import ZZ
2021
from sage.structure.unique_representation import UniqueRepresentation
2122
from sage.structure.parent import Parent
2223
from sage.categories.realizations import Realizations, Category_realization_of_parent

src/sage/combinat/sf/ns_macdonald.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
from sage.combinat.words.word import Word
88
from sage.combinat.combination import Combinations
99
from sage.combinat.permutation import Permutation
10-
from sage.rings.all import QQ, PolynomialRing
10+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
11+
from sage.rings.rational_field import QQ
1112
from sage.misc.misc_c import prod
1213
from sage.combinat.backtrack import GenericBacktracker
1314
from sage.structure.parent import Parent

src/sage/combinat/similarity_class_type.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ class type, it is also possible to compute the number of classes of that type
186186
from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
187187
from sage.combinat.combinat import CombinatorialElement
188188
from sage.combinat.partition import Partitions, Partition
189-
from sage.rings.all import ZZ, QQ, FractionField
189+
from sage.rings.fraction_field import FractionField
190+
from sage.rings.integer_ring import ZZ
191+
from sage.rings.rational_field import QQ
190192
from sage.misc.cachefunc import cached_in_parent_method, cached_function
191193
from sage.combinat.misc import IterableFunctionCall
192194

src/sage/combinat/sine_gordon.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
.. [NS] \T. Nakanishi, S. Stella, Wonder of sine-Gordon Y-systems,
3232
to appear in Trans. Amer. Math. Soc., :arxiv:`1212.6853`
3333
"""
34-
#*****************************************************************************
34+
# ****************************************************************************
3535
# Copyright (C) 2014 Salvatore Stella <[email protected]>
3636
#
3737
# This program is free software: you can redistribute it and/or modify
3838
# it under the terms of the GNU General Public License as published by
3939
# the Free Software Foundation, either version 2 of the License, or
4040
# (at your option) any later version.
41-
# http://www.gnu.org/licenses/
42-
#*****************************************************************************
41+
# https://www.gnu.org/licenses/
42+
# ****************************************************************************
4343

4444
from sage.structure.sage_object import SageObject
4545

4646
from sage.rings.integer_ring import ZZ
4747
from sage.rings.real_mpfr import RR
48-
from sage.rings.all import NN
48+
from sage.rings.semirings.non_negative_integer_semiring import NN
4949
from sage.functions.trig import cos, sin
5050
from sage.plot.plot import parametric_plot
5151
from sage.plot.graphics import Graphics

src/sage/combinat/skew_tableau.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
from sage.categories.infinite_enumerated_sets import InfiniteEnumeratedSets
3333
from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
3434

35-
from sage.rings.all import Integer, QQ, ZZ
35+
from sage.rings.integer import Integer
36+
from sage.rings.integer_ring import ZZ
37+
from sage.rings.rational_field import QQ
3638
from sage.arith.all import factorial
3739
from sage.rings.infinity import PlusInfinity
3840
from sage.matrix.all import zero_matrix

src/sage/combinat/species/generating_series.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -63,23 +63,24 @@
6363
.. [BLL] \F. Bergeron, G. Labelle, and P. Leroux.
6464
"Combinatorial species and tree-like structures".
6565
Encyclopedia of Mathematics and its Applications, vol. 67, Cambridge Univ. Press. 1998.
66-
.. [BLL-Intro] Francois Bergeron, Gilbert Labelle, and Pierre Leroux.
66+
.. [BLL-Intro] François Bergeron, Gilbert Labelle, and Pierre Leroux.
6767
"Introduction to the Theory of Species of Structures", March 14, 2008.
6868
"""
6969

70-
#*****************************************************************************
70+
# ****************************************************************************
7171
# Copyright (C) 2008 Mike Hansen <[email protected]>
7272
#
7373
# This program is free software: you can redistribute it and/or modify
7474
# it under the terms of the GNU General Public License as published by
7575
# the Free Software Foundation, either version 2 of the License, or
7676
# (at your option) any later version.
77-
# http://www.gnu.org/licenses/
78-
#*****************************************************************************
77+
# https://www.gnu.org/licenses/
78+
# ****************************************************************************
7979

8080
from .series import LazyPowerSeriesRing, LazyPowerSeries
8181
from .stream import Stream, _integers_from
82-
from sage.rings.all import Integer, RationalField
82+
from sage.rings.integer import Integer
83+
from sage.rings.rational_field import RationalField
8384
from sage.arith.all import moebius, gcd, lcm, divisors
8485
from sage.combinat.partition import Partition, Partitions
8586
from functools import partial

src/sage/combinat/symmetric_group_algebra.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
from sage.combinat.tableau import Tableau, StandardTableaux_size, StandardTableaux_shape, StandardTableaux
2020
from sage.algebras.group_algebra import GroupAlgebra_class
2121
from sage.categories.weyl_groups import WeylGroups
22-
from sage.rings.all import QQ, PolynomialRing
22+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
23+
from sage.rings.rational_field import QQ
2324
from sage.arith.all import factorial
2425
from sage.matrix.constructor import matrix
2526
from sage.modules.free_module_element import vector

0 commit comments

Comments
 (0)