Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sage.matroids: Update # needs, modularization fixes for imports #35919

Merged
merged 11 commits into from
Jul 20, 2023
Merged

sage.matroids: Update # needs, modularization fixes for imports #35919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
48b3d8d
sage.matroids: ./sage -fixdoctests --long --distribution 'sagemath-mo…
mkoeppe Jun 27, 2023
6ffbe47
sage.matroids: ./sage -fixdoctests --long --distribution 'sagemath-mo…
mkoeppe Jun 28, 2023
69056d1
sage.matroids: ./sage -fixdoctests --long --distribution 'sagemath-gr…
mkoeppe Jun 28, 2023
2d595a8
./sage --fixdoctests --only-tags src/sage/matroids/*.py
mkoeppe Jun 29, 2023
5ef344d
./sage -fixdoctests --only-tags src/sage/matroids/*.{py,pyx}
mkoeppe Jul 8, 2023
361ac0c
./sage -fixdoctests --only-tags src/sage/matroids/*.{py,pyx}
mkoeppe Jul 8, 2023
11ad882
src/sage/matroids/catalog.py: Remove duplicate imports
mkoeppe Jul 8, 2023
647b920
sage.matroids: Import fixes, # needs copied from #35095
mkoeppe Jul 8, 2023
2fedc99
Merge branch 'develop' into needs_for_sage_matroids
mkoeppe Jul 9, 2023
4d11269
src/sage/matroids/dual_matroid.py: Restore 'indirect doctest'
mkoeppe Jul 12, 2023
007f6ae
src/sage/matroids/minor_matroid.py: Restore 'indirect doctest'
mkoeppe Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/sage/matroids/advanced.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,6 @@
from . import lean_matrix
from .extension import LinearSubclasses, MatroidExtensions
from .union_matroid import MatroidUnion, MatroidSum, PartitionMatroid
from .graphic_matroid import GraphicMatroid

from sage.misc.lazy_import import lazy_import
lazy_import('sage.matroids.graphic_matroid', 'GraphicMatroid')
190 changes: 95 additions & 95 deletions src/sage/matroids/basis_exchange_matroid.pyx
View file
Open in desktop

Large diffs are not rendered by default.

132 changes: 66 additions & 66 deletions src/sage/matroids/basis_matroid.pyx
View file
Open in desktop

Large diffs are not rendered by default.

258 changes: 129 additions & 129 deletions src/sage/matroids/catalog.py
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions src/sage/matroids/circuit_closures_matroid.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ AUTHORS:
TESTS::

sage: from sage.matroids.advanced import *
sage: M = CircuitClosuresMatroid(matroids.named_matroids.Fano()) # optional - sage.rings.finite_rings
sage: TestSuite(M).run() # optional - sage.rings.finite_rings
sage: M = CircuitClosuresMatroid(matroids.named_matroids.Fano())
sage: TestSuite(M).run()

Methods
=======
Expand Down Expand Up @@ -117,8 +117,8 @@ cdef class CircuitClosuresMatroid(Matroid):
EXAMPLES::

sage: from sage.matroids.advanced import *
sage: M = CircuitClosuresMatroid(matroids.named_matroids.Fano()) # optional - sage.rings.finite_rings
sage: M # optional - sage.rings.finite_rings
sage: M = CircuitClosuresMatroid(matroids.named_matroids.Fano())
sage: M
Matroid of rank 3 on 7 elements with circuit-closures
{2: {{'a', 'b', 'f'}, {'a', 'c', 'e'}, {'a', 'd', 'g'},
{'b', 'c', 'd'}, {'b', 'e', 'g'}, {'c', 'f', 'g'},
Expand All @@ -127,7 +127,7 @@ cdef class CircuitClosuresMatroid(Matroid):
....: circuit_closures={3: ['edfg', 'acdg', 'bcfg', 'cefh',
....: 'afgh', 'abce', 'abdf', 'begh', 'bcdh', 'adeh'],
....: 4: ['abcdefgh']})
sage: M.equals(matroids.named_matroids.P8()) # optional - sage.rings.finite_rings
sage: M.equals(matroids.named_matroids.P8())
True
"""

Expand All @@ -140,8 +140,8 @@ cdef class CircuitClosuresMatroid(Matroid):
EXAMPLES::

sage: from sage.matroids.advanced import *
sage: M = CircuitClosuresMatroid(matroids.named_matroids.Fano()) # optional - sage.rings.finite_rings
sage: M # optional - sage.rings.finite_rings
sage: M = CircuitClosuresMatroid(matroids.named_matroids.Fano())
sage: M
Matroid of rank 3 on 7 elements with circuit-closures
{2: {{'a', 'b', 'f'}, {'a', 'c', 'e'}, {'a', 'd', 'g'},
{'b', 'c', 'd'}, {'b', 'e', 'g'}, {'c', 'f', 'g'},
Expand All @@ -152,7 +152,7 @@ cdef class CircuitClosuresMatroid(Matroid):
....: circuit_closures={3: ['edfg', 'acdg', 'bcfg', 'cefh',
....: 'afgh', 'abce', 'abdf', 'begh', 'bcdh', 'adeh'],
....: 4: ['abcdefgh']})
sage: M.equals(matroids.named_matroids.P8()) # optional - sage.rings.finite_rings
sage: M.equals(matroids.named_matroids.P8())
True
"""
if M is not None:
Expand Down Expand Up @@ -348,17 +348,17 @@ cdef class CircuitClosuresMatroid(Matroid):
EXAMPLES::

sage: from sage.matroids.advanced import *
sage: M = CircuitClosuresMatroid(matroids.named_matroids.Fano()) # optional - sage.rings.finite_rings
sage: CC = M.circuit_closures() # optional - sage.rings.finite_rings
sage: len(CC[2]) # optional - sage.rings.finite_rings
sage: M = CircuitClosuresMatroid(matroids.named_matroids.Fano())
sage: CC = M.circuit_closures()
sage: len(CC[2])
7
sage: len(CC[3]) # optional - sage.rings.finite_rings
sage: len(CC[3])
1
sage: len(CC[1]) # optional - sage.rings.finite_rings
sage: len(CC[1])
Traceback (most recent call last):
...
KeyError: 1
sage: [sorted(X) for X in CC[3]] # optional - sage.rings.finite_rings
sage: [sorted(X) for X in CC[3]]
[['a', 'b', 'c', 'd', 'e', 'f', 'g']]
"""
return self._circuit_closures
Expand Down Expand Up @@ -387,16 +387,16 @@ cdef class CircuitClosuresMatroid(Matroid):

sage: from sage.matroids.advanced import *
sage: M1 = CircuitClosuresMatroid(matroids.Wheel(3))
sage: M2 = matroids.CompleteGraphic(4) # optional - sage.graphs
sage: M1._is_isomorphic(M2) # optional - sage.graphs
sage: M2 = matroids.CompleteGraphic(4) # needs sage.graphs
sage: M1._is_isomorphic(M2) # needs sage.graphs
True
sage: M1._is_isomorphic(M2, certificate=True) # optional - sage.graphs
sage: M1._is_isomorphic(M2, certificate=True) # needs sage.graphs
(True, {0: 0, 1: 1, 2: 2, 3: 3, 4: 5, 5: 4})
sage: M1 = CircuitClosuresMatroid(matroids.named_matroids.Fano()) # optional - sage.rings.finite_rings
sage: M2 = matroids.named_matroids.NonFano() # optional - sage.rings.finite_rings
sage: M1._is_isomorphic(M2) # optional - sage.rings.finite_rings
sage: M1 = CircuitClosuresMatroid(matroids.named_matroids.Fano())
sage: M2 = matroids.named_matroids.NonFano()
sage: M1._is_isomorphic(M2)
False
sage: M1._is_isomorphic(M2, certificate=True) # optional - sage.rings.finite_rings
sage: M1._is_isomorphic(M2, certificate=True)
(False, None)


Expand Down
Loading