Skip to content

Commit e905174

Browse files
committed
matroids: no relative imports
1 parent bb9d488 commit e905174

16 files changed

+49
-49
lines changed

src/sage/matroids/advanced.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@
5252

5353
import sage.matroids.matroid
5454
import sage.matroids.basis_exchange_matroid
55-
from .minor_matroid import MinorMatroid
56-
from .dual_matroid import DualMatroid
57-
from .rank_matroid import RankMatroid
58-
from .circuits_matroid import CircuitsMatroid
59-
from .circuit_closures_matroid import CircuitClosuresMatroid
60-
from .basis_matroid import BasisMatroid
61-
from .flats_matroid import FlatsMatroid
62-
from .linear_matroid import LinearMatroid, RegularMatroid, BinaryMatroid, TernaryMatroid, QuaternaryMatroid
63-
from .utilities import setprint, newlabel, get_nonisomorphic_matroids, lift_cross_ratios, lift_map
64-
from . import lean_matrix
65-
from .extension import LinearSubclasses, MatroidExtensions
66-
from .union_matroid import MatroidUnion, MatroidSum, PartitionMatroid
67-
from .graphic_matroid import GraphicMatroid
55+
from sage.matroids.minor_matroid import MinorMatroid
56+
from sage.matroids.dual_matroid import DualMatroid
57+
from sage.matroids.rank_matroid import RankMatroid
58+
from sage.matroids.circuits_matroid import CircuitsMatroid
59+
from sage.matroids.circuit_closures_matroid import CircuitClosuresMatroid
60+
from sage.matroids.basis_matroid import BasisMatroid
61+
from sage.matroids.flats_matroid import FlatsMatroid
62+
from sage.matroids.linear_matroid import LinearMatroid, RegularMatroid, BinaryMatroid, TernaryMatroid, QuaternaryMatroid
63+
from sage.matroids.utilities import setprint, newlabel, get_nonisomorphic_matroids, lift_cross_ratios, lift_map
64+
from sage.matroids. import lean_matrix
65+
from sage.matroids.extension import LinearSubclasses, MatroidExtensions
66+
from sage.matroids.union_matroid import MatroidUnion, MatroidSum, PartitionMatroid
67+
from sage.matroids.graphic_matroid import GraphicMatroid

src/sage/matroids/basis_exchange_matroid.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from sage.data_structures.bitset cimport *
22
from sage.data_structures.bitset_base cimport bitset_t, bitset_s
3-
from .matroid cimport Matroid
4-
from .set_system cimport SetSystem
3+
from sage.matroids.matroid cimport Matroid
4+
from sage.matroids.set_system cimport SetSystem
55

66
cdef class BasisExchangeMatroid(Matroid):
77
cdef long _groundset_size, _matroid_rank, _bitset_size

src/sage/matroids/basis_exchange_matroid.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ AUTHORS:
2525
# https://www.gnu.org/licenses/
2626
# ****************************************************************************
2727

28-
from .matroid cimport Matroid
29-
from .set_system cimport SetSystem
28+
from sage.matroids.matroid cimport Matroid
29+
from sage.matroids.set_system cimport SetSystem
3030
from sage.data_structures.bitset_base cimport *
3131

3232
cdef class BasisExchangeMatroid(Matroid):

src/sage/matroids/basis_matroid.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from sage.data_structures.bitset cimport bitset_t
2-
from .basis_exchange_matroid cimport BasisExchangeMatroid
3-
from .set_system cimport SetSystem
2+
from sage.matroids.basis_exchange_matroid cimport BasisExchangeMatroid
3+
from sage.matroids.set_system cimport SetSystem
44

55
cdef class BasisMatroid(BasisExchangeMatroid):
66
cdef bitset_t _bb

src/sage/matroids/basis_matroid.pyx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ from itertools import combinations
6969
from sage.data_structures.bitset_base cimport *
7070
from sage.misc.decorators import rename_keyword
7171
from sage.structure.richcmp cimport rich_to_bool
72-
from .matroid cimport Matroid
73-
from .basis_exchange_matroid cimport BasisExchangeMatroid
74-
from .set_system cimport SetSystem
75-
from .utilities import cmp_elements_key
72+
from sage.matroids.matroid cimport Matroid
73+
from sage.matroids.basis_exchange_matroid cimport BasisExchangeMatroid
74+
from sage.matroids.set_system cimport SetSystem
75+
from sage.matroids.utilities import cmp_elements_key
7676

7777
# class of general matroids, represented by their list of bases
7878

src/sage/matroids/circuit_closures_matroid.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ AUTHORS:
6060

6161
from cpython.object cimport Py_EQ, Py_NE
6262
from sage.structure.richcmp cimport rich_to_bool, richcmp
63-
from .matroid cimport Matroid
64-
from .set_system cimport SetSystem
65-
from .utilities import setprint_s, cmp_elements_key
63+
from sage.matroids.matroid cimport Matroid
64+
from sage.matroids.set_system cimport SetSystem
65+
from sage.matroids.utilities import setprint_s, cmp_elements_key
6666

6767
cdef class CircuitClosuresMatroid(Matroid):
6868
r"""

src/sage/matroids/circuits_matroid.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .matroid cimport Matroid
2-
from .set_system cimport SetSystem
1+
from sage.matroids.matroid cimport Matroid
2+
from sage.matroids.set_system cimport SetSystem
33

44
cdef class CircuitsMatroid(Matroid):
55
cdef frozenset _groundset

src/sage/matroids/circuits_matroid.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ AUTHORS:
3232

3333
from cpython.object cimport Py_EQ, Py_NE
3434
from sage.structure.richcmp cimport rich_to_bool, richcmp
35-
from .matroid cimport Matroid
36-
from .set_system cimport SetSystem
35+
from sage.matroids.matroid cimport Matroid
36+
from sage.matroids.set_system cimport SetSystem
3737

3838
cdef class CircuitsMatroid(Matroid):
3939
r"""

src/sage/matroids/constructor.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@
112112
from sage.rings.finite_rings.finite_field_base import FiniteField
113113
import sage.matroids.matroid
114114
import sage.matroids.basis_exchange_matroid
115-
from .rank_matroid import RankMatroid
116-
from .circuits_matroid import CircuitsMatroid
117-
from .flats_matroid import FlatsMatroid
118-
from .circuit_closures_matroid import CircuitClosuresMatroid
119-
from .basis_matroid import BasisMatroid
120-
from .linear_matroid import LinearMatroid, RegularMatroid, BinaryMatroid, TernaryMatroid, QuaternaryMatroid
121-
from .graphic_matroid import GraphicMatroid
115+
from sage.matroids.rank_matroid import RankMatroid
116+
from sage.matroids.circuits_matroid import CircuitsMatroid
117+
from sage.matroids.flats_matroid import FlatsMatroid
118+
from sage.matroids.circuit_closures_matroid import CircuitClosuresMatroid
119+
from sage.matroids.basis_matroid import BasisMatroid
120+
from sage.matroids.linear_matroid import LinearMatroid, RegularMatroid, BinaryMatroid, TernaryMatroid, QuaternaryMatroid
121+
from sage.matroids.graphic_matroid import GraphicMatroid
122122
import sage.matroids.utilities
123123

124124

src/sage/matroids/dual_matroid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
# https://www.gnu.org/licenses/
5252
# ****************************************************************************
5353

54-
from .matroid import Matroid
54+
from sage.matroids.matroid import Matroid
5555

5656
class DualMatroid(Matroid):
5757
r"""

0 commit comments

Comments
 (0)