Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 2171a3e

Browse files
committed
24345: changes to code using Unknown
1 parent 4d60cb6 commit 2171a3e

8 files changed

+57
-54
lines changed

src/sage/combinat/designs/bibd.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ def balanced_incomplete_block_design(v, k, existence=False, use_LJCR=False):
232232
return True
233233
B = BIBD_from_arc_in_desarguesian_projective_plane(v,k)
234234
return BalancedIncompleteBlockDesign(v, B, copy=False)
235-
if BIBD_from_TD(v,k,existence=True):
235+
if BIBD_from_TD(v,k,existence=True) is True:
236236
if existence:
237237
return True
238238
return BalancedIncompleteBlockDesign(v, BIBD_from_TD(v,k), copy=False)
@@ -241,7 +241,7 @@ def balanced_incomplete_block_design(v, k, existence=False, use_LJCR=False):
241241
return True
242242
from .block_design import projective_plane
243243
return BalancedIncompleteBlockDesign(v, projective_plane(k-1),copy=False)
244-
if difference_family(v,k,existence=True):
244+
if difference_family(v,k,existence=True) is True:
245245
if existence:
246246
return True
247247
G,D = difference_family(v,k)
@@ -466,9 +466,8 @@ def BIBD_from_TD(v,k,existence=False):
466466

