Merge branch 'master' of gitlab.inria.fr:smasson/cocks-pinch-variant

CocksPinchVariant.py

@@ -505,7 +505,10 @@ class CocksPinchVariantResult(object):
 
     """
 
+    def __init__(self,k,D,T,i,ht=Integer(0),hy=Integer(0),max_poly_coeff=None,pre=False,l=1, allowed_cofactor = 1, allowed_size_cofactor = 5, max_trialdiv=10**6, max_B1=10**4, new_semantics=False):
+=======
     def __init__(self,k,D,T,i,ht=Integer(0),hy=Integer(0),max_poly_coeff=0,pre=False,l=1, allowed_cofactor = 1, allowed_size_cofactor = 5, max_trialdiv=10**6, max_B1=10**4, new_semantics=False):
+>>>>>>> 107d412592d84ec5619ec671ff8231cbcde4d52c
         kl = k * l
         fD = -fundamental_discriminant(-D)
 

cost_pairing.py

@@ -186,21 +186,21 @@ def finite_field_cost(logp):
     #time_m
     words = ceil(RR(logp)/64)
     if words == 5 :
-        time_m = 35 #relic benchmark
+        time_m = 35 #       relic benchmark
     if words == 6 :
-        time_m = 69 #relic benchmark
+        time_m = 65 #       relic benchmark
     if words == 7 :
-        time_m = 94 #relic benchmark commit 307bc1f17410c36f6bd93d2a1f5c419270cf9ebd
+        time_m = 85 #       relic benchmark
     if words == 8 :
-        time_m = 120 #relic benchmark, more close to 123
+        time_m = 106 #      relic benchmark
     elif words == 9 :
-        time_m = 1.9*9**2
+        time_m = 129 #      relic benchmark
     elif words == 10 :
-        time_m = 188 #relic benchmark
+        time_m = 154 #      relic benchmark
     elif words == 11 :
-        time_m = 1.9*11**2
+        time_m = 1.5*11**2
     elif words == 48 :
-        time_m = 4882 #gmp benchmark
+        time_m = 4882 #     gmp benchmark
     return time_m
 
 def is_one_of_our_known_pairing_friendly_curves(C):