Merge sagemath#33146

src/sage/combinat/cluster_algebra_quiver/mutation_class.py

@@ -22,7 +22,7 @@
 from sage.groups.perm_gps.partn_ref.refinement_graphs import search_tree, get_orbits
 from sage.rings.integer_ring import ZZ
 from sage.rings.infinity import infinity
-from sage.graphs.all import DiGraph
+from sage.graphs.digraph import DiGraph
 from sage.combinat.cluster_algebra_quiver.quiver_mutation_type import _edge_list_to_matrix
 
 

src/sage/combinat/cluster_algebra_quiver/mutation_type.py

@@ -27,8 +27,8 @@
 
 from sage.misc.cachefunc import cached_function
 from sage.misc.flatten import flatten
-from sage.graphs.all import DiGraph
-from sage.combinat.all import Combinations
+from sage.graphs.digraph import DiGraph
+from sage.combinat.combination import Combinations
 from sage.combinat.cluster_algebra_quiver.quiver_mutation_type import QuiverMutationType
 
 

src/sage/combinat/cluster_algebra_quiver/quiver.py

@@ -42,7 +42,8 @@
 from sage.rings.integer_ring import ZZ
 from sage.rings.cc import CC
 from sage.rings.infinity import infinity
-from sage.graphs.all import Graph, DiGraph
+from sage.graphs.digraph import DiGraph
+from sage.graphs.graph import Graph
 from sage.graphs.views import EdgesView
 from sage.arith.misc import gcd
 from sage.modules.free_module_element import vector

src/sage/combinat/cluster_algebra_quiver/quiver_mutation_type.py

@@ -25,7 +25,8 @@
 from sage.misc.cachefunc import cached_method
 from sage.rings.integer_ring import ZZ
 from sage.rings.infinity import infinity
-from sage.graphs.all import Graph, DiGraph
+from sage.graphs.digraph import DiGraph
+from sage.graphs.graph import Graph
 from sage.arith.all import binomial, euler_phi
 from sage.misc.misc_c import prod
 from sage.matrix.constructor import matrix

src/sage/combinat/cluster_complex.py

@@ -50,7 +50,7 @@
 from sage.categories.coxeter_groups import CoxeterGroups
 from sage.combinat.root_system.coxeter_group import CoxeterGroup
 from sage.combinat.subword_complex import SubwordComplex, SubwordComplexFacet
-from sage.rings.semirings.non_negative_integer_semiring import NN
+from sage.rings.semirings.all import NN
 
 
 class ClusterComplexFacet(SubwordComplexFacet):

src/sage/combinat/combinat.py

@@ -417,7 +417,7 @@ def bell_number(n, algorithm='flint', **options) -> Integer:
                 break
             b += v
             k += si
-        from sage.rings.all import RealField
+        from sage.rings.real_mpfr import RealField
         R = RealField(b.exact_log(2) + 1, rnd='RNDD')
         return ((R(-1).exp() / q) * b).ceil()
 

src/sage/combinat/combination.py

@@ -26,7 +26,8 @@
 # ****************************************************************************
 import itertools
 
-from sage.rings.all import ZZ, Integer
+from sage.rings.integer import Integer
+from sage.rings.integer_ring import ZZ
 from sage.arith.all import binomial
 from .integer_vector import IntegerVectors
 from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets

src/sage/combinat/crystals/alcove_path.py

@@ -8,19 +8,18 @@
 - Travis Scrimshaw (2016-06-23): implemented `\mathcal{B}(\infty)`
 
 Special thanks to: Nicolas Borie, Anne Schilling, Travis Scrimshaw, and