467467
# Third construction
468468
elif ((v-k)%k == 0 and
469-
balanced_incomplete_block_design((v-k)//k+k,k,existence=True) and
470-
transversal_design(k,(v-k)//k,existence=True)):
471-
469+
balanced_incomplete_block_design((v-k)//k+k,k,existence=True) is True
470+
and transversal_design(k,(v-k)//k,existence=True) is True):
472471
if existence:
473472
return True
474473

src/sage/combinat/designs/difference_family.py

+13-9
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ def df_q_6_1(K, existence=False, check=True):
426426
427427
sage: from sage.combinat.designs.difference_family import is_difference_family, df_q_6_1
428428
sage: prime_powers = [v for v in range(31,500,30) if is_prime_power(v)]
429-
sage: parameters = [v for v in prime_powers if df_q_6_1(GF(v,'a'), existence=True)]
429+
sage: parameters = [v for v in prime_powers if df_q_6_1(GF(v,'a'), existence=True) is True]
430430
sage: parameters
431431
[31, 151, 181, 211, 241, 271, 331, 361, 421]
432432
sage: for v in parameters:
@@ -507,7 +507,7 @@ def radical_difference_set(K, k, l=1, existence=False, check=True):
507507
sage: for k in range(2,50):
508508
....: for l in reversed(divisors(k*(k-1))):
509509
....: v = k*(k-1)//l + 1
510-
....: if is_prime_power(v) and radical_difference_set(GF(v,'a'),k,l,existence=True):
510+
....: if is_prime_power(v) and radical_difference_set(GF(v,'a'),k,l,existence=True) is True:
511511
....: _ = radical_difference_set(GF(v,'a'),k,l)
512512
....: print("{:3} {:3} {:3}".format(v,k,l))
513513
3 2 1
@@ -878,7 +878,7 @@ def radical_difference_family(K, k, l=1, existence=False, check=True):
878878
....: for q in range(k*(k-1)+1, 2000, k*(k-1)):
879879
....: if is_prime_power(q):
880880
....: K = GF(q,'a')
881-
....: if radical_difference_family(K, k, existence=True):
881+
....: if radical_difference_family(K, k, existence=True) is True:
882882
....: list_q.append(q)
883883
....: _ = radical_difference_family(K,k)
884884
....: print(" ".join([str(p) for p in list_q]))
@@ -1209,11 +1209,11 @@ def hadamard_difference_set_product(G1, D1, G2, D2):
12091209
12101210
sage: G11,D11 = hadamard_difference_set_product(G1,D1,G1,D1)
12111211
sage: assert is_difference_family(G11, D11, 256, 120, 56)
1212-
sage: assert designs.difference_family(256, 120, 56, existence=True)
1212+
sage: assert designs.difference_family(256, 120, 56, existence=True) is True
12131213
12141214
sage: G12,D12 = hadamard_difference_set_product(G1,D1,G2,D2)
12151215
sage: assert is_difference_family(G12, D12, 576, 276, 132)
1216-
sage: assert designs.difference_family(576, 276, 132, existence=True)
1216+
sage: assert designs.difference_family(576, 276, 132, existence=True) is True
12171217
"""
12181218
from sage.categories.cartesian_product import cartesian_product
12191219

@@ -1379,7 +1379,8 @@ def difference_family(v, k, l=1, existence=False, explain_construction=False, ch
13791379
....: constructions = []
13801380
....: for k in range(2,10):
13811381
....: for l in range(1,10):
1382-
....: if designs.difference_family(v,k,l,existence=True):
1382+
....: ret = designs.difference_family(v,k,l,existence=True)
1383+
....: if ret is True or isinstance(ret, tuple):
13831384
....: constructions.append((k,l))
13841385
....: _ = designs.difference_family(v,k,l)
13851386
....: if constructions:
@@ -1490,7 +1491,7 @@ def difference_family(v, k, l=1, existence=False, explain_construction=False, ch
14901491
sage: for N in range(2,21):
14911492
....: v = 4*N^2; k = 2*N^2-N; l = N^2-N
14921493
....: status = designs.difference_family(v,k,l,existence=True)
1493-
....: print("{:2} {}".format(N,designs.difference_family(v,k,l,explain_construction=True) if status else status))
1494+
....: print("{:2} {}".format(N,designs.difference_family(v,k,l,explain_construction=True) if status is True else status))
14941495
2 McFarland 1973 construction
14951496
3 Turyn 1965 construction
14961497
4 McFarland 1973 construction
@@ -1644,7 +1645,7 @@ def difference_family(v, k, l=1, existence=False, explain_construction=False, ch
16441645
else:
16451646
raise EmptySetError("by McFarland 1989 such difference family does not exist")
16461647

1647-
elif len(factorization) == 1 and radical_difference_family(K, k, l, existence=True):
1648+
elif len(factorization) == 1 and radical_difference_family(K, k, l, existence=True) is True:
16481649
if existence:
16491650
return True
16501651
elif explain_construction:
@@ -1653,7 +1654,10 @@ def difference_family(v, k, l=1, existence=False, explain_construction=False, ch
16531654
D = radical_difference_family(K,k,l)
16541655
G = K
16551656

1656-
elif len(factorization) == 1 and l == 1 and k == 6 and df_q_6_1(K, existence=True):
1657+
elif (len(factorization) == 1
1658+
and l == 1
1659+
and k == 6
1660+
and df_q_6_1(K, existence=True) is True):
16571661
if existence:
16581662
return True
16591663
elif explain_construction:

src/sage/combinat/designs/difference_matrices.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ def find_product_decomposition(g, k, lmbda=1):
6666
g2 = g//g1
6767
if g1 > g2:
6868
break
69-
if (difference_matrix(g1,k,lmbda1,existence=True) and
70-
difference_matrix(g2,k,lmbda2,existence=True)):
69+
if (difference_matrix(g1,k,lmbda1,existence=True) is True and
70+
difference_matrix(g2,k,lmbda2,existence=True) is True):
7171
return (g1,lmbda1),(g2,lmbda2)
7272

7373
return False
@@ -245,7 +245,7 @@ def difference_matrix(g,k,lmbda=1,existence=False,check=True):
245245
# (find the max k such that there exists a DM)
246246
elif k is None:
247247
i = 2
248-
while difference_matrix(g=g,k=i,lmbda=lmbda,existence=True):
248+
while difference_matrix(g=g,k=i,lmbda=lmbda,existence=True) is True:
249249
i += 1
250250
return i-1
251251

src/sage/combinat/designs/orthogonal_arrays.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ def orthogonal_array(k,n,t=2,resolvable=False, check=True,existence=False,explai
922922
return [[i,j,(i+j)%n] for i in range(n) for j in range(n)]
923923

924924
# projective spaces are equivalent to OA(n+1,n,2)
925-
elif (projective_plane(n, existence=True) or
925+
elif (projective_plane(n, existence=True) is True or
926926
(k == n+1 and projective_plane(n, existence=True) is False)):
927927
_OA_cache_set(n+1,n,projective_plane(n, existence=True))
928928
if k == n+1:
@@ -988,7 +988,7 @@ def orthogonal_array(k,n,t=2,resolvable=False, check=True,existence=False,explai
988988
break
989989

990990
# From Difference Matrices
991-
elif may_be_available and difference_matrix(n,k-1,existence=True):
991+
elif may_be_available and difference_matrix(n,k-1,existence=True) is True:
992992
_OA_cache_set(k,n,True)
993993
if existence:
994994
return True
@@ -1055,7 +1055,7 @@ def largest_available_k(n,t=2):
10551055
from sage.rings.infinity import Infinity
10561056
return Infinity
10571057
elif t == 2:
1058-
if projective_plane(n,existence=True):
1058+
if projective_plane(n,existence=True) is True:
10591059
return n+1
10601060
else:
10611061
k=1
@@ -1351,14 +1351,14 @@ def incomplete_orthogonal_array(k,n,holes,resolvable=False, existence=False):
13511351
"intersect in a projective plane.").format(number_of_holes))
13521352

13531353
# Holes of size 1 from OA(k+1,n)
1354-
elif max_hole==1 and orthogonal_array(k+1,n,existence=True):
1354+
elif max_hole==1 and orthogonal_array(k+1,n,existence=True) is True:
13551355
if existence:
13561356
return True
13571357
OA = orthogonal_array(k+1,n)
13581358
independent_set = [B[:-1] for B in OA if B[-1] == 0][:number_of_holes]
13591359
OA = [B[:-1] for B in OA]
13601360

1361-
elif max_hole==1 and orthogonal_array(k,n,existence=True):
1361+
elif max_hole==1 and orthogonal_array(k,n,existence=True) is True:
13621362
OA = orthogonal_array(k,n)
13631363
try:
13641364
independent_set = OA_find_disjoint_blocks(OA,k,n,number_of_holes)
@@ -1370,7 +1370,7 @@ def incomplete_orthogonal_array(k,n,holes,resolvable=False, existence=False):
13701370
return True
13711371
independent_set = OA_find_disjoint_blocks(OA,k,n,number_of_holes)
13721372

1373-
elif max_hole==1 and not orthogonal_array(k,n,existence=True):
1373+
elif max_hole==1 and not orthogonal_array(k,n,existence=True) is True:
13741374
return orthogonal_array(k,n,existence=existence)
13751375

13761376
# From a quasi-difference matrix

src/sage/combinat/designs/resolvable_bibd.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def resolvable_balanced_incomplete_block_design(v,k,existence=False):
9292
9393
sage: for v in range(40):
9494
....: for k in range(v):
95-
....: if designs.resolvable_balanced_incomplete_block_design(v,k,existence=True):
95+
....: if designs.resolvable_balanced_incomplete_block_design(v,k,existence=True) is True:
9696
....: _ = designs.resolvable_balanced_incomplete_block_design(v,k)
9797
"""
9898
# Trivial cases
@@ -447,7 +447,7 @@ def PBD_4_7(v,check=True, existence=False):
447447
448448
sage: for i in range(1,300,3):
449449
....: if i not in [10,19,31]:
450-
....: assert PBD_4_7(i,existence=True)
450+
....: assert PBD_4_7(i,existence=True) is True
451451
....: _ = PBD_4_7(i,check=True)
452452
"""
453453
if v%3 != 1 or v in [10,19,31]:
@@ -622,7 +622,7 @@ def PBD_4_7(v,check=True, existence=False):
622622

623623
return PBD_4_7_from_Y(GDD,check=check)
624624

625-
elif v % 6 == 1 and GDD_4_2((v - 1) // 6, existence=True):
625+
elif v % 6 == 1 and GDD_4_2((v - 1) // 6, existence=True) is True:
626626
# VII.5.17 from [BJL99]
627627
gdd = GDD_4_2((v - 1) // 6)
628628
return PBD_4_7_from_Y(gdd, check=check)
@@ -633,9 +633,9 @@ def PBD_4_7(v,check=True, existence=False):
633633
PBD = PBD_4_7_from_Y(PBD,check=False)
634634
return PBD_4_7_from_Y(PBD,check=check)
635635

636-
elif balanced_incomplete_block_design(v,4,existence=True):
636+
elif balanced_incomplete_block_design(v,4,existence=True) is True:
637637
return balanced_incomplete_block_design(v,4)
638-
elif balanced_incomplete_block_design(v,7,existence=True):
638+
elif balanced_incomplete_block_design(v,7,existence=True) is True:
639639
return balanced_incomplete_block_design(v,7)
640640
else:
641641
from sage.combinat.designs.orthogonal_arrays import orthogonal_array
@@ -650,9 +650,9 @@ def PBD_4_7(v,check=True, existence=False):
650650
vv = (v - 1) // 3
651651
for g in range((vv + 5 - 1) // 5, vv // 4 + 1):
652652
u = vv-4*g
653-
if (orthogonal_array(5,g,existence=True) and
654-
PBD_4_7(3*g+1,existence=True) and
655-
PBD_4_7(3*u+1,existence=True)):
653+
if (orthogonal_array(5,g,existence=True) is True and
654+
PBD_4_7(3*g+1,existence=True) is True and
655+
PBD_4_7(3*u+1,existence=True) is True):
656656
from .orthogonal_arrays import transversal_design
657657
domain = set(range(vv))
658658
GDD = transversal_design(5,g)
@@ -721,7 +721,7 @@ def PBD_4_7_from_Y(gdd,check=True):
721721
"but there are other: {}".format(block_sizes.difference([4,5,7])))
722722

723723
for gs in group_sizes:
724-
if not PBD_4_7(3*gs+1,existence=True):
724+
if not PBD_4_7(3*gs+1,existence=True) is True:
725725
raise RuntimeError("A group has size {} but I do not know how to "
726726
"build a ({},[4,7])-PBD".format(gs,3*gs+1))
727727

src/sage/combinat/matrices/hadamard_matrix.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -651,8 +651,8 @@ def true():
651651
elif ( e == 1 and
652652
not sqn is None and
653653
sqn%4 == 2 and
654-
True == strongly_regular_graph(sqn-1,(sqn-2)//2,(sqn-6)//4,
655-
existence=True) and
654+
strongly_regular_graph(sqn-1,(sqn-2)//2,(sqn-6)//4,
655+
existence=True) is True and
656656
is_prime_power(ZZ(sqn+1))):
657657
if existence:
658658
return true()
@@ -664,8 +664,8 @@ def true():
664664
for n1,e1 in product(divisors(n)[1:-1],[-1,1]):
665665
e2 = e1*e
666666
n2 = n//n1
667-
if (regular_symmetric_hadamard_matrix_with_constant_diagonal(n1,e1,existence=True) and
668-
regular_symmetric_hadamard_matrix_with_constant_diagonal(n2,e2,existence=True)):
667+
if (regular_symmetric_hadamard_matrix_with_constant_diagonal(n1,e1,existence=True) is True and
668+
regular_symmetric_hadamard_matrix_with_constant_diagonal(n2,e2,existence=True)) is True:
669669
if existence:
670670
return true()
671671
M1 = regular_symmetric_hadamard_matrix_with_constant_diagonal(n1,e1)
@@ -1117,7 +1117,7 @@ def true():
11171117
M = hadamard_matrix_paleyI(n, normalize=False)
11181118

11191119
elif n % 8 == 0:
1120-
if skew_hadamard_matrix(n//2,existence=True): # (Lemma 14.1.6 in [Ha83]_)
1120+
if skew_hadamard_matrix(n//2,existence=True) is True: # (Lemma 14.1.6 in [Ha83]_)
11211121
if existence:
11221122
return true()
11231123
H = skew_hadamard_matrix(n//2,check=False)
@@ -1127,7 +1127,7 @@ def true():
11271127
for d in divisors(n)[2:-2]: # skip 1, 2, n/2, and n
11281128
n1 = n//d
11291129
if is_prime_power(d - 1) and (d % 4 == 0) and (n1 % 4 == 0)\
1130-
and skew_hadamard_matrix(n1,existence=True):
1130+
and skew_hadamard_matrix(n1,existence=True) is True:
11311131
if existence:
11321132
return true()
11331133
H = skew_hadamard_matrix(n1, check=False)-I(n1)
@@ -1140,7 +1140,7 @@ def true():
11401140
M = A.tensor_product(I(n1))+(U*A).tensor_product(H)
11411141
break
11421142
if M is None: # try Williamson-Goethals-Seidel construction
1143-
if GS_skew_hadamard_smallcases(n, existence=True):
1143+
if GS_skew_hadamard_smallcases(n, existence=True) is True:
11441144
if existence:
11451145
return true()
11461146
M = GS_skew_hadamard_smallcases(n)

src/sage/databases/oeis.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ def __iter__(self):
13331333
"""
13341334
for x in self.first_terms():
13351335
yield x
1336-
if not self.is_full():
1336+
if not self.is_full() is True:
13371337
raise LookupError("Future values not provided by OEIS.")
13381338

13391339
def __eq__(self, other):

0 commit comments

Comments
 (0)