Changeset 35a153 in git

Timestamp:

Jul 25, 2019, 2:45:06 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

31b296e9bebe3be046b485f2f8f09ba1c0139fc2

Parents:

3d5b277e2651a792f826b544d03d7179c438dba0

Message:

opt: setCharacteristic

Files:

• Tst/Short/bug_zp.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_zp.stat (modified) (1 diff)
• factory/cf_char.cc (modified) (1 diff)

Tst/Short/bug_zp.res.gz.uu

@@ -1 +1 @@
 begin 640 bug_zp.res.gz
-M'XL("-%LPED"`V)U9U]Z<"YR97,`E5!-3\)`$+WW5[P0#B6I"[O(AQ#6Q'@A
-M,5[P1K19RK9.`FTSNX3*KW>KI.K1T[QY;U[FS6Q>'M?/`*3&T_H!/>^\.-"N
-MMXPV5T5I!#*EDGP\6$9MA=;8G8KT4HO2GH7SQG?C8XT.WPH,AS@;+A-0CIKI
-M:$$.OJIP,%Q8Y!4C-YFO^&/1V28"3&4!7DW&T_E,CD8R:9)]_9-IJJ\NNEC$
-MC;J1(5G@[Y&]&PZ*97*>LC_+XJ-I6D*]J;O!/Z>W\G716M(`5C+:JN]6=HEF
-7O\Z>BZ^/M6\YN3A$ZT>?0,1X.V<!````
+M'XL("$.:.5T"`V)U9U]Z<"YR97,`55#+;L(P$+S[*T:(0Y""P>99$$:J>D&J
+M>H$;:B.3.F$E2"+;B)2OK].BM)QV=V9'L[/;W<OF#8!0>-T\H^.=YR<Z=)9L
+M>V>D0@`3*LA'O25K*I3"X9(GMXH7YLJ=U[Y='RFT_9AC,,!5VR(&9:@LG0W(
+MP9<E3MKF!EEID>G4E_9KT<HF'):*''8U&4WG,S$<BKB./ZN_FZ;JKJ*;053+
+MO@B7!7R-]*AM8(PEYRE],(O.NFX`^2&?>FPOWA>-)`G-2K"]_!U%ZS'[%V3.
+3?W[0!+VX*)AUV3<,'@((.0$`````
 `
 end

Tst/Short/bug_zp.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1505914065:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:83592
-1 >> tst_memory_1 :: 1505914065:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:2215936
-1 >> tst_memory_2 :: 1505914065:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:2215936
-1 >> tst_timer_1 :: 1505914065:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:0
+1 >> tst_memory_0 :: 1564056131:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:85680
+1 >> tst_memory_1 :: 1564056131:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2150192
+1 >> tst_memory_2 :: 1564056131:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2191296
+1 >> tst_timer_1 :: 1564056131:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:5

factory/cf_char.cc

@@ -33 +33 @@
         theDegree = 1;
         CFFactory::settype( FiniteFieldDomain );
+        ff_big = c > cf_getSmallPrime( cf_getNumSmallPrimes()-1 );
+        if (c!=theCharacteristic)
+        {
+          if (c > 536870909) factoryError("characteristic is too large(max is 2^29)");
+          ff_setprime( c );
+        }
         theCharacteristic = c;
-        ff_big = c > cf_getSmallPrime( cf_getNumSmallPrimes()-1 );
-        if (c > 536870909) factoryError("characteristic is too large(max is 2^29)");
-        ff_setprime( c );
     }
 }