-Nicolas Thiery.
+Nicolas Thiéry.
 """
-
-#*****************************************************************************
+# ****************************************************************************
 #       Copyright (C) 2008 Brant Jones <brant at math.ucdavis.edu>
 #       Copyright (C) 2013 Arthur Lubovsky <alubovsky at albany.edu>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
-#                  http://www.gnu.org/licenses/
-#*****************************************************************************
+#                  https://www.gnu.org/licenses/
+# ****************************************************************************
 
 from sage.structure.parent import Parent
 from sage.structure.element import Element
@@ -29,7 +28,7 @@
 from sage.structure.richcmp import richcmp
 from sage.categories.classical_crystals import ClassicalCrystals
 from sage.categories.loop_crystals import LoopCrystals
-from sage.graphs.all import DiGraph
+from sage.graphs.digraph import DiGraph
 from sage.combinat.root_system.cartan_type import CartanType
 from sage.combinat.root_system.root_system import RootSystem
 from sage.all import vector

src/sage/combinat/crystals/crystals.py

@@ -155,20 +155,14 @@
 #  The full text of the GPL is available at:
 #
 #                  http://www.gnu.org/licenses/
-#****************************************************************************
+# ***************************************************************************
 # Acknowledgment: most of the design and implementation of this
 # library is heavily inspired from MuPAD-Combinat.
-#****************************************************************************
-
-#from sage.structure.unique_representation import UniqueRepresentation
-#from sage.structure.parent import Parent
-#from sage.structure.element import Element
-#from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
-#from sage.graphs.all import DiGraph
-#from sage.combinat import ranker
-#from sage.combinat.root_system.weyl_characters import WeylCharacter
+# ***************************************************************************
+
 from sage.combinat.backtrack import GenericBacktracker
 
+
 class CrystalBacktracker(GenericBacktracker):
     def __init__(self, crystal, index_set=None):
         r"""

src/sage/combinat/crystals/tensor_product.py

@@ -51,7 +51,7 @@
         TensorProductOfSuperCrystalsElement, TensorProductOfQueerSuperCrystalsElement)
 from sage.misc.flatten import flatten
 from sage.structure.element import get_coercion_model
-from sage.rings.semirings.non_negative_integer_semiring import NN
+from sage.rings.semirings.all import NN
 from sage.arith.misc import integer_trunc as trunc
 
 

src/sage/combinat/integer_lists/nn.py

@@ -1,6 +1,6 @@
 from sage.sets.family import Family
 from sage.combinat.integer_lists import IntegerListsLex
-from sage.rings.semirings.non_negative_integer_semiring import NN
+from sage.rings.semirings.all import NN
 from sage.sets.disjoint_union_enumerated_sets import DisjointUnionEnumeratedSets
 
 

src/sage/combinat/interval_posets.py

@@ -48,7 +48,7 @@
 from sage.misc.latex import latex
 from sage.misc.lazy_attribute import lazy_attribute
 from sage.rings.integer import Integer
-from sage.rings.all import NN
+from sage.rings.semirings.all import NN
 from sage.sets.non_negative_integers import NonNegativeIntegers
 from sage.sets.disjoint_union_enumerated_sets import DisjointUnionEnumeratedSets
 from sage.sets.family import Family

src/sage/combinat/non_decreasing_parking_function.py

@@ -38,7 +38,7 @@
 from sage.categories.infinite_enumerated_sets import InfiniteEnumeratedSets
 from sage.categories.sets_with_grading import SetsWithGrading
 from sage.categories.monoids import Monoids
-from sage.rings.all import NN
+from sage.rings.semirings.all import NN
 from sage.rings.integer import Integer
 from sage.structure.element import Element
 from sage.structure.parent import Parent

src/sage/combinat/partition.py

@@ -304,7 +304,10 @@
 from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
 
 from sage.sets.non_negative_integers import NonNegativeIntegers
-from sage.rings.all import QQ, ZZ, NN, IntegerModRing
+from sage.rings.finite_rings.integer_mod_ring import IntegerModRing
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.semirings.all import NN
 from sage.arith.all import factorial, gcd
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
 from sage.rings.integer import Integer

src/sage/combinat/partition_kleshchev.py

@@ -83,7 +83,9 @@
 from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
 from sage.categories.infinite_enumerated_sets import InfiniteEnumeratedSets
 from sage.misc.lazy_attribute import lazy_attribute
-from sage.rings.all import NN, ZZ, IntegerModRing
+from sage.rings.finite_rings.integer_mod_ring import IntegerModRing
+from sage.rings.integer_ring import ZZ
+from sage.rings.semirings.all import NN
 from sage.cpython.getattr import getattr_from_other_class
 
 from collections import defaultdict

src/sage/combinat/partition_shifting_algebras.py

@@ -28,7 +28,8 @@
 from sage.combinat.sf.sf import SymmetricFunctions
 from sage.misc.fast_methods import Singleton
 from sage.misc.cachefunc import cached_method
-from sage.rings.all import QQ, NonNegativeIntegerSemiring
+from sage.rings.rational_field import QQ
+from sage.rings.semirings.non_negative_integer_semiring import NonNegativeIntegerSemiring
 from sage.rings.integer_ring import ZZ
 
 

src/sage/combinat/partition_tuple.py

@@ -265,7 +265,9 @@ class of modules for the algebras, which are generalisations of the Specht
 from sage.groups.perm_gps.permgroup import PermutationGroup
 from sage.libs.pari.all import pari
 from sage.misc.cachefunc import cached_method
-from sage.rings.all import NN, ZZ, IntegerModRing
+from sage.rings.finite_rings.integer_mod_ring import IntegerModRing
+from sage.rings.integer_ring import ZZ
+from sage.rings.semirings.all import NN
 from sage.rings.integer import Integer
 from sage.sets.positive_integers import PositiveIntegers
 from sage.structure.parent import Parent

src/sage/combinat/path_tableaux/semistandard.py

@@ -85,10 +85,11 @@
 from sage.combinat.tableau import Tableau
 from sage.combinat.gelfand_tsetlin_patterns import GelfandTsetlinPattern
 from sage.combinat.partition import _Partitions
-from sage.rings.all import NN
+from sage.rings.semirings.all import NN
 
 ###############################################################################
 
+
 class SemistandardPathTableau(PathTableau):
     r"""
     An instance is a sequence of lists. Usually the entries will be non-negative integers

src/sage/combinat/permutation.py

@@ -246,7 +246,9 @@
 from sage.structure.list_clone import ClonableArray
 from sage.structure.global_options import GlobalOptions
 from sage.libs.gap.libgap import libgap
-from sage.rings.all import ZZ, Integer, PolynomialRing
+from sage.rings.integer import Integer
+from sage.rings.integer_ring import ZZ
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
 from sage.arith.all import factorial, multinomial
 from sage.matrix.matrix_space import MatrixSpace
 from sage.combinat.tools import transitive_ideal
@@ -7503,7 +7505,7 @@ def bistochastic_as_sum_of_permutations(M, check = True):
     """
     from sage.graphs.bipartite_graph import BipartiteGraph
     from sage.combinat.free_module import CombinatorialFreeModule
-    from sage.rings.all import RR
+    from sage.rings.real_mpfr import RR
 
     n = M.nrows()
 

src/sage/combinat/posets/poset_examples.py

@@ -612,7 +612,7 @@ def IntegerPartitionsDominanceOrder(n):
              [[4, 2], [5, 1]],
              [[5, 1], [6]]]
         """
-        from sage.rings.semirings.non_negative_integer_semiring import NN
+        from sage.rings.semirings.all import NN
         if n not in NN:
             raise ValueError('n must be an integer')
         from sage.combinat.partition import Partitions, Partition
@@ -963,7 +963,7 @@ def SetPartitions(n):
             sage: posets.SetPartitions(4)
             Finite lattice containing 15 elements
         """
-        from sage.rings.semirings.non_negative_integer_semiring import NN
+        from sage.rings.semirings.all import NN
         if n not in NN:
             raise ValueError('n must be an integer')
         from sage.combinat.set_partition import SetPartitions

src/sage/combinat/root_system/cartan_type.py

@@ -594,7 +594,7 @@ def __call__(self, *args):
         if isinstance(t, (CartanType_abstract, SuperCartanType_standard)):
             return t
 
-        from sage.rings.semirings.non_negative_integer_semiring import NN
+        from sage.rings.semirings.all import NN
         if isinstance(t, str):
             if "x" in t:
                 from . import type_reducible

src/sage/combinat/root_system/coxeter_matrix.py

@@ -24,7 +24,9 @@
 from sage.misc.classcall_metaclass import ClasscallMetaclass, typecall
 from sage.matrix.matrix_generic_dense import Matrix_generic_dense
 from sage.graphs.graph import Graph
-from sage.rings.all import ZZ, QQ, RR
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.real_mpfr import RR
 from sage.rings.infinity import infinity
 from sage.combinat.root_system.cartan_type import CartanType
 from sage.combinat.root_system.coxeter_type import CoxeterType

src/sage/combinat/root_system/root_lattice_realizations.py

@@ -3833,7 +3833,7 @@ def is_dominant_weight(self): # Or is_dominant_integral_weight?
                True
             """
             alphacheck = self.parent().simple_coroots()
-            from sage.rings.semirings.non_negative_integer_semiring import NN
+            from sage.rings.semirings.all import NN
             return all(self.inner_product(alphacheck[i]) in NN
                        for i in self.parent().index_set())
 

src/sage/combinat/root_system/type_super_A.py

@@ -442,7 +442,7 @@ def is_dominant_weight(self):
             """
             alpha = self.parent().simple_roots()
             l = self.parent().cartan_type().symmetrizer()
