Commit 23e73243 authored by Christoph Conrads's avatar Christoph Conrads

Add SWB(2^64, 4, 26) prime factors

parent 253cc3fa
......@@ -36,15 +36,6 @@ factors_32_37_24 = [3, 5, 17, 53, 157, 257, 1613, 2731, 8191, 928513,
ps_32_37_24 = collections.Counter(factors_32_37_24)
ps_32_37_24[2] = 32*24
factors_64_26_4 = [3, 5, 17, 23, 89, 257, 353, 397, 641, 683, 1409, 2113,
65537, 229153, 5304641, 274177, 119782433, 43872038849, 1258753,
6700417, 2931542417, 67280421310721, 441995541378330835457,
60299259845689822028046342401,
275509565477848842604777623828011666349761,
3210843755324367119258027752661239735297]
ps_64_26_4 = collections.Counter(factors_64_26_4)
ps_64_26_4[2] = 64*4
factors_awc_16_16_6 = [2, 65537, 1342091265, 37217928793913440210506431,
17685937523735152413434380411781231297]
......@@ -123,6 +114,18 @@ prime_factors[('swc',64,13,7)] = collections.Counter([3, 3, 5, 7, 13, 17, 97,
18446744069414584321, 67280421310721, 442499826945303593556473164314770689])
prime_factors[('swc',64,13,7)][2] = 64*7
prime_factors[('swc',64,26,4)] = collections.Counter([3, 5, 17, 23, 89, 257, 353, 397, 641, 683, 1409, 2113,
65537, 229153, 5304641, 274177, 119782433, 43872038849, 1258753,
6700417, 2931542417, 441995541378330835457,
275509565477848842604777623828011666349761,
2724766004649595434157241343741767729156891206422918570211139111809,
# +1 factors
67280421310721,
60299259845689822028046342401,
3210843755324367119258027752661239735297,
23564925493739232585714389517039188697110867273666311616122161283288278853470338163883506211868864744899427472824924193932033])
prime_factors[('swc',64,26,4)][2] = 64*4
factors_awc_32_8_3 = [2, 87956635234305, 37217928793913440210506431,
17685937523735152413434380411781231297]
......@@ -236,9 +239,10 @@ def compute_order_mod_m(a, k, m, ps):
if k_0 == product:
return [k, k]
div = k_0 // product
min_order = k // div
max_order = min_order if pow(a, k // div, m) == 1 else k
remainder = k_0 // product
min_order = k // remainder
max_order = min_order if pow(a, k // remainder, m) == 1 else k
return [min_order, max_order]
......@@ -268,7 +272,6 @@ def main():
ps_32_17_3 if kind == 'swc' and w == 32 and r == 17 and s == 3 else \
ps_32_26_14 if kind == 'swc' and w == 32 and r == 26 and s == 14 else \
ps_32_37_24 if kind == 'swc' and w == 32 and r == 37 and s == 24 else \
ps_64_26_4 if kind == 'swc' and w == 64 and r == 26 and s == 4 else \
ps_awc_32_8_3 if kind== 'awc' and w == 32 and r == 8 and s == 3 else \
ps_awc_32_16_3 if kind=='awc' and w == 32 and r == 16 and s == 3 else \
ps_awc_32_29_17 if kind=='awc' and w== 32 and r == 29 and s == 17 else \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment