Changeset 3bfbc7 in git

Timestamp:

Dec 13, 2012, 5:16:28 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

f51a5bd5a84a0bdc21e8b4b7357a3d1f43bae4e6

Parents:

3772383383757f92bd98a13b15a06d71b41043bbc47a863526a09908b859ec56712e7ecb729f43c8

Message:

Merge pull request #231 from mmklee/factory_memory_sw

Factory memory sw

Files:

• .gdbinit (modified) (2 diffs)
• Tst/Long/factorizeQa_l.res.gz.uu (modified) (1 diff)
• Tst/Long/factorizeQa_l.stat (modified) (1 diff)
• Tst/Long/factorizeQa_l.tst (modified) (1 diff)
• Tst/Manual/s.lst (modified) (5 diffs)
• Tst/New/redTail.tst (added)
• factory/FLINTconvert.cc (modified) (1 diff)
• factory/NTLconvert.cc (modified) (1 diff)
• factory/canonicalform.cc (modified) (1 diff)
• factory/canonicalform.h (modified) (2 diffs)
• factory/cf_factory.cc (modified) (1 diff)
• factory/cf_factory.h (modified) (1 diff)
• factory/facBivar.cc (modified) (5 diffs)
• factory/facFqBivar.cc (modified) (19 diffs)
• factory/facFqBivar.h (modified) (2 diffs)
• factory/int_int.h (modified) (1 diff)
• kernel/kstd2.cc (modified) (2 diffs)
• kernel/polys.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.cc (modified) (2 diffs)

.gdbinit

@@ -1 +1 @@
 break dErrorBreak
-break dReportError
 break omReportError
 
@@ -22 +21 @@
 end
      
-run
-backtrace

Tst/Long/factorizeQa_l.res.gz.uu

@@ -1 +1 @@
 begin 644 factorizeQa_l.res.gz
