summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTara Fife <fi.tara@gmail.com>2016-05-28 17:20:06 -0500
committerTara Fife <fi.tara@gmail.com>2016-05-28 17:20:06 -0500
commit380af24ea18e92f156fb4b5f76b41daee1dc47cb (patch)
treec2502c419332ded34733ffe9d90b2183652ed40d
parentFixed spacing (diff)
Fixed errors
-rw-r--r--src/sage/matroids/basis_exchange_matroid.pyx2
-rw-r--r--src/sage/matroids/basis_matroid.pyx2
-rw-r--r--src/sage/matroids/circuit_closures_matroid.pyx8
-rw-r--r--src/sage/matroids/linear_matroid.pyx20
-rw-r--r--src/sage/matroids/matroid.pyx7
5 files changed, 8 insertions, 31 deletions
diff --git a/src/sage/matroids/basis_exchange_matroid.pyx b/src/sage/matroids/basis_exchange_matroid.pyx
index c62247a..e84124a 100644
--- a/src/sage/matroids/basis_exchange_matroid.pyx
+++ b/src/sage/matroids/basis_exchange_matroid.pyx
@@ -2277,7 +2277,7 @@ cdef class BasisExchangeMatroid(Matroid):
sage: M2 = matroids.named_matroids.NonFano()
sage: M1._is_isomorphic(M2)
False
- sage: M1._is_isomorphic(M2, True)
+ sage: M1._is_isomorphic(M2, certificate=True)
(False, None)
"""
diff --git a/src/sage/matroids/basis_matroid.pyx b/src/sage/matroids/basis_matroid.pyx
index 8784bc1..89574bf 100644
--- a/src/sage/matroids/basis_matroid.pyx
+++ b/src/sage/matroids/basis_matroid.pyx
@@ -1054,8 +1054,6 @@ cdef class BasisMatroid(BasisExchangeMatroid):
False
sage: M._is_isomorphic(N, certificate=True)
(False, None)
- sage: M._is_isomorphic(N, True)
- (False, None)
"""
if certificate:
return self._is_isomorphic(other), self._isomorphism(other)
diff --git a/src/sage/matroids/circuit_closures_matroid.pyx b/src/sage/matroids/circuit_closures_matroid.pyx
index 116c68d..20ece77 100644
--- a/src/sage/matroids/circuit_closures_matroid.pyx
+++ b/src/sage/matroids/circuit_closures_matroid.pyx
@@ -361,7 +361,7 @@ cdef class CircuitClosuresMatroid(Matroid):
Internal version that performs no checks on input.
- NPUT:
+ INPUT:
- ``other`` -- A matroid,
- optional parameter ``certificate`` -- Boolean.
@@ -384,15 +384,11 @@ cdef class CircuitClosuresMatroid(Matroid):
True
sage: M1._is_isomorphic(M2, certificate=True)
(True, {0: 0, 1: 1, 2: 2, 3: 3, 4: 5, 5: 4})
- sage: M1._is_isomorphic(M2, True)
- (True, {0: 0, 1: 1, 2: 2, 3: 3, 4: 5, 5: 4})
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)
- (False, None)
- sage: M1._is_isomorphic(M2, True)
+ sage: M1._is_isomorphic(M2, certificate=True)
(False, None)
diff --git a/src/sage/matroids/linear_matroid.pyx b/src/sage/matroids/linear_matroid.pyx
index 90d9e45..fa043bd 100644
--- a/src/sage/matroids/linear_matroid.pyx
+++ b/src/sage/matroids/linear_matroid.pyx
@@ -2691,10 +2691,10 @@ cdef class LinearMatroid(BasisExchangeMatroid):
cert.add(dX[x])
for y in cert_pair[1]:
cert.add(dY[y])
- return False, cert
+ return False, certificate
return False
if certificate:
- return True,None
+ return True, None
return True
cpdef _is_4connected_shifting(self, certificate=False):
@@ -3271,7 +3271,7 @@ cdef class BinaryMatroid(LinearMatroid):
Internal version that performs no checks on input.
- NPUT:
+ INPUT:
- ``other`` -- A matroid,
- optional parameter ``certificate`` -- Boolean.
@@ -3294,8 +3294,6 @@ cdef class BinaryMatroid(LinearMatroid):
True
sage: M1._is_isomorphic(M2, certificate=True)
(True, {'a': 0, 'b': 1, 'c': 2, 'd': 4, 'e': 3, 'f': 5, 'g': 6})
- sage: M1._is_isomorphic(M2, True)
- (True, {'a': 0, 'b': 1, 'c': 2, 'd': 4, 'e': 3, 'f': 5, 'g': 6})
sage: M1 = matroids.named_matroids.Fano().delete('a')
sage: M2 = matroids.Whirl(3)
@@ -3303,14 +3301,10 @@ cdef class BinaryMatroid(LinearMatroid):
False
sage: M1._is_isomorphic(M2, certificate=True)
(False, None)
- sage: M1._is_isomorphic(M2, True)
- (False, None)
sage: M1._is_isomorphic(matroids.Wheel(3))
True
sage: M1._is_isomorphic(matroids.Wheel(3), certificate=True)
(True, {'b': 1, 'c': 2, 'd': 4, 'e': 3, 'f': 5, 'g': 0})
- sage: M1._is_isomorphic(matroids.Wheel(3), True)
- (True, {'b': 1, 'c': 2, 'd': 4, 'e': 3, 'f': 5, 'g': 0})
"""
if certificate:
@@ -4338,7 +4332,7 @@ cdef class TernaryMatroid(LinearMatroid):
Test if ``self`` is isomorphic to ``other``. Internal version that
performs no checks on input.
- NPUT:
+ INPUT:
- ``other`` -- A matroid,
- optional parameter ``certificate`` -- Boolean.
@@ -5976,7 +5970,7 @@ cdef class RegularMatroid(LinearMatroid):
Internal version that performs no checks on input.
- NPUT:
+ INPUT:
- ``other`` -- A matroid,
- optional parameter ``certificate`` -- Boolean.
@@ -5998,8 +5992,6 @@ cdef class RegularMatroid(LinearMatroid):
True
sage: M1._is_isomorphic(M2, certificate=True)
(True, {0: 0, 1: 1, 2: 2, 3: 3, 4: 5, 5: 4})
- sage: M1._is_isomorphic(M2, True)
- (True, {0: 0, 1: 1, 2: 2, 3: 3, 4: 5, 5: 4})
sage: M1 = matroids.Wheel(3)
sage: M2 = matroids.named_matroids.Fano()
@@ -6009,8 +6001,6 @@ cdef class RegularMatroid(LinearMatroid):
True
sage: M1._is_isomorphic(M2.delete('a'), certificate=True)
(True, {0: 'g', 1: 'b', 2: 'c', 3: 'e', 4: 'd', 5: 'f'})
- sage: M1._is_isomorphic(M2.delete('a'), True)
- (True, {0: 'g', 1: 'b', 2: 'c', 3: 'e', 4: 'd', 5: 'f'})
Check that :trac:`17316` was fixed::
diff --git a/src/sage/matroids/matroid.pyx b/src/sage/matroids/matroid.pyx
index d29feb0..875ab1b 100644
--- a/src/sage/matroids/matroid.pyx
+++ b/src/sage/matroids/matroid.pyx
@@ -3096,8 +3096,6 @@ cdef class Matroid(SageObject):
True
sage: M1.is_isomorphic(M2, certificate=True)
(True, {0: 0, 1: 1, 2: 2, 3: 3, 4: 5, 5: 4})
- sage: M1.is_isomorphic(M2, True)
- (True, {0: 0, 1: 1, 2: 2, 3: 3, 4: 5, 5: 4})
sage: G3 = graphs.CompleteGraph(4)
sage: M1.is_isomorphic(G3)
Traceback (most recent call last):
@@ -3111,8 +3109,6 @@ cdef class Matroid(SageObject):
False
sage: M1.is_isomorphic(M2, certificate=True)
(False, None)
- sage: M1.is_isomorphic(M2, True)
- (False, None)
"""
if not isinstance(other, Matroid):
raise TypeError("can only test for isomorphism between matroids.")
@@ -3146,9 +3142,6 @@ cdef class Matroid(SageObject):
True
sage: M1._is_isomorphic(M2, certificate=True)
(True, {0: 0, 1: 1, 2: 2, 3: 3, 4: 5, 5: 4})
- sage: M1._is_isomorphic(M2, True)
- (True, {0: 0, 1: 1, 2: 2, 3: 3, 4: 5, 5: 4})
-
sage: M1 = matroids.named_matroids.Fano()
sage: M2 = matroids.named_matroids.NonFano()