Changeset 0db7c7 in git

Timestamp:

Nov 28, 2012, 4:56:46 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

2e06defcff26c0ba83fc00b14887df89c80c32b2

Parents:

2abbc7658912b7ff427a0603e95ab63e9a736311c7de47e178c8349df34306fb175cec16e9827d57

Message:

Merge pull request #214 from mmklee/factory_fix_sw

Factory fix sw

Files:

• Tst/Short/factorizeQa_s.res.gz.uu (modified) (1 diff)
• Tst/Short/factorizeQa_s.stat (modified) (1 diff)
• Tst/Short/factorizeQa_s.tst (modified) (1 diff)
• factory/facFqBivar.cc (modified) (2 diffs)
• factory/facHensel.cc (modified) (9 diffs)
• omalloc/omalloc.c (modified) (3 diffs)
• xalloc/Makefile.am (modified) (1 diff)
• xalloc/configure.ac (modified) (1 diff)

Tst/Short/factorizeQa_s.res.gz.uu

@@ -1 +1 @@
 begin 644 factorizeQa_s.res.gz
-M'XL(".QDKE```V9A8W1O<FEZ95%A7W,N<F5S`)5:6V\=MQ%^]Z]8I'TX.JO5
-MDL-[#>NAZ$N`HDB1OA5)("N6J\2Q`TF!M?KU^6;();GGK(,T`JQ=#B]S^>:;
-MX4;?_N<?7_]K&`9]/?SSZ[\/7ST]/EU]N'_[U>M7WQ8)70\8_.'^X_W3X>+U
-M*_X]7%\/=S>W3Y\>[E_>_?OFA\>KC^\^7ST^W3S55>9ZJ,_V:ICGX>[ATR_#
-M^T\/+^\^5(F[&A[N/[X?OGUS4)<_75P>?COHJRNZN'PNOU_R[XO+'W]M&OGK
-MX9?[C[]^^K"\^8E&W03A>N#1X9LWV.?B>WM\X5\TT5'>S1';7I3!NBA>#6.>
-M(&+,*JN>^SWJ]+2=CG\(XI-96ET-.%5VH.V42=Y.M]4:"VQ3D[*:^(<NZAS"
-MT;;3E+XTT?03:35I.P=!&:N76+_QU$O4Z^?$H*V7:..ES72_G=Y<L)D5=KU$
-M&R_Q6XVPC@U6&I&H(#Q\`VC^5W_WMU<(T0]X>*/S$WV7L5`4+1M3%IHL%.],
-M%1OC8?KIHKEV/.#MM]4E\E8=-)59\*ML:+^PX7:_:;OA](4=H;N8HR_E9[6;
-M5/,!:4FMI_O;G]\]#7\Q1E4)E=1ZN!TXN6Z17,^7RR:1R-1$&MX,MTBEV=Y.
-M>M:^3;$EI>Z>,>69H"U/@L+R1,[?8I569"_:&M>QP^'N^<N1R9O$V][6B@[R
-M]6A6[W^??OGT'KO!AG82$A[2UZ]ZQ98SS8Y+VS1N=5O^A'+'95>]U,)@%(=A
-MC0(97P5ZC0(L0!1N=J)@J(_"34]HQJPNX.7/T\W%\;#@WS;!;LSY8V-N+BKJ
-ME_RZ05C=TW6&^=ZPF.IX6.VZ%W3=PZZ;R[>,,EC6EL?>M/N-::DW[69\RPQT
-MVZ6Z57_2-*P=#_<7Q]MJG8Q,,K1KH=6R]>/3C^?[[JQMXS*\;D+%@/?9@%LV
-MX&UO@.D->/]'!LB!;\?>@D,9V3?`5@/.]CU?N@ZOAZR;='&VFSA;3\/#NU\_
-M/3R]^W%XNYP4;5MC_UF[#.O/.["VF]A_!O-^'FV3=MGCD#T9"AHSK5>1`BFK
-MDD]>*75\_CY`^?/QSTCV[_UQF1)I[ZQ542>3*"]QQP7Q..RL.I_.^UC,-[OS
-MQ[,QGF\PWXY[)Q,D;E_AW:TPW>],7MAJ8TCIX`,9FTSPHKY1WH80G38I6;)9
-M'1R80M#!!1<59"3'::6T5TX[4B:0C=545L]ZDZ"]T>1$A/DX)Z5H%;FHZW23
-M/3DY[!N<\TXI(\9B0?1>H^BX:!1K+_,I>W(ZUV?:U4<<"4N]=<E$9:SR(4\G
-MKY+#@+4Q>BO>RJZE$*V+(9)Q6)&CJHE\4G`@;\\>S+:.!ZTC]K36F:`<E=DA
-M&NV35MYH72<;=HQ-+J6$4[US-L\>M34N4#(^:J?C.IV*8WP,.-7JI&PJVHQ$
-M.D:X,K";K:J1-@(,YTP*B#.V5"LFO<?^-JC@M"JF6JY`*&!.P3%:IZ`1&_8+
-M>:1HA+4)VD-_41Z6FLA>Q.[14L0XYN)58UI`8#&=XJKY>(#SE.8=M598(K.C
-M5L$ZFVQ(/A:58:+&:4$[2$R*"`X,-/`?5`T``N*/?R^*=7R03=Y:33`^>R-H
-M2M;#B89:QK'K#.Q2B(/'DN+L"8CR2F,IF1"KYQ@A&E8Q)@"KDLK1..\Y/4S0
-M#"?1`AL;G0`0@\GP1U`Q,585_,(J1P?MH$QN8I!XACV0$(*(G8GC[1FI[$Z'
-M3-.*6XCQX`U0B*3Q*1*MAD%'3=!`"UA:97:Z(SA:"8Y`<`1?).@7`&F*.%Y8
-M(R(@.P+AN"#AVI,BO$"9B<DALH`H8[FP(@AW1UB8T4S[6C`+VB^L,VOR[2JR
-M,[KFB/_2HG%_D5#?WH)%O*2`.0="!"DXBP@)'#50%P)>D-4@BT#9#0Q=($"%
-MZ)$_D722Z1.231.BCC0'C3!\,XL*,S(2D=+)<_29#L71AJD,!`V=0&A,QFO9
-MD-[3$+(36F%%(N@FE`0@&P]>\$`W4<Z2[$C.5@9=A(_A:PI*,MMI3`6S*P.>
-M"11\S5<A`_(:_`LC%:>BA8JY((!C41\(``V6O//%BQPM'<@983[4"P45K60O
-M,LE)-ML(F.<JDB.%LPUV`0$@)=8\<TA2O`'K"1ELUA3F`TP(<",BP0<EG1,#
-M[C)PMD?T.)>LVE0>YSB[$!CP3J+"$<8QY2!07#>B)K6M/@1*!B2BCXG_*_44
-M?`=34!K!0M`NJFT)BC&"!U%$$`(EE8)S-B'C?0`20&C16=55(<#'!Z95$CO+
-M*0PY(6=M^2!JE<BBUP>G6=``2A)*A.=4P,Y020-VH#?0C_.E%$U@,+`1?HC`
-M9B`>XV7_B/D)X0`D$$3;JA$S6W`):$PA0AR$GE1BRU"J@T,A`.1]5X^2XKKF
-MF-4B:G9)3[!O8+8&3QGP,,9;00(2&=C@1^@#L6821(X0SD0=0QRYTCI::Q*)
-MM@I4SD2O"T9`MLY@-1<RQ'&-N50\[BB@-+H$'B\1A^<\N@8$!T626ET0D/P_
-M\2Y%BA.#>9^8HXM6(Z.<HH$/K70H)79BMD.J81471\?9SJ%(@!X*(_QA440=
-M:GNI5:B!R&L,(P]0=`)R4RH%)S`*,HH5:CZ.BJ5<:8_<-MQA<$5$.Z5]+MUX
-M!9"@*>I81)6^6"D$V,,BP`N=@TVY!QHQ"R8@VA;EUJK<[NVS(T*/;<$D("<7
-MN'@F01=@Y9CDP.2("[<+K4IUG^F<[;ZG#(<[?;RCLTL+ZH%#@6:`<X5`86=-
-MB8LM=!?WMCLGM^U<P/S"7WG<`BOA`0S8!?Z'\_!H%CM"2`MS21Y:_+1@*?`]
-M6^VP(GA^@`1S8I3!,2DJ@W;)",OCB$<9-WP>U[(L"+&,TY*I(6_>]EFX"U4F
-M#]LP1X/(2,$S2KL9]!$CM[`:M)7?^'!P`!HQ-W/W9\'%((3R(BI`C'YL!D\0
-MC#/(2'D6-:2IYI:R[#VB4042Z]ZB)]I$K`\>MP`<[F0'>8-RG(L@[YAFL#SJ
-M"_HA]">^O/'YXP'HUKK*@0[LW280%(S<"]<9[($J9A4!KK!*1^0&JD"=(!IB
-M:$:(<+FAP`^\K51$^"'")0`'/^0O,^A[9^1IO@K,F5/V^K7Y[$*4NS*0(6>^
-M1IY!K=/K5^[H`G,]9PR('I209L<CR!Q<0Z2N,./BU@,R1AH%3LFS*=+P.3VC
-MY0>'!/[=OIX\HPUA7(=E!;1?*$/<3,"CY6>3$3UI<;-OZ`[C@O4F@QIU;P6W
-M9_CI`GE+@C_LR#&V>.$[2ZR0EY)HU\F^0AX!H0)L8RO@&2@V%&BCUU\1+_5;
-ME\Q!*F?,>[GLF0KY:+5MJ"QK8H,\:+0B7I(1M\0&:C!KA^F<E*1X"1H5Y"L?
-MQ(\U,YGU5\2/(%:G*N(E1\'`2"*,`'$H5?*8,]5P@6M81P/KJ8$YWZ:"2@W.
-M7.]FOE^ZDJSH_ZVM8B'=/EF@.S"99@^&Q@'<&^HN6X17N)6K.H`<G6WIDGLX
-M-Z.A0-B,/.0TY7JWNL0ZW[GDR^YB=4!&LMN(EBKO)EJ@AP`/(>N2MCYQGO'U
-M!I[3GAMFZ;98B@P@*`Q7<>9RRRM<KD.^1["]N"EQJXE\`>$;9`+4X[1$C9>"
-MBAB!`0DLA?Z8PW0^I:0^W(`+,@B2VVA@$)6.T`IROX.[*9Q%O$H:-G069Q,R
-M4R"L(6<ERK>D)7*>60Q-ETIR0TWHUM@7,:#'0KBC$S6YTTT>C1':E`!^X4;>
-M<,7F?GG_.YOK/I$Y?S7\?/_AP_#0JF>X+E_"^H^[ER^7CYLO8:Y]"3OYONOJ
-M1]`W`[15LPG'FW)%T_;X@H='M)DZ@`U76629KK)^&89Q1:HB-$\BRK<4;2"P
-M(N#>(@L""U05M!5:/D"M`F[90<E13JF;\2DVB\B*J&[7B<JJNF$1D9EC:>\U
-ME7/RL"WWU[09Y<F)KRAU%)"HEH?5*20B^493O:**5^ALF98[;149"_JPJ87`
-M%7T-;CG1S)1-\7UTS(1RI;/33@2XB=IUN[C:V6VGL]-2'U"#*P(ZS;S?B:17
-M3T*==M73U*&@5V\K&'%A]3.9+>!LUB%9T;P$NPI&`\;8@-2T-4@K-NE4,'(#
-MOIY3P9O7<)G.YX2-`,T:7-<#7FW/"6?C&W-J(IR:4[%P;HZL"3OF;`6@'2WF
-M=(E@\F8*!50$-0W,R8J:!$6`<C,C*A54JD#1@/)#16DJH::VR%=!J$LLUX+5
-M&"JI0F<'B<CN'J3ETU`5X<JT922HEWVC<?/JPQ.*H%\A;K-%X/6&<=9`$W^U
-MM3WEQ"II2VJ6BF#D6_F:!F%-*Q(1JNU\PI)9`)(LFYT*J&TF"J0JTLFI^818
-MB\3Z=;M3"2=;8;RXD?1:BT%^1VMM.S[JM3X1R#&%<T4#MZN!K*K>F2ARCV`V
-MA"EK<$>8&[>G/#KQMY^:4"4V=7KC>U^F][NO$3O9778Q99B+-$+7(1_AE5'?
-M07L=DYD5NCR*>\_JS]3ESHA+:67"+J"X/834`:T-.U_C0BVA9)_"T'V\1F-P
-MHVRX7(<[=22-[(XZOJ57KTX_3'(OZ$J0Q`B]>:S:K/[",%J:V)4>&9S*:6D-
-MY6B#H[X.Q;9EZ'D$@XFOC[7VR!APL*&4$R57^)THN89JHV0;7)5<&0<C:$?C
-MIAPI#!K<_?K:$4XF%I*!2M;VE40ZBHF_3IVU37;TOBL@>0@=K.\JA+0>$[K0
-M>-9:6=SBR<]A.]:.KZ#8'E\3N!W?AB:^/76E@W7BXJAB5S:B#+:9E15-;2<]
-M_R_S-\/=\:X-Z>O-1YW3#SJX+./"BYYHQE4HM4\WR\LCFFU<&9.ZF1#!.7^4
-MI.5E"E#`.KY^O""WXZQQ)<';Q)_1I&<_OCRVJ_+B7NPC7TEP#TKAAB]!+X8'
-M?,SO?"5\X7JK\)[?'L$F1M[<R^/DO3PNC_5/;);\Y/C/&LJSQS--N&8LY4][
-K`@;Z/]O`CY6?^K<9GEIS[\V5_)$;_PG;;X\'??%Z^.NKWP&KI%B;&R<`````
+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
+,YS?_`\@ZJ/F3*0``
 `
 end

Tst/Short/factorizeQa_s.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1353606379:3150:3-1-5:ix86-Linux:mamawutz:913456
-1 >> tst_memory_1 :: 1353606379:3150:3-1-5:ix86-Linux:mamawutz:2240284
-1 >> tst_memory_2 :: 1353606379:3150:3-1-5:ix86-Linux:mamawutz:2273068
-1 >> tst_timer_1 :: 1353606379:3150:3-1-5:ix86-Linux:mamawutz:576
+1 >> tst_memory_0 :: 1354031643:3150:3-1-5:ix86-Linux:mamawutz:1127772
+1 >> tst_memory_1 :: 1354031643:3150:3-1-5:ix86-Linux:mamawutz:2342912
+1 >> tst_memory_2 :: 1354031643:3150:3-1-5:ix86-Linux:mamawutz:2359296
+1 >> tst_timer_1 :: 1354031643:3150:3-1-5:ix86-Linux:mamawutz:637

Tst/Short/factorizeQa_s.tst

@@ -54 +54 @@
 factorize (f1*f2);
 
+ring rw =(0,w),(x,y),dp;
+minpoly = w4-w3+2w2+w+1;
+poly f = x15-y15-15*x13+15*y13+90*x11-90*y11-275*x9+275*y9+450*x7-450*y7-378*x5+378*y5+140*x3-140*y3-15*x+15*y;
+factorize(f);
+
 kill r;
 ring r= (0,a),(x,y,z,s),dp;

factory/facFqBivar.cc

@@ -591 +591 @@
             On (SW_RATIONAL);
           g /= content (g, x);
+          if (!isRat)
+          {
+            On (SW_RATIONAL);
+            g *= bCommonDen (g);
+            Off (SW_RATIONAL);
+            g /= icontent (g);
+            On (SW_RATIONAL);
+          }
           if (fdivides (g, buf, quot))
           {
@@ -762 +770 @@
             On (SW_RATIONAL);
           g /= content (g, x);
+          if (!isRat)
+          {
+            On (SW_RATIONAL);
+            g *= bCommonDen (g);
+            Off (SW_RATIONAL);
+            g /= icontent (g);
+            On (SW_RATIONAL);
+          }
           if (fdivides (g, buf, quot))
           {

factory/facHensel.cc

@@ -450 +450 @@
   CanonicalForm modulus= p;
   int d= b.getk();
+  modpk b2;
   for (int i= 1; i < d; i++)
   {
@@ -456 +457 @@
     coeffE= coeffE.mapinto();
     setCharacteristic (0);
+    b2= modpk (p, d - i);
     if (!coeffE.isZero())
     {
@@ -465 +467 @@
       {
         setCharacteristic (p);
-        g= mulNTL (coeffE, j.getItem());
+        g= modNTL (coeffE, bufFactors[ii]);
+        g= mulNTL (g, j.getItem());
         g= modNTL (g, bufFactors[ii]);
         setCharacteristic (0);
         k.getItem() += g.mapinto()*modulus;
-        e -= mulNTL (g.mapinto()*modulus, l.getItem(), b);
+        e -= mulNTL (g.mapinto(), b2 (l.getItem()), b2)*modulus;
         e= b(e);
       }
@@ -629 +632 @@
   CanonicalForm modulus= p;
   int d= b.getk();
+  modpk b2;
   for (int i= 1; i < d; i++)
   {
@@ -647 +651 @@
       coeffE= replacevar (coeffE, alpha, beta);
     setCharacteristic (0);
+    b2= modpk (p, d - i);
     if (!coeffE.isZero())
     {
@@ -656 +661 @@
       {
         setCharacteristic (p);
-        g= mulNTL (coeffE, j.getItem());
+        g= modNTL (coeffE, bufFactors[ii]);
+        g= mulNTL (g, j.getItem());
         g= modNTL (g, bufFactors[ii]);
         setCharacteristic (0);
@@ -663 +669 @@
           setReduce (beta, false);
           k.getItem() += replacevar (g.mapinto()*modulus, beta, gamma);
-          e -= mulNTL (replacevar (g.mapinto(), beta, gamma)*modulus,
-                       l.getItem(), b);
+          e -= mulNTL (replacevar (g.mapinto(), beta, gamma),
+                       b2 (l.getItem()), b2)*modulus;
           setReduce (beta, true);
         }
         else
         {
+          setReduce (beta, false);
           k.getItem() += replacevar (g.mapinto()*modulus, beta, alpha);
-          e -= mulNTL (replacevar (g.mapinto()*modulus, beta, alpha),
-                       l.getItem(), b);
+          e -= mulNTL (replacevar (g.mapinto(), beta, alpha),
+                       b2 (l.getItem()), b2)*modulus;
+          setReduce (beta, true);
         }
         e= b(e);
@@ -681 +689 @@
   }
 
+  return result;
+}
+
+CFList
+diophantineQa (const CanonicalForm& F, const CanonicalForm& G,
+               const CFList& factors, modpk& b, const Variable& alpha)
+{
+  bool fail= false;
+  CFList recResult;
+  CanonicalForm modMipo, mipo;
+  //here SW_RATIONAL is off
+  On (SW_RATIONAL);
+  mipo= getMipo (alpha);
+  bool mipoHasDen= false;
+  if (!bCommonDen (mipo).isOne())
+  {
+    mipo *= bCommonDen (mipo);
+    mipoHasDen= true;
+  }
+  Off (SW_RATIONAL);
+  int p= b.getp();
+  setCharacteristic (p);
+  setReduce (alpha, false);
+  while (1)
+  {
+    setCharacteristic (p);
+    modMipo= mapinto (mipo);
+    modMipo /= lc (modMipo);
+    tryDiophantine (recResult, mapinto (F), mapinto (factors), modMipo, fail);
+    if (fail)
+    {
+      int i= 0;
+      while (cf_getBigPrime (i) < p)
+        i++;
+      findGoodPrime (F, i);
+      findGoodPrime (G, i);
+      p=cf_getBigPrime(i);
+      b = coeffBound( G, p, mipo );
+      modpk bb= coeffBound (F, p, mipo );
+      if (bb.getk() > b.getk() ) b=bb;
+      fail= false;
+    }
+    else
+      break;
+  }
+  setReduce (alpha, true);
+  setCharacteristic (0);
+
+  Variable gamma= alpha;
+  CanonicalForm den;
+  if (mipoHasDen)
+  {
+    On (SW_RATIONAL);
+    modMipo= getMipo (alpha);
+    den= bCommonDen (modMipo);
+    modMipo *= den;
+    Off (SW_RATIONAL);
+    setReduce (alpha, false);
+    gamma= rootOf (b (modMipo*b.inverse (den)));
+    setReduce (alpha, true);
+  }
+
+  Variable x= Variable (1);
+  CanonicalForm buf1, buf2, buf3, S;
+  CFList bufFactors= factors;
+  CFListIterator i= bufFactors;
+  if (mipoHasDen)
+  {
+    for (; i.hasItem(); i++)
+      i.getItem()= replacevar (i.getItem(), alpha, gamma);
+  }
+  i= bufFactors;
+  CFList result;
+  if (i.hasItem())
+    i++;
+  buf1= 0;
+  CanonicalForm Freplaced;
+  if (mipoHasDen)
+  {
+    Freplaced= replacevar (F, alpha, gamma);
+    buf2= divNTL (Freplaced, replacevar (i.getItem(), alpha, gamma), b);
+  }
+  else
+    buf2= divNTL (F, i.getItem(), b);
+  ZZ_p::init (convertFacCF2NTLZZ (b.getpk()));
+  ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (gamma)));
+  ZZ_pE::init (NTLmipo);
+  ZZ_pEX NTLS, NTLT, NTLbuf3;
+  ZZ_pEX NTLbuf1= convertFacCF2NTLZZ_pEX (buf1, NTLmipo);
+  ZZ_pEX NTLbuf2= convertFacCF2NTLZZ_pEX (buf2, NTLmipo);
+  XGCD (NTLbuf3, NTLS, NTLT, NTLbuf1, NTLbuf2);
+  result.append (b (convertNTLZZ_pEX2CF (NTLS, x, gamma)));
+  result.append (b (convertNTLZZ_pEX2CF (NTLT, x, gamma)));
+  if (i.hasItem())
+    i++;
+  for (; i.hasItem(); i++)
+  {
+    if (mipoHasDen)
+      buf1= divNTL (Freplaced, i.getItem(), b);
+    else
+      buf1= divNTL (F, i.getItem(), b);
+    XGCD (NTLbuf3, NTLS, NTLT, NTLbuf3, convertFacCF2NTLZZ_pEX (buf1, NTLmipo));
+    CFListIterator k= bufFactors;
+    S= convertNTLZZ_pEX2CF (NTLS, x, gamma);
+    for (CFListIterator j= result; j.hasItem(); j++, k++)
+    {
+      j.getItem()= mulNTL (j.getItem(), S, b);
+      j.getItem()= modNTL (j.getItem(), k.getItem(), b);
+    }
+    result.append (b (convertNTLZZ_pEX2CF (NTLT, x, gamma)));
+  }
   return result;
 }
@@ -698 +817 @@
       if (b.getp() != 0)
       {
-        CFList result= diophantineHenselQa (F, G, factors, b, v);
+        CFList result= diophantineQa (F, G, factors, b, v);
         return result;
       }

omalloc/omalloc.c

@@ -21 +21 @@
 #endif
 
+#if OM_PROVIDE_MALLOC > 0
+
 void* calloc(size_t nmemb, size_t size)
 {
@@ -29 +31 @@
   size = size*nmemb;
   omTypeAlloc0Aligned(void*, addr, size);
-  OM_MARK_AS_STATIC(addr);
-  return addr;
-}
-
-void* malloc(size_t size)
-{
-  void* addr;
-  if (size == 0) size = 1;
-
-  omTypeAllocAligned(void*, addr, size);
   OM_MARK_AS_STATIC(addr);
   return addr;
@@ -102 +94 @@
 }
 #endif
+#endif
+
+void* malloc(size_t size)
+{
+  void* addr;
+  if (size == 0) size = 1;
+
+  omTypeAllocAligned(void*, addr, size);
+  OM_MARK_AS_STATIC(addr);
+  return addr;
+}
+
 void freeSize(void* addr, size_t size)
 {

xalloc/Makefile.am

@@ -8 +8 @@
 
 lib_LTLIBRARIES=libomalloc.la ${LIB_G}
+lib_LIBRARIES=libomalloc.a
 ## libomallocdir = $(libdir)/
 

xalloc/configure.ac

@@ -1 +1 @@
 AC_INIT([xalloc], [3.1.2.sw])
 AC_CONFIG_SRCDIR(dummy.c)
+AC_CONFIG_MACRO_DIR([../m4])
 
 AC_CONFIG_AUX_DIR([.])