-            from sage.rings.semirings.non_negative_integer_semiring import NN
+            from sage.rings.semirings.all import NN
             return all(l[i] * self.inner_product(alpha[i]) in NN
                        for i in self.parent().index_set())
 

src/sage/combinat/schubert_polynomial.py

@@ -17,7 +17,9 @@
 # ****************************************************************************
 from sage.combinat.free_module import CombinatorialFreeModule
 from sage.categories.all import GradedAlgebrasWithBasis
-from sage.rings.all import Integer, PolynomialRing, ZZ
+from sage.rings.integer import Integer
+from sage.rings.integer_ring import ZZ
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
 from sage.rings.polynomial.multi_polynomial import is_MPolynomial
 from sage.combinat.permutation import Permutations, Permutation
 import sage.libs.symmetrica.all as symmetrica

src/sage/combinat/sf/jack.py

@@ -18,21 +18,21 @@
    The Clarendon Press, Oxford University Press, New York, 1995, With contributions
    by A. Zelevinsky, Oxford Science Publications.
 """
-
-#*****************************************************************************
+# ****************************************************************************
 #       Copyright (C) 2007 Mike Hansen <mhansen@gmail.com>
 #                     2012 Mike Zabrocki <mike.zabrocki@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
-#                  http://www.gnu.org/licenses/
-#*****************************************************************************
+#                  https://www.gnu.org/licenses/
+# ****************************************************************************
 
 from sage.structure.unique_representation import UniqueRepresentation
 import sage.categories.all
-from sage.rings.all import Integer, QQ
+from sage.rings.integer import Integer
+from sage.rings.rational_field import QQ
 from sage.arith.all import gcd, lcm
 from sage.rings.fraction_field import is_FractionField
 from sage.misc.misc_c import prod

src/sage/combinat/sf/k_dual.py

@@ -12,7 +12,7 @@
 
 - Mike Zabrocki - `k`-bounded Hall Littlewood P and dual `k`-Schur functions (2012-12-02)
 """
-#*****************************************************************************
+# ****************************************************************************
 #       Copyright (C) 2012 Chris Berg <chrisjamesberg@gmail.com>
 #       Based off of similar code of Jason Bandlow, Anne Schilling
 #                                    and Mike Zabrocki
@@ -26,8 +26,8 @@
 #
 #  The full text of the GPL is available at:
 #
-#                  http://www.gnu.org/licenses/
-#*****************************************************************************
+#                  https://www.gnu.org/licenses/
+# ****************************************************************************
 
 from sage.structure.parent import Parent
 from sage.structure.unique_representation import UniqueRepresentation
@@ -38,7 +38,8 @@
 from sage.misc.cachefunc import cached_method
 from sage.misc.constant_function import ConstantFunction
 from sage.categories.graded_hopf_algebras_with_basis import GradedHopfAlgebrasWithBasis
-from sage.rings.all import Integer, ZZ
+from sage.rings.integer import Integer
+from sage.rings.integer_ring import ZZ
 from sage.cpython.getattr import raw_getattr
 
 

src/sage/combinat/sf/new_kschur.py

@@ -16,7 +16,8 @@
 #
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
-from sage.rings.all import Integer, ZZ
+from sage.rings.integer import Integer
+from sage.rings.integer_ring import ZZ
 from sage.structure.unique_representation import UniqueRepresentation
 from sage.structure.parent import Parent
 from sage.categories.realizations import Realizations, Category_realization_of_parent

src/sage/combinat/sf/ns_macdonald.py

@@ -7,7 +7,8 @@
 from sage.combinat.words.word import Word
 from sage.combinat.combination import Combinations
 from sage.combinat.permutation import Permutation
-from sage.rings.all import QQ, PolynomialRing
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.rings.rational_field import QQ
 from sage.misc.misc_c import prod
 from sage.combinat.backtrack import GenericBacktracker
 from sage.structure.parent import Parent

src/sage/combinat/similarity_class_type.py

@@ -186,7 +186,9 @@ class type, it is also possible to compute the number of classes of that type
 from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
 from sage.combinat.combinat import CombinatorialElement
 from sage.combinat.partition import Partitions, Partition
-from sage.rings.all import ZZ, QQ, FractionField
+from sage.rings.fraction_field import FractionField
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
 from sage.misc.cachefunc import cached_in_parent_method, cached_function
 from sage.combinat.misc import IterableFunctionCall