@@ -26,22 +26,19 @@ AUTHORS:
26
26
# ****************************************************************************
27
27
28
28
from sage.data_structures.bitset_base cimport *
29
- import sage.matroids.matroid
30
- import sage.matroids.basis_exchange_matroid
29
+ from sage.libs.gmp.mpq cimport mpq_set
30
+ from sage.rings.rational cimport Rational
31
+
31
32
from sage.matroids.basis_matroid cimport BasisMatroid
32
- from sage.matroids.circuit_closures_matroid cimport CircuitClosuresMatroid
33
33
from sage.matroids.circuits_matroid cimport CircuitsMatroid
34
+ from sage.matroids.circuit_closures_matroid cimport CircuitClosuresMatroid
34
35
from sage.matroids.dual_matroid import DualMatroid
35
- from sage.matroids.lean_matrix cimport GenericMatrix, BinaryMatrix, TernaryMatrix, QuaternaryMatrix, PlusMinusOneMatrix, RationalMatrix
36
36
from sage.matroids.graphic_matroid import GraphicMatroid
37
+ from sage.matroids.lean_matrix cimport GenericMatrix, BinaryMatrix, TernaryMatrix, QuaternaryMatrix, PlusMinusOneMatrix, RationalMatrix
37
38
from sage.matroids.linear_matroid cimport LinearMatroid, RegularMatroid, BinaryMatroid, TernaryMatroid, QuaternaryMatroid
38
39
from sage.matroids.minor_matroid import MinorMatroid
39
40
40
41
41
- from sage.rings.rational cimport Rational
42
- from sage.libs.gmp.mpq cimport mpq_set
43
-
44
-
45
42
# ############################################################################
46
43
# BasisMatroid
47
44
# ############################################################################
@@ -403,11 +400,11 @@ def unpickle_rational_matrix(version, data):
403
400
mpq_set(A._entries[i], (< Rational?> data[2 ][i]).value)
404
401
return A
405
402
403
+
406
404
# ############################################################################
407
405
# LinearMatroid and subclasses
408
406
# ############################################################################
409
407
410
-
411
408
def unpickle_linear_matroid (version , data ):
412
409
"""
413
410
Unpickle a LinearMatroid.
@@ -688,11 +685,11 @@ def unpickle_minor_matroid(version, data):
688
685
M.rename(data[3 ])
689
686
return M
690
687
688
+
691
689
# ############################################################################
692
690
# Graphic Matroids
693
691
# ############################################################################
694
692
695
-
696
693
def unpickle_graphic_matroid (version , data ):
697
694
"""
698
695
Unpickle a GraphicMatroid.
0 commit comments