Skip to content

Commit f9465e3

Browse files
Release Managervbraun
Release Manager
authored and
vbraun
committed
Trac #20617: convert some imports in combinat to absolute imports
Let us try to start using the absolute import everywhere. URL: http://trac.sagemath.org/20617 Reported by: chapoton Ticket author(s): Frédéric Chapoton Reviewer(s): Jeroen Demeyer
2 parents feb7073 + 7d586f0 commit f9465e3

26 files changed

+268
-249
lines changed

‎src/sage/combinat/__init__.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,5 @@
4343
- :ref:`sage.graphs`
4444
4545
"""
46-
#import demo
47-
#import demo_short
48-
#import demo_algebraic_combinatorics
49-
#import tutorial_enumerated_sets
50-
import quickref
51-
import tutorial
46+
from . import quickref
47+
from . import tutorial

‎src/sage/combinat/all.py

+77-75
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
"""
22
Combinatorics features that are imported by default in the interpreter namespace
33
"""
4-
from combinat import bell_number, catalan_number, euler_number, fibonacci, \
4+
from __future__ import absolute_import
5+
6+
from .combinat import bell_number, catalan_number, euler_number, fibonacci, \
57
lucas_number1, lucas_number2, stirling_number1, stirling_number2, \
68
CombinatorialObject, CombinatorialClass, FilteredCombinatorialClass, \
79
UnionCombinatorialClass, MapCombinatorialClass, \
@@ -11,173 +13,173 @@
1113
bell_polynomial, fibonacci_sequence, \
1214
fibonacci_xrange, bernoulli_polynomial
1315

14-
from expnums import expnums
16+
from .expnums import expnums
1517

1618
from sage.combinat.crystals.all import *
17-
from rigged_configurations.all import *
19+
from .rigged_configurations.all import *
1820

1921
from sage.combinat.dlx import DLXMatrix, AllExactCovers, OneExactCover
2022

2123
# block designs, etc
2224
from sage.combinat.designs.all import *
2325

2426
# Free modules and friends
25-
from free_module import CombinatorialFreeModule
26-
from combinatorial_algebra import CombinatorialAlgebra
27-
from debruijn_sequence import DeBruijnSequences
28-
29-
from schubert_polynomial import SchubertPolynomialRing
30-
from symmetric_group_algebra import SymmetricGroupAlgebra, HeckeAlgebraSymmetricGroupT
31-
from symmetric_group_representations import SymmetricGroupRepresentation, SymmetricGroupRepresentations
32-
from yang_baxter_graph import YangBaxterGraph
27+
from .free_module import CombinatorialFreeModule
28+
from .combinatorial_algebra import CombinatorialAlgebra
29+
from .debruijn_sequence import DeBruijnSequences
30+
31+
from .schubert_polynomial import SchubertPolynomialRing
32+
from .symmetric_group_algebra import SymmetricGroupAlgebra, HeckeAlgebraSymmetricGroupT
33+
from .symmetric_group_representations import SymmetricGroupRepresentation, SymmetricGroupRepresentations
34+
from .yang_baxter_graph import YangBaxterGraph
3335
#from hall_littlewood import HallLittlewood_qp, HallLittlewood_q, HallLittlewood_p
3436

3537
#Permutations
36-
from permutation import Permutation, Permutations, Arrangements, PermutationOptions, CyclicPermutations, CyclicPermutationsOfPartition
37-
from affine_permutation import AffinePermutationGroup
38+
from .permutation import Permutation, Permutations, Arrangements, PermutationOptions, CyclicPermutations, CyclicPermutationsOfPartition
39+
from .affine_permutation import AffinePermutationGroup
3840
lazy_import('sage.combinat.colored_permutations', ['ColoredPermutations',
3941
'SignedPermutations'])
40-
from derangements import Derangements
42+
from .derangements import Derangements
4143
lazy_import('sage.combinat.baxter_permutations', ['BaxterPermutations'])
4244

4345
#RSK
44-
from rsk import RSK, RSK_inverse, robinson_schensted_knuth, robinson_schensted_knuth_inverse
46+
from .rsk import RSK, RSK_inverse, robinson_schensted_knuth, robinson_schensted_knuth_inverse
4547

4648
#PerfectMatchings
47-
from perfect_matching import PerfectMatching, PerfectMatchings
49+
from .perfect_matching import PerfectMatching, PerfectMatchings
4850

4951
# Integer lists
50-
from integer_lists import IntegerListsLex
52+
from .integer_lists import IntegerListsLex
5153

5254
#Compositions
53-
from composition import Composition, Compositions
54-
from composition_signed import SignedCompositions
55+
from .composition import Composition, Compositions
56+
from .composition_signed import SignedCompositions
5557

5658
#Partitions
57-
from partition import Partition, Partitions, PartitionsInBox,\
59+
from .partition import Partition, Partitions, PartitionsInBox,\
5860
OrderedPartitions, PartitionsGreatestLE, PartitionsGreatestEQ,\
5961
PartitionsGreatestLE, PartitionsGreatestEQ, number_of_partitions
6062

6163
from sage.combinat.partition_tuple import PartitionTuple, PartitionTuples
62-
from skew_partition import SkewPartition, SkewPartitions
64+
from .skew_partition import SkewPartition, SkewPartitions
6365

6466
#Partition algebra
65-
from partition_algebra import SetPartitionsAk, SetPartitionsPk, SetPartitionsTk, SetPartitionsIk, SetPartitionsBk, SetPartitionsSk, SetPartitionsRk, SetPartitionsRk, SetPartitionsPRk
67+
from .partition_algebra import SetPartitionsAk, SetPartitionsPk, SetPartitionsTk, SetPartitionsIk, SetPartitionsBk, SetPartitionsSk, SetPartitionsRk, SetPartitionsRk, SetPartitionsPRk
6668

6769
#Diagram algebra
68-
from diagram_algebras import PartitionAlgebra, BrauerAlgebra, TemperleyLiebAlgebra, PlanarAlgebra, PropagatingIdeal
70+
from .diagram_algebras import PartitionAlgebra, BrauerAlgebra, TemperleyLiebAlgebra, PlanarAlgebra, PropagatingIdeal
6971

7072
#Descent algebra
71-
from descent_algebra import DescentAlgebra
73+
from .descent_algebra import DescentAlgebra
7274

7375
#Vector Partitions
74-
from vector_partition import VectorPartition, VectorPartitions
76+
from .vector_partition import VectorPartition, VectorPartitions
7577

7678
#Similarity class types
77-
from similarity_class_type import PrimarySimilarityClassType, PrimarySimilarityClassTypes, SimilarityClassType, SimilarityClassTypes
79+
from .similarity_class_type import PrimarySimilarityClassType, PrimarySimilarityClassTypes, SimilarityClassType, SimilarityClassTypes
7880

7981
#Cores
80-
from core import Core, Cores
82+
from .core import Core, Cores
8183

8284
#Tableaux
83-
from tableau import Tableau, SemistandardTableau, StandardTableau, \
85+
from .tableau import Tableau, SemistandardTableau, StandardTableau, \
8486
Tableaux, StandardTableaux, SemistandardTableaux
85-
from skew_tableau import SkewTableau, SkewTableaux, StandardSkewTableaux, SemistandardSkewTableaux
86-
from ribbon_shaped_tableau import RibbonShapedTableau, RibbonShapedTableaux, StandardRibbonShapedTableaux
87-
from ribbon_tableau import RibbonTableaux, RibbonTableau, MultiSkewTableaux, MultiSkewTableau, SemistandardMultiSkewTableaux
88-
from composition_tableau import CompositionTableau, CompositionTableaux
87+
from .skew_tableau import SkewTableau, SkewTableaux, StandardSkewTableaux, SemistandardSkewTableaux
88+
from .ribbon_shaped_tableau import RibbonShapedTableau, RibbonShapedTableaux, StandardRibbonShapedTableaux
89+
from .ribbon_tableau import RibbonTableaux, RibbonTableau, MultiSkewTableaux, MultiSkewTableau, SemistandardMultiSkewTableaux
90+
from .composition_tableau import CompositionTableau, CompositionTableaux
8991

9092
from sage.combinat.tableau_tuple import TableauTuple, StandardTableauTuple, TableauTuples, StandardTableauTuples
91-
from k_tableau import WeakTableau, WeakTableaux, StrongTableau, StrongTableaux
93+
from .k_tableau import WeakTableau, WeakTableaux, StrongTableau, StrongTableaux
9294

9395
#Words
94-
from words.all import *
96+
from .words.all import *
9597

96-
from subword import Subwords
98+
from .subword import Subwords
9799

98-
from graph_path import GraphPaths
100+
from .graph_path import GraphPaths
99101

100102
#Tuples
101-
from tuple import Tuples, UnorderedTuples
103+
from .tuple import Tuples, UnorderedTuples
102104

103105
#Alternating sign matrices
104-
from alternating_sign_matrix import AlternatingSignMatrix, AlternatingSignMatrices, MonotoneTriangles, ContreTableaux, TruncatedStaircases
106+
from .alternating_sign_matrix import AlternatingSignMatrix, AlternatingSignMatrices, MonotoneTriangles, ContreTableaux, TruncatedStaircases
105107

106108
# Parking Functions
107-
from non_decreasing_parking_function import NonDecreasingParkingFunctions, NonDecreasingParkingFunction
108-
from parking_functions import ParkingFunctions, ParkingFunction
109+
from .non_decreasing_parking_function import NonDecreasingParkingFunctions, NonDecreasingParkingFunction
110+
from .parking_functions import ParkingFunctions, ParkingFunction
109111

110112
# Trees and Tamari interval posets
111113
from sage.misc.lazy_import import lazy_import
112-
from ordered_tree import (OrderedTree, OrderedTrees,
114+
from .ordered_tree import (OrderedTree, OrderedTrees,
113115
LabelledOrderedTree, LabelledOrderedTrees)
114-
from binary_tree import (BinaryTree, BinaryTrees,
116+
from .binary_tree import (BinaryTree, BinaryTrees,
115117
LabelledBinaryTree, LabelledBinaryTrees)
116118

117119
lazy_import('sage.combinat.interval_posets', ['TamariIntervalPoset', 'TamariIntervalPosets'])
118-
from rooted_tree import (RootedTree, RootedTrees,
120+
from .rooted_tree import (RootedTree, RootedTrees,
119121
LabelledRootedTree, LabelledRootedTrees)
120122

121-
from combination import Combinations
122-
from cartesian_product import CartesianProduct
123+
from .combination import Combinations
124+
from .cartesian_product import CartesianProduct
123125

124-
from set_partition import SetPartition, SetPartitions
125-
from set_partition_ordered import OrderedSetPartition, OrderedSetPartitions
126-
from subset import Subsets
126+
from .set_partition import SetPartition, SetPartitions
127+
from .set_partition_ordered import OrderedSetPartition, OrderedSetPartitions
128+
from .subset import Subsets
127129
#from subsets_pairwise import PairwiseCompatibleSubsets
128-
from necklace import Necklaces
129-
from lyndon_word import LyndonWord, LyndonWords, StandardBracketedLyndonWords
130-
from dyck_word import DyckWords, DyckWord
131-
from sloane_functions import sloane
132-
133-
from root_system.all import *
134-
from sf.all import *
135-
from ncsf_qsym.all import *
136-
from ncsym.all import *
137-
from matrices.all import *
130+
from .necklace import Necklaces
131+
from .lyndon_word import LyndonWord, LyndonWords, StandardBracketedLyndonWords
132+
from .dyck_word import DyckWords, DyckWord
133+
from .sloane_functions import sloane
134+
135+
from .root_system.all import *
136+
from .sf.all import *
137+
from .ncsf_qsym.all import *
138+
from .ncsym.all import *
139+
from .matrices.all import *
138140
# Posets
139-
from posets.all import *
141+
from .posets.all import *
140142

141143
# Cluster Algebras and Quivers
142-
from cluster_algebra_quiver.all import *
144+
from .cluster_algebra_quiver.all import *
143145

144146
#import lrcalc
145147

146-
import ranker
148+
from . import ranker
147149

148-
from integer_vector import IntegerVectors
149-
from integer_vector_weighted import WeightedIntegerVectors
150-
from integer_vectors_mod_permgroup import IntegerVectorsModPermutationGroup
150+
from .integer_vector import IntegerVectors
151+
from .integer_vector_weighted import WeightedIntegerVectors
152+
from .integer_vectors_mod_permgroup import IntegerVectorsModPermutationGroup
151153

152-
from finite_class import FiniteCombinatorialClass
154+
from .finite_class import FiniteCombinatorialClass
153155

154-
from q_analogues import gaussian_binomial, q_binomial
156+
from .q_analogues import gaussian_binomial, q_binomial
155157

156-
from species.all import *
158+
from .species.all import *
157159

158-
from multichoose_nk import MultichooseNK
160+
from .multichoose_nk import MultichooseNK
159161

160-
from kazhdan_lusztig import KazhdanLusztigPolynomial
162+
from .kazhdan_lusztig import KazhdanLusztigPolynomial
161163

162-
from degree_sequences import DegreeSequences
164+
from .degree_sequences import DegreeSequences
163165

164-
from cyclic_sieving_phenomenon import CyclicSievingPolynomial, CyclicSievingCheck
166+
from .cyclic_sieving_phenomenon import CyclicSievingPolynomial, CyclicSievingCheck
165167

166-
from sidon_sets import sidon_sets
168+
from .sidon_sets import sidon_sets
167169

168170
# Puzzles
169-
from knutson_tao_puzzles import KnutsonTaoPuzzleSolver
171+
from .knutson_tao_puzzles import KnutsonTaoPuzzleSolver
170172

171173
# Gelfand-Tsetlin patterns
172-
from gelfand_tsetlin_patterns import GelfandTsetlinPattern, GelfandTsetlinPatterns
174+
from .gelfand_tsetlin_patterns import GelfandTsetlinPattern, GelfandTsetlinPatterns
173175

174176
# Finite State Machines (Automaton, Transducer)
175177
lazy_import('sage.combinat.finite_state_machine',
176178
['Automaton', 'Transducer', 'FiniteStateMachine'])
177179
lazy_import('sage.combinat.finite_state_machine_generators',
178180
['automata', 'transducers'])
179181
# Binary Recurrence Sequences
180-
from binary_recurrence_sequences import BinaryRecurrenceSequence
182+
from .binary_recurrence_sequences import BinaryRecurrenceSequence
181183

182184
# Six Vertex Model
183185
lazy_import('sage.combinat.six_vertex_model', 'SixVertexModel')

‎src/sage/combinat/crystals/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,3 @@
2424
- The categories for crystals: :class:`Crystals`, :class:`HighestWeightCrystals`, :class:`FiniteCrystals`, :class:`ClassicalCrystals`, :class:`RegularCrystals` -- The categories for crystals
2525
- :ref:`sage.combinat.root_system`
2626
"""
27-
28-
import all

‎src/sage/combinat/crystals/all.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
"""
22
Crystal features that are imported by default in the interpreter namespace
33
"""
4-
import catalog as crystals
4+
from __future__ import absolute_import
5+
6+
from . import catalog as crystals
57

68
from sage.misc.lazy_import import lazy_import
79

‎src/sage/combinat/crystals/catalog.py

+23-21
Original file line numberDiff line numberDiff line change
@@ -46,33 +46,35 @@
4646
* :class:`DirectSum <sage.combinat.crystals.direct_sum.DirectSumOfCrystals>`
4747
* :class:`TensorProduct <sage.combinat.crystals.tensor_product.TensorProductOfCrystals>`
4848
"""
49-
from letters import CrystalOfLetters as Letters
50-
from spins import CrystalOfSpins as Spins
51-
from spins import CrystalOfSpinsPlus as SpinsPlus
52-
from spins import CrystalOfSpinsMinus as SpinsMinus
53-
from tensor_product import CrystalOfTableaux as Tableaux
54-
from fast_crystals import FastCrystal as FastRankTwo
55-
from affine import AffineCrystalFromClassical as AffineFromClassical
56-
from affine import AffineCrystalFromClassicalAndPromotion as AffineFromClassicalAndPromotion
57-
from affine_factorization import AffineFactorizationCrystal as AffineFactorization
49+
from __future__ import absolute_import
50+
51+
from .letters import CrystalOfLetters as Letters
52+
from .spins import CrystalOfSpins as Spins
53+
from .spins import CrystalOfSpinsPlus as SpinsPlus
54+
from .spins import CrystalOfSpinsMinus as SpinsMinus
55+
from .tensor_product import CrystalOfTableaux as Tableaux
56+
from .fast_crystals import FastCrystal as FastRankTwo
57+
from .affine import AffineCrystalFromClassical as AffineFromClassical
58+
from .affine import AffineCrystalFromClassicalAndPromotion as AffineFromClassicalAndPromotion
59+
from .affine_factorization import AffineFactorizationCrystal as AffineFactorization
5860
from sage.combinat.crystals.affinization import AffinizationOfCrystal as AffinizationOf
59-
from highest_weight_crystals import HighestWeightCrystal as HighestWeight
60-
from alcove_path import CrystalOfAlcovePaths as AlcovePaths
61-
from littelmann_path import CrystalOfLSPaths as LSPaths
62-
from littelmann_path import CrystalOfProjectedLevelZeroLSPaths as ProjectedLevelZeroLSPaths
63-
from kyoto_path_model import KyotoPathModel
64-
from generalized_young_walls import CrystalOfGeneralizedYoungWalls as GeneralizedYoungWalls
65-
from monomial_crystals import CrystalOfNakajimaMonomials as NakajimaMonomials
61+
from .highest_weight_crystals import HighestWeightCrystal as HighestWeight
62+
from .alcove_path import CrystalOfAlcovePaths as AlcovePaths
63+
from .littelmann_path import CrystalOfLSPaths as LSPaths
64+
from .littelmann_path import CrystalOfProjectedLevelZeroLSPaths as ProjectedLevelZeroLSPaths
65+
from .kyoto_path_model import KyotoPathModel
66+
from .generalized_young_walls import CrystalOfGeneralizedYoungWalls as GeneralizedYoungWalls
67+
from .monomial_crystals import CrystalOfNakajimaMonomials as NakajimaMonomials
6668
from sage.combinat.rigged_configurations.tensor_product_kr_tableaux import TensorProductOfKirillovReshetikhinTableaux
6769
from sage.combinat.crystals.kirillov_reshetikhin import KirillovReshetikhinCrystal as KirillovReshetikhin
6870
from sage.combinat.rigged_configurations.rc_crystal import CrystalOfRiggedConfigurations as RiggedConfigurations
6971

7072
from sage.combinat.crystals.induced_structure import InducedCrystal as Induced
7173

72-
from tensor_product import TensorProductOfCrystals as TensorProduct
73-
from direct_sum import DirectSumOfCrystals as DirectSum
74+
from .tensor_product import TensorProductOfCrystals as TensorProduct
75+
from .direct_sum import DirectSumOfCrystals as DirectSum
7476

75-
import catalog_kirillov_reshetikhin as kirillov_reshetikhin
76-
import catalog_infinity_crystals as infinity
77-
import catalog_elementary_crystals as elementary
77+
from . import catalog_kirillov_reshetikhin as kirillov_reshetikhin
78+
from . import catalog_infinity_crystals as infinity
79+
from . import catalog_elementary_crystals as elementary
7880

‎src/sage/combinat/crystals/catalog_elementary_crystals.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
* :class:`R <sage.combinat.crystals.elementary_crystals.RCrystal>`
1010
* :class:`T <sage.combinat.crystals.elementary_crystals.TCrystal>`
1111
"""
12-
from elementary_crystals import TCrystal as T
13-
from elementary_crystals import RCrystal as R
14-
from elementary_crystals import ElementaryCrystal as Elementary
15-
from elementary_crystals import ElementaryCrystal as B
16-
from elementary_crystals import ComponentCrystal as Component
12+
from __future__ import absolute_import
13+
14+
from .elementary_crystals import TCrystal as T
15+
from .elementary_crystals import RCrystal as R
16+
from .elementary_crystals import ElementaryCrystal as Elementary
17+
from .elementary_crystals import ElementaryCrystal as B
18+
from .elementary_crystals import ComponentCrystal as Component
1719

‎src/sage/combinat/crystals/catalog_infinity_crystals.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
* :class:`Star <sage.combinat.crystals.star_crystal.StarCrystal>`
1414
* :class:`Tableaux <sage.combinat.crystals.infinity_crystals.InfinityCrystalOfTableaux>`
1515
"""
16-
from generalized_young_walls import InfinityCrystalOfGeneralizedYoungWalls as GeneralizedYoungWalls
17-
from monomial_crystals import InfinityCrystalOfNakajimaMonomials as NakajimaMonomials
16+
from __future__ import absolute_import
17+
18+
from .generalized_young_walls import InfinityCrystalOfGeneralizedYoungWalls as GeneralizedYoungWalls
19+
from .monomial_crystals import InfinityCrystalOfNakajimaMonomials as NakajimaMonomials
1820
from sage.combinat.rigged_configurations.rc_infinity import InfinityCrystalOfRiggedConfigurations as RiggedConfigurations
19-
from infinity_crystals import InfinityCrystalOfTableaux as Tableaux
21+
from .infinity_crystals import InfinityCrystalOfTableaux as Tableaux
2022
from sage.combinat.crystals.polyhedral_realization import InfinityCrystalAsPolyhedralRealization as PolyhedralRealization
2123
from sage.combinat.crystals.star_crystal import StarCrystal as Star
2224
from sage.combinat.crystals.littelmann_path import InfinityCrystalOfLSPaths as LSPaths
23-

‎src/sage/combinat/crystals/catalog_kirillov_reshetikhin.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
* :func:`RiggedConfigurations
1111
<sage.combinat.rigged_configurations.rigged_configurations.KirillovReshetikhinCrystal>`
1212
"""
13-
from kirillov_reshetikhin import KashiwaraNakashimaTableaux
14-
from kirillov_reshetikhin import KirillovReshetikhinCrystalFromLSPaths as LSPaths
13+
from __future__ import absolute_import
14+
15+
from .kirillov_reshetikhin import KashiwaraNakashimaTableaux
16+
from .kirillov_reshetikhin import KirillovReshetikhinCrystalFromLSPaths as LSPaths
1517
from sage.combinat.rigged_configurations.kr_tableaux import KirillovReshetikhinTableaux
1618
from sage.combinat.rigged_configurations.rigged_configurations import KirillovReshetikhinCrystal as RiggedConfigurations
17-

0 commit comments

Comments
 (0)