-M'XL("+*]>4\``V9A8W1O<FEZ95%A7VPN<F5S`.U82VLC1Q"^^U<,2PZ21F-U
-MO?J1C7P(N01"(&QNB[THR]H(%'NQ%:))R'_/5SW2C+V[@4"R)`=;6--=7=5=
-MCZ^^:?3JQV^^_;YI&KIHOOOVZ^;%_F%_OMO^].+EV:OC"E\T$+[9WF[WL_G+
-M,W\V%Q?-]>;M_NY^^]N['S9O=N>W[WX]?]AO]J.57#3C6,^;]_=W;YO]NX?]
-M8/;0S';;AWVS6S;O[W9]<ST?E>V\^7V<Q'-\58V;=4.33]GEUW?WS6Q[NV^V
-MOM9LFZ_6S0,<PMZOZ7(.2=N.^U)PDW%G8I\VONW-HNJ_WEY>[5ZS/^?C0:2N
-M]L<XK?[<-.MU<SWI5&=VXYQQTFC!-.6!<>;]]O:FN5_/PG(S7\X.RWZ^W+V?
-M3)&UG[>W'C!""B$L-KG=6,LBBTT[Q<_Z:%<D;,CEM!POQJ3-.@HQ)EI)*J'^
-M^7Z:347E*-QH^T1I(]T'&B[\:*/Y8G;0/K4S2CFQ0B)%U)^K4LHF=2FF8):*
-MQ7P2QE:X<,A:XDEDK=N'DA-Q@GT5*HQC*48&XRJ1R;+.N2,E+L1UUFKD6*)A
-MIY("ZXJ(YNY@[+F==<S8)-*&YXN#];F=<;&2(ENF@/_!9ZRG#CX$SBJQF-%)
-M'%M3HQR5-9UDUA;3F&-TW:(K(3CMUI2E:(1U59-JJB(P'5SH4,V2S4J=MLRL
-M5BQI5"*H8B,XJ>ZDAW)RK,6DCE"K;#C%)U51.OCEL\5!>FF]X(.-S%WBX2>3
-M,7SI7241O'^TN>0QUN/B\3"L#)MU4(_&F8\'=UFJ#XN>/<]M/[]B/+D[]"U$
-MF/17MCA<49APF1[!%EVS6T\LTLQNT+%/&6()T1F=H3F_/$.+O<%@_3GQ/!S"
-ME^O_-ZP'-P5N/H/[\X-[R+8BVVT_C`WC(\P'0;Q<'Y<2ELZ`H(I76OJ'\;$E
-MA1'X96H"P:MB>/^!J%-:47!/JY=%R:<;ZP:YI^8D=!UN)WWO/Z(^.A8@+&P0
-MIFE\!'QL(X"%L`:9]\TC#12X+C\QX990[1RX)'FZTCY5KEQ+Q0O;H=(<$JJH
-MDI.A`%H"1<K!9[%C"@"5CZTK)):+9`(T/$1!*Y2L0%-&42AFAS+&B)99,/"F
-M525+*2F%M%(4BW)/.!?'(NK6TLHJ`PAGPG!0*.Z7K+BZ@]IR3=N!4D^^9$%#
-MB@$)=@6F*$HQNK>%LP5W%<#+`7P`?ZNU8A^.643J%-X.R.6A.`"TC]`/FM%!
-M)H&EBH93%8<B"Z@@ZN`B=>3FHV?))0/>47$X[6BGT!,DR.1*!^>#:P"EHTVI
-M)F"Z$B,S(=,X%P$)2$>02Y:H'A3RIQG];M$C@WXN.0KR9^@EJL$E056RQ92X
-M'`.$0E&Q0G(,$L4#)H_G=QAE)(LRX;`$JE6/%;6Q=A8E:X1Y8-"F>8&UD%6,
-M:@!/!@`B&O9&XAVH1*@&4`1FCH!80@K`IYQP`@=Q(P8O)E@-OH"<G*B\0`05
-MSA)BQ8&T(#4P?-2JS@@&![`7'/J`;Q`05(T94,\IDG%B@2N20-LQ9*H9\4@Z
-M2;6"BT-RG%-2CMC36RUI*A+J:X!"I?YA;4CFL%S'3O=41]QJ0(R2J#:RGQ`=
-M%C6;7C0>D.4V1QE7'938*8]/34W)5,MI#NA-BU4?',EV+%GE5``>78>W3$8B
-M`964M?(%&3!BH/(LS!8K8<1`(!WHH$%J7)XS!IW')*7PRA`=:FNH">)`1%KA
-MVE*T(&;!"^D2[E+PHN"-ZM,6;[P$OT'&N:"3\:IQ0[A7X:(Z9`N8[LM?W"X.
-MN%W@AC%>+N3135OXP\O%]<>7B^M/7"[^`0=/EX?_FHJG^\$S(3\3\C,A/Q/R
-MOTO(?^]&?!AOQ/TG;\0VDO6CGXI$S^N/3?Y3TB\/,P)K?W'V)ZS8X"RC$@``
+M'XL("$.-R%```V9A8W1O<FEZ95%A7VPN<F5S`.U966\<QQ%^[U\Q8!)@=V>'
+MVW7T99IZ,/)@PT&,P'XS1&,ED\P"#"60*Y!KP_\]7W7/S)*^X"`1H@=)D':F
+MIZKK^NKHF:^_^>L7?^^ZCEYT?_OBL^YD?[\_O=F].CES7X]/^$6'Q>]VM[O]
+M8GGF[+=[\:*[VK[>O[G;_7#YC^UW-Z>WEP^G]_OM?N:2%]U\K:?=V[LWK[O]
+MY?V^L=UWBYO=_;Z[67=OW]P<NJOE3!Q.NQ_GFWB*_RK%]7E'1YVRK5^]N>L6
+MN]M]M[-GW:[[]+R[AT+8^UMZN<1*W\_[DC>6>6=BN^ULV^M5I?]V]_+BYENV
+MW^4LB-3(?IIOJS[7W?EY=W6DJ<K<S/<,23,'T]$/#)EWN]OK[NY\X=?;Y7KQ
+MN#XLUS=OCZSPVK]VMV8P3/+>K[:YWX:>15;;_F@_ZY-=X;#FR^/C^&)VVF(@
+M'V.BC:3BZQ_;3W-041D7M]H_(]K*\#,*6_S%1LO5XE$/J5]0RHD5*U)$[7=3
+M2MFF(<7D0T@EQ#PMQEZXL,]:XK04>N/W)2?B!/ZZJ&".I00*8*XK<N2L]SR0
+M$A?B>M=KY%ABP$XE>=8-$2U-P7C@?C$P8Y-(6UZN'L,A]PLNH:3((9/'OZ8S
+MGJ<!.GC.*K&$0--R[(,&RE%9T[06^A(TYAB-MNA&"$H;-V4I&L%=R:2RJ@A8
+MFPH#HEER"*7>]LRLH82D48E`BHV@I)J29LJD6(^;>H58Y0`I=E,)98!>=K=Z
+ME(/T%O#&(TM;,?-3D-E\.1A)(FC_9'/)LZWCPU$8GK3-!I#'P)E'P4.6JL/J
+MP.;G_K"\8/SR\'CHL82;PT58/5Z0/^(R/8$MLN;F_%A%NL4U,O9YA5ACR9%#
+M<G[BD&+?X>+\?>*Y">&7YQ\VK)N:`C4_@OO]@[MY6^'M_M"N`ZY'F+>%^/)\
+M?)3PR`%!%:^TMK^,OV%-?@9^.2:!H%6T_H="G=*&O&E:M2Q*=KL-0ULWUTR+
+M1L/]D=[RC^@0#0M8+!RPF([7(^!C'P$LF-76+&^>4"#`]?$S%NX)T<Z>2Y+G
+M3_KGQ+764K'`#H@T^X0HJN04$``MGB)E;W=Q8/(`E5V'H9"$7"03H&$F"E*A
+M9`6:,H)",1N4<0UKF047EK2J%%)*2CYM%,&B?"#(A5A8W8>T";4""&?"92,H
+MII=LN*J#V')UVR.E`]FCX-6GZ.%@(V"*HA2C:5LX!V^J`GC9HQY`W\JMV(=C
+M%I%Z"VT;<KD%!X"V*^2#9F10$,]2EYI4A5!X`1%$'&Q)#;EYU"S92L,[(@ZE
+M#>WD#X05>'*C37EO%$#IS%,J"RI=B9&9X&G(A4&"HB/P)4M4,PK^TXQ\#]$L
+M`WTN.0K\%Y!+5(U+@JCD$%/B,AH(@J(2"LEH)(('3([R!UQE.(LR05A"J56S
+M%;$)_2)*U@AVSRB;P0*LA4+%J'K420]`Q("]X7@#*A&B`12A,D=`+,$%J*><
+M((&]&!.C+B9P-5U0G*Q068`())S%QXH#Z5'44.&C5G*&,1#`%G#0`[Y>4*"J
+MS8!Z3I$")Q:H(@EE._I,U2-FR2"I1G#UF`SGE)0C]K142YJ*^-H&R-?2WYXU
+M9[;']=K*/=4K[M7#1DE4$]DD1(-%]:8%C1NRC&=<XTJ#$%O)XRFI*075,MT#
+M>L>'E1XUDL,8LEI3`7AD';I,AB,!E92UU@L*P$A`*<_"'&(M&-$3B@YHD"#5
+M+O,9HYS')*7P)L`ZQ#8@)K`#%FF%:T\Q>`G!6R!MA8?D+2CHJ';;H^,EZ(UB
+MG`LR&:W&&*%>A8MJ\Q8P?2B_,5T\8KK`A#$/%_)DTA;^^7!Q]<OAXNI7AHO_
+MH@8?AX?_=RD^S@<?"_+'@ORQ('\LR/_;@OS')N+'>2(^_.I$'.9B_>15D>AI
+MM]GL[TZ[/^'DT[TZ=-=O[GZXO)F?A^D5R@-)AZ'9KQ^6Z\4WZ_HFY?NW9\>=
+MXOPJQ>@>+G1XN)">5P\7"/3JH9?C6QYY<BZ5/([DG]]>O@/GO%Y..QQF93A<
+M6-(/,:QL/[C3=AS@OM4#`A:7JV_LT$M(L4J!BEI%HO9"*(J/$1PJP2#E^1YB
+M>N%NW,,#5_G9'N)-\>+'/;SID>LF*.*I$=EARU2)J,:@JYVR%EL[M6ZD2L1Y
+M3=HU$B][K==#3CDWCD/C",B=2H_ZZV.EQD$VV?:H]R5/V]<>$U%.&C'Z877S
+M`.`67`UJR)QVKL0*I#7BZ,-(C/,Y/#8(X]`Z[9RJ&CZ,.VO.(S&:3[*=45/]
+MM#.(Q6><>*M#P"4Y5Y?4>FKNST"\U,VE;:[H']S\)TG\B(YB7=",#.@5(WG=
+M7@/C#%SIB0KZ<74A3KD%R6$N1"O$D7\2@"D@9+BZ10@%T4[ZC2/@B&QA'ZQK
+MSR+:V(`2%YM.;&\**D."!Z,Y7A!&'*8G$<A-&(7FTD1@-D!7J1Q8!"0,,!RA
+M`TTR@O4P05W'Q-'0@`,QFKCH"`BU'H468+>`'/(0$35N;?)"!$5I&J*-`!G-
+MR\5;B:D"4;\*1HS&U$3"\V@L51[J"\:1*JN^Z\CF.<4,XM-L%^HN&DY4:78!
+MY7$,IB`+4`ZK75&2G^P"!V,X0OUN.</V\D*U,6$TB5XH&P80(X!@M@A\Z#!0
+M/K;40-Y`J:8=^I^@*X/+:K(-29-)X()GLO6DAK:,OH..UO+4HYFA:"-T?2%B
+M>#M/XE`[X-`$F%9Q"9Y4/^5_LEYJ'H09A=%3)W%6<=!?,9:AB4U)7'P@ME<Q
+M+6Y`%\S5S#6916"'<$NET`0/13/DQ18&9"RBCI;>A&/^0Q>Q-`'N`FPEU<9;
+MQ6/6((Q6#?QX*`EZ-VL9M0":<(4+>BP2:;+66IT-+DE'I"'?I9INU<'G6.LF
+M'%8PM?#17GNO@]RV\<9/,*TSFY<R%2ZT670YFV&:P;`?C8\G>VT+LA5S1"L?
+MF'%*P.35Q$LQ5$08,22,1QBV.$\&@SEBTJJQ-RP%A`.MN158&['$0(\]?$F4
+M=307!0*4F$JGT(*R(0G566R.@:T8]"!UPI\-F?;>"0GG1Q=YCXF-&R2@/NBA
+MG,&]0!W,9&FTL-H7\1Q@:O9!+5^J1\T^0"P`H+4L819`$0RC<PX&>0"%T.HQ
+M##0$8_K`Q%ELJ&Y+J%)()M,MC%0H>H1=#)J;6N2B:8&Z)G"^;]``UFT@;1F$
+M\Q%&/$UF^(#I`[U&*#;.^J8.>V%(3#Q!6@D%&2B>("VHK"C!+<)D@S^J0C4"
+M<@$9"F5B'G)&&*.]'VQ5&7%)8@K7PH;T0/1+:*".<^]7?^S]2J?':QPA[=O2
+MJW?7KV_WZ]V1`>-*^_)T3F>[3\^#/[/O3$=&??(!2X-]&WK"G.K]5;>P#U6+
+M^8"ZL&EC3<OEI[SL?NQ.KK:[F\OO3\Z:]+X_FS\H:;&O2^38B5,77'3)95<<
+M>4?DB!V)(W44'$5'R5%V5!Q[Q^!AQ^)8'0?'T7%RG!T7)]X).<&6XD2=!"?1
+M27*2G12GWBDY9:>0J$Z#T^@T.<U.BPOSB\T`3YIE3>=JQF?OKKN'W?Z?QY/X
+M)]W)>G3IR5^ZA[LWM]<G9S]UES?WE\;PU9<G9S#OJR_G39^$)"`DO^?Y(/#\
+M\4Z?NS[$WW#]_;M7]_L6@,<U>L_Z@/\/R\VKW34`L)`E!KX_%)J0/]C0E/<0
+MFNB/H8GT^Z&)_#0T49Z')H8_$AKK<Q8<^STL5_]Q>&+Z4,,3\_L(3SF&)R%4
+7]@W?OM"_NU_0\JS[L_LWO<C_G/H?````
 `
 end

Tst/Long/factorizeQa_l.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1333378481:3143- exported :3-1-4:ix86-Linux:mamawutz:5349524
-1 >> tst_memory_1 :: 1333378481:3143- exported :3-1-4:ix86-Linux:mamawutz:10117120
-1 >> tst_memory_2 :: 1333378481:3143- exported :3-1-4:ix86-Linux:mamawutz:10117120
-1 >> tst_timer_1 :: 1333378481:3143- exported :3-1-4:ix86-Linux:mamawutz:4394
+1 >> tst_memory_0 :: 1355320642:3150:3-1-5:ix86-Linux:mamawutz:69009584
+1 >> tst_memory_1 :: 1355320642:3150:3-1-5:ix86-Linux:mamawutz:73228288
+1 >> tst_memory_2 :: 1355320642:3150:3-1-5:ix86-Linux:mamawutz:73228288
+1 >> tst_timer_1 :: 1355320642:3150:3-1-5:ix86-Linux:mamawutz:13315

Tst/Long/factorizeQa_l.tst

@@ -25 +25 @@
 l= factorize (f); testfactors (l,f);
 
+//tr. #462 by gorzel
+ring rw13 = (0,w),(T,x,y),dp; 
+minpoly = (w^4-w^3+2*w^2+4*w+3);
+
+poly Hneu = 
+x^13-y^13+(-65*w^3+117*w^2-208*w-156)*T*x^11+(65*w^3-91*w^2+143*w+234)*T*y^11+(-39*w^3+117*w^2-234*w+117)*T*x^10+(78*w^3-91*w^2+130*w+390)*T*y^10+(-689*w^3-2171*w^2+5746*w-16107)*T^2*x^9+(-16705/3*w^3+32435/3*w^2-58045/3*w-8788)*T^2*y^9+(-15210*w^3+21606*w^2-34476*w-57798)*T^2*x^8+(-16614*w^3+28002*w^2-47892*w-43992)*T^2*y^8+(-14547*w^3+26052*w^2-45435*w-32058)*T^2*x^7+(-15054*w^3+24882*w^2-42237*w-42120)*T^2*y^7+(308581*w^3-505388*w^2+854893*w+883038)*T^3*x^7+(47242*w^3-237302*w^2+499135*w-553488)*T^3*y^7+(452270*w^3-1191463*w^2+2291003*w-644709)*T^3*x^6+(582439*w^3-1362920*w^2+2555917*w-92508)*T^3*y^6+(-270816*w^3-229515*w^2+799266*w-3670641)*T^3*x^5+(883662*w^3-1973829*w^2+3661710*w+262431)*T^3*y^5+(-4396327/3*w^3+19510634/3*w^2-40530178/3*w+13462280)*T^4*x^5+(5640596*w^3-6386068*w^2+9065030*w+28409901)*T^4*y^5+(-830401*w^3+974207*w^2-1412983*w-4036071)*T^3*x^4+(760643*w^3-1689688*w^2+3130322*w+266370)*T^3*y^4+(20294378*w^3-26643448*w^2+41060318*w+86440380)*T^4*x^4+(5279066*w^3+3610412*w^2-13593424*w+67843698)*T^4*y^4+(34683727*w^3-58690697*w^2+100467835*w+91123968)*T^4*x^3+(6227858*w^3+7596407*w^2-23720320*w+94392402)*T^4*y^3+(-269815676/3*w^3+390512551/3*w^2-629448482/3*w-331043258)*T^5*x^3+(-94859661*w^3+166063209*w^2-287546493*w-225369144)*T^5*y^3+(31413330*w^3-69137640*w^2+127795122*w+13769730)*T^4*x^2+(2733874*w^3+19260358*w^2-47086208*w+109961202)*T^4*y^2+(-421494307/3*w^3+945300395/3*w^2-1755321490/3*w-36293842)*T^5*x^2+(-193843104*w^3+274995669*w^2-439410660*w-737414028)*T^5*y^2+(6677424*w^3-25392744*w^2+51796368*w-43097184)*T^4*x+(4253080*w^3+7591792*w^2-21735272*w+74806680)*T^4*y+(-52820170*w^3+190018127*w^2-384748741*w+294246537)*T^5*x+(-196474785*w^3+296309208*w^2-485858373*w-671785452)*T^5*y+(5248218976/27*w^3-12863190080/27*w^2+24372820576/27*w-1115453924/9)*T^6*x+(136336200*w^3-396591312*w^2+776924772*w-355580316)*T^6*y+(-153999872/3*w^3+341724448/3*w^2-632914880/3*w-18505760)*T^5+(196115972/3*w^3-887376100/3*w^2+1847311544/3*w-624999544)*T^6;
+
+
+int bugcnt,i;
+for (i=1;i<=50;i++) 
+{
+  i;
+  if (size(factorize(Hneu,1))<2) { "failed";bugcnt++;}
+}
+if (bugcnt) { "Bug with factorize: ",bugcnt,"% wrong";} else { "OK"; }
+
+for (i=1;i<=50;i++) 
+{ 
+  i;
+  if (size(factorize(subst(Hneu,x,3*x,y,3*y)/bigint(3)^13,1))<2) { "failed";bugcnt++;}
+}
+if (bugcnt) { "Bug with factorize: ",bugcnt,"% wrong";} else { "OK"; }
+
+for (i=1;i<=50;i++) 
+{ 
+  i;
+  if (size(factorize(subst(Hneu,x,1/3*x,y,1/3*y)*bigint(3)^13,1))<2) { "failed";bugcnt++;}
+}
+if (bugcnt) { "Bug with factorize: ",bugcnt,"% wrong";} else { "OK"; }
+
 tst_status(1); $

Tst/Manual/s.lst

@@ -79 +79 @@
 univarpoly.tst
 vdim_BR_PLURAL_BR.tst
-;; waitall.tst
+; waitall.tst
 bigint_expressions.tst
 boolean_operations.tst
@@ -316 +316 @@
 dimMon.tst
 divisor.tst
-dump.tst
 elimlinearpart.tst
 elimRing.tst
@@ -349 +348 @@
 Max.tst
 maxabs.tst
-minMult.tst
 Miscellaneous_oddities_4.tst
 nameof.tst
@@ -389 +387 @@
 truncate.tst
 varNum.tst
-;; waitfirst.tst
+; waitfirst.tst
 absFactorize.tst
 absValue.tst
@@ -415 +413 @@
 gcdN.tst
 genericmat.tst
-getdump.tst
 GKdim.tst
 hessenberg.tst

factory/FLINTconvert.cc

@@ -57 +57 @@
   {
     mpz_t gmp_val;
-    gmp_val[0]= *getmpi(f.getval());
+    f.mpzval(gmp_val);
     fmpz_set_mpz (result, gmp_val);
     mpz_clear (gmp_val);

factory/NTLconvert.cc

@@ -670 +670 @@
     char* stringtemp;
 
-    gmp_val[0]=*getmpi(f.getval());
+    f.mpzval (gmp_val);
     int l=mpz_sizeinbase(gmp_val,10)+2;
     stringtemp=(char*)Alloc(l);

factory/canonicalform.cc

@@ -68 +68 @@
     else
         return CanonicalForm( value->deepCopyObject() );
+}
+
+void
+CanonicalForm::mpzval(mpz_t val) const
+{
+    ASSERT (!is_imm (value) && value->levelcoeff() == IntegerDomain, "non-immediate integer expected");
+    getmpi (value, val);
 }
 //}}}

factory/canonicalform.h

@@ -20 +20 @@
 #include "cf_defs.h"
 #include "variable.h"
+#include <factory/cf_gmp.h>
 #include <factory/templates/ftmpl_list.h>
 #include <factory/templates/ftmpl_array.h>
@@ -80 +81 @@
     CanonicalForm deepCopy() const;
 
+    void mpzval(mpz_t val) const;
     // predicates
     CF_NO_INLINE bool isOne() const;

factory/cf_factory.cc

@@ -283 +283 @@
     return dummy;
 }
+
+void getmpi ( InternalCF * value, mpz_t mpi)
+{
+    ASSERT( ! is_imm( value ) && (value->levelcoeff() == IntegerDomain ), "illegal operation" );
+    mpz_init_set (mpi, ((InternalInteger*)value)->thempi);
+}
+

factory/cf_factory.h

@@ -35 +35 @@
 
 mpz_ptr getmpi ( InternalCF * value, bool symmetric = true );
+void getmpi ( InternalCF * value, mpz_t mpi);
 
 #endif /* ! INCL_CF_FACTORY_H */

factory/facBivar.cc

@@ -499 +499 @@
   modpk b= modpk();
   bool mipoHasDen= false;
+  CanonicalForm den= 1;
   if (!extension)
   {
@@ -519 +520 @@
   {
     A /= Lc (Aeval);
+    mipoHasDen= !bCommonDen(mipo).isOne();
+    mipo *= bCommonDen (mipo);
+    ZZX NTLmipo= convertFacCF2NTLZZX (mipo);
+    ZZX NTLLcf= convertFacCF2NTLZZX (Lc (A*bCommonDen (A)));
+    ZZ NTLf= resultant (NTLmipo, NTLLcf);
+    ZZ NTLD= discriminant (NTLmipo);
+    den= abs (convertZZ2CF (NTLD*NTLf));
+
     // make factors elements of Z(a)[x] disable for modularDiophant
     CanonicalForm multiplier= 1;
@@ -529 +538 @@
     A *= bCommonDen (A);
 
-    mipoHasDen= !bCommonDen(mipo).isOne();
-    mipo *= bCommonDen (mipo);
     Off (SW_RATIONAL);
     int i= 0;
-    ZZX NTLmipo= convertFacCF2NTLZZX (mipo);
-    CanonicalForm discMipo= convertZZ2CF (discriminant (NTLmipo));
+    CanonicalForm discMipo= convertZZ2CF (NTLD);
     findGoodPrime (F*discMipo,i);
     findGoodPrime (Aeval*discMipo,i);
@@ -555 +561 @@
   uniFactors= henselLiftAndEarly
               (A, earlySuccess, earlyFactors, degs, liftBound,
-               uniFactors, dummy, evaluation, b);
+               uniFactors, dummy, evaluation, b, den);
   TIMING_END_AND_PRINT (fac_bi_hensel_lift,
                         "time for bivariate hensel lifting over Q: ");
@@ -578 +584 @@
   TIMING_START (fac_bi_factor_recombination);
   factors= factorRecombination (uniFactors, A, MODl, degs, 1,
-                                uniFactors.length()/2, b);
+                                uniFactors.length()/2, b, den);
   TIMING_END_AND_PRINT (fac_bi_factor_recombination,
                         "time for bivariate factor recombination over Q: ");

factory/facFqBivar.cc

@@ -482 +482 @@
 factorRecombination (CFList& factors, CanonicalForm& F,
                      const CanonicalForm& N, DegreePattern& degs, int s,
-                     int thres, const modpk& b
+                     int thres, const modpk& b, const CanonicalForm& den
                     )
 {
@@ -515 +515 @@
   Variable y= Variable (2);
   Variable x= Variable (1);
-  CanonicalForm LCBuf= LC (F, x);
+  CanonicalForm denom= den, denQuot;
+  CanonicalForm LCBuf= LC (F, x)*denom;
   CanonicalForm g, quot, buf= F;
   int * v= new int [T.length()];
@@ -598 +599 @@
           {
             On (SW_RATIONAL);
+            if (!Lc (g).inBaseDomain())
+              g /= Lc (g);
             g *= bCommonDen (g);
             Off (SW_RATIONAL);
@@ -605 +608 @@
           if (fdivides (g, buf, quot))
           {
+            denom *= abs (lc (g));
             recombination= true;
             result.append (g);
             if (b.getp() != 0)
-              buf= quot*bCommonDen (quot);
+            {
+              denQuot= bCommonDen (quot);
+              buf= quot*denQuot;
+              Off (SW_RATIONAL);
+              denom /= gcd (denom, denQuot);
+              On (SW_RATIONAL);
+            }
             else
               buf= quot;
-            LCBuf= LC (buf, x);
+            LCBuf= LC (buf, x)*denom;
             T= Difference (T, S);
             l -= degree (g);
@@ -726 +736 @@
                       factors, int& adaptedLiftBound, int*& factorsFoundIndex,
                       DegreePattern& degs, bool& success, int deg,
-                      const modpk& b)
+                      const modpk& b, CanonicalForm& den)
 {
   DegreePattern bufDegs1= degs;
@@ -742 +752 @@
   if (b.getp() != 0)
     buf *= bCommonDen (buf);
-  CanonicalForm LCBuf= LC (buf, x);
+  CanonicalForm LCBuf= LC (buf, x)*den;
   CanonicalForm buf0= mulNTL (buf (0,x), LCBuf);
   CanonicalForm buf1= mulNTL (buf (1,x), LCBuf);
@@ -748 +758 @@
     Off (SW_RATIONAL);
   CanonicalForm test0, test1;
+  CanonicalForm denQuot;
 
   for (CFListIterator i= factors; i.hasItem(); i++, l++)
@@ -777 +788 @@
           {
             On (SW_RATIONAL);
+            if (!Lc (g).inBaseDomain())
+              g /= Lc (g);
             g *= bCommonDen (g);
             Off (SW_RATIONAL);
@@ -784 +797 @@
           if (fdivides (g, buf, quot))
           {
+            den *= abs (lc (g));
             reconstructedFactors.append (g);
             factorsFoundIndex[l]= 1;
             if (b.getp() != 0)
-              buf= quot*bCommonDen(quot);
+            {
+              denQuot= bCommonDen (quot);
+              buf= quot*denQuot;
+              Off (SW_RATIONAL);
+              den /= gcd (den, denQuot);
+              On (SW_RATIONAL);
+            }
             else
               buf= quot;
             d -= degree (g);
-            LCBuf= LC (buf, x);
+            LCBuf= LC (buf, x)*den;
             buf0= mulNTL (buf (0,x), LCBuf);
             buf1= mulNTL (buf (1,x), LCBuf);
@@ -827 +847 @@
   if (bufDegs1.getLength() <= 1)
     degs= bufDegs1;
+}
+
+void
+earlyFactorDetection (CFList& reconstructedFactors, CanonicalForm& F, CFList&
+                      factors, int& adaptedLiftBound, int*& factorsFoundIndex,
+                      DegreePattern& degs, bool& success, int deg,
+                      const modpk& b)
+{
+  CanonicalForm den= 1;
+  earlyFactorDetection (reconstructedFactors, F, factors, adaptedLiftBound, factorsFoundIndex, degs, success, deg,b, den);
 }
 
@@ -1002 +1032 @@
                     earlyFactors, DegreePattern& degs, int& liftBound,
                     const CFList& uniFactors, const ExtensionInfo& info,
-                    const CanonicalForm& eval, modpk& b)
+                    const CanonicalForm& eval,modpk& b, CanonicalForm& den)
 {
   Variable alpha= info.getAlpha();
@@ -1018 +1048 @@
   CFList diophant;
   CFList bufUniFactors= uniFactors;
+  On (SW_RATIONAL);
   CanonicalForm bufA= A;
+  if (!Lc (A).inBaseDomain())
+  {
+    bufA /= Lc (A);
+    CanonicalForm denBufA= bCommonDen (bufA);
+    bufA *= denBufA;
+    Off (SW_RATIONAL);
+    den /= gcd (den, denBufA);
+  }
+  else
+  {
+    bufA= A;
+    Off (SW_RATIONAL);
+    den /= gcd (den, Lc (A));
+  }
   CanonicalForm lcA0= 0;
   bool mipoHasDen= false;
@@ -1082 +1127 @@
         earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                               factorsFoundIndex, degs, earlySuccess,
-                              smallFactorDeg, b);
+                              smallFactorDeg, b, den);
       else
         earlyFactorDetection(earlyFactors, bufA, bufBufUniFactors, newLiftBound,
                              factorsFoundIndex, degs, earlySuccess,
-                             smallFactorDeg, b);
+                             smallFactorDeg, b, den);
     }
     else
@@ -1111 +1156 @@
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[sizeOfLiftPre-1] + 1, b);
+                                liftPre[sizeOfLiftPre-1] + 1, b, den);
           else
           earlyFactorDetection (earlyFactors,bufA,bufBufUniFactors,newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[sizeOfLiftPre-1] + 1, b);
+                                liftPre[sizeOfLiftPre-1] + 1, b, den);
         }
         else
@@ -1145 +1190 @@
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[i-1] + 1, b);
+                                liftPre[i-1] + 1, b, den);
           else
           earlyFactorDetection (earlyFactors,bufA,bufBufUniFactors,newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[i-1] + 1, b);
+                                liftPre[i-1] + 1, b, den);
         }
         else
@@ -1188 +1233 @@
       earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                             factorsFoundIndex, degs, earlySuccess,
-                            smallFactorDeg, b);
+                            smallFactorDeg, b, den);
       else
       earlyFactorDetection (earlyFactors, bufA, bufBufUniFactors, newLiftBound,
                             factorsFoundIndex, degs, earlySuccess,
-                            smallFactorDeg, b);
+                            smallFactorDeg, b, den);
     }
     else
@@ -1217 +1262 @@
         if (v==alpha)
         earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
-                              factorsFoundIndex, degs, earlySuccess, dummy, b);
+                              factorsFoundIndex, degs, earlySuccess, dummy, b,
+                              den);
         else
         earlyFactorDetection (earlyFactors, bufA,bufBufUniFactors, newLiftBound,
-                              factorsFoundIndex, degs, earlySuccess, dummy, b);
+                              factorsFoundIndex, degs, earlySuccess, dummy, b,
+                              den);
       }
       else
@@ -1245 +1292 @@
           if (v==alpha)
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
-                                factorsFoundIndex, degs, earlySuccess, dummy,b);
+                                factorsFoundIndex, degs, earlySuccess, dummy,b,
+                                den);
           else
           earlyFactorDetection (earlyFactors,bufA,bufBufUniFactors,newLiftBound,
-                                factorsFoundIndex, degs, earlySuccess, dummy,b);
+                                factorsFoundIndex, degs, earlySuccess, dummy,b,
+                                den);
         }
         else
@@ -1287 +1336 @@
 {
   modpk dummy= modpk();
+  CanonicalForm den= 1;
   return henselLiftAndEarly (A, earlySuccess, earlyFactors, degs, liftBound,
-                             uniFactors, info, eval, dummy);
+                             uniFactors, info, eval, dummy, den);
 }
 

factory/facFqBivar.h

@@ -585 +585 @@
 CFList
 factorRecombination (
-                CFList& factors,       ///< [in,out] list of lifted factors
-                                       ///< that are monic wrt Variable (1)
-                CanonicalForm& F,      ///< [in,out] poly to be factored
-                const CanonicalForm& M,///< [in] Variable (2)^liftBound
-                DegreePattern& degs,   ///< [in] degree pattern
-                int s,                 ///< [in] algorithm starts checking
-                                       ///< subsets of size s
-                int thres,             ///< [in] threshold for the size of
-                                       ///< subsets which are checked, for a
-                                       ///< full factor recombination choose
-                                       ///< thres= factors.length()/2
-                const modpk& b=modpk() ///< [in] coeff bound
+            CFList& factors,            ///< [in,out] list of lifted factors
+                                        ///< that are monic wrt Variable (1)
+            CanonicalForm& F,           ///< [in,out] poly to be factored
+            const CanonicalForm& M,     ///< [in] Variable (2)^liftBound
+            DegreePattern& degs,        ///< [in] degree pattern
+            int s,                      ///< [in] algorithm starts checking
+                                        ///< subsets of size s
+            int thres,                  ///< [in] threshold for the size of
+                                        ///< subsets which are checked, for a
+                                        ///< full factor recombination choose
+                                        ///< thres= factors.length()/2
+            const modpk& b=modpk(),     ///< [in] coeff bound
+            const CanonicalForm& den= 1 ///< [in] bound on the den if over Q (a)
                     );
 
@@ -690 +691 @@
         const ExtensionInfo& info, ///< [in] information about extension
         const CanonicalForm& eval, ///< [in] evaluation point
-        modpk& b                   ///< [in] coeff bound
+        modpk& b,                  ///< [in] coeff bound
+        CanonicalForm& den         ///< [in] bound on the den if over Q(a)
                   );
 

factory/int_int.h

@@ -126 +126 @@
     friend void gmp_denominator ( const CanonicalForm & f, mpz_ptr result );
     friend mpz_ptr getmpi ( InternalCF * value, bool symmetric );
+    friend void getmpi ( InternalCF * value, mpz_t mpi);
 };
 

kernel/kstd2.cc

@@ -1164 +1164 @@
   int hilbeledeg=1,hilbcount=0,minimcnt=0;
   BOOLEAN withT = FALSE;
+  BITSET save;
+  SI_SAVE_OPT1(save);
 
   initBuchMoraCrit(strat); /*set Gebauer, honey, sugarCrit*/
@@ -1466 +1468 @@
 //  }
   if (TEST_OPT_PROT) messageStat(hilbcount,strat);
+  SI_RESTORE_OPT1(save);
   if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
 

kernel/polys.cc

@@ -13 +13 @@
 void rChangeCurrRing(ring r)
 {
+  #if 0
+  if ((currRing!=NULL)&&(currRing!=r))
+  {
+    currRing->options=si_opt_1 & TEST_RINGDEP_OPTS;
+  }
+  #endif
   if( r != NULL )
   {
@@ -26 +32 @@
     p_SetGlobals(r);
     //------------ global variables related to factory -----------------
-  } else
+  }
+  else
   {
     currRing = NULL;

libpolys/polys/monomials/ring.cc

@@ -1433 +1433 @@
   //memset: res->p_Setm=NULL;
   //memset: res->cf=NULL;
-  res->options=r->options;
 
 /*
@@ -1577 +1576 @@
   //memset: res->p_Setm=NULL;
   //memset: res->cf=NULL;
-  res->options=r->options;
 
 /*