Changeset c8101d in git


Ignore:
Timestamp:
Nov 23, 2012, 1:27:37 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
b4c464c339773bb8009db6040454304617b51890
Parents:
32a76d8ff1ea7276dcd4a51110cc4bfb4506c97f5641361d547d954c224e5c07effaefe14c255070
Message:
Merge pull request #211 from mmklee/factory_fix_sw

Factory fix sw
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Tst/Short/factorizeQa_s.res.gz.uu

    r32a76d rc8101d  
    11begin 644 factorizeQa_s.res.gz
    2 M'XL(",P%$TX``V9A8W1O<FEZ95%A7W,N<F5S`(U82V_;1A"^^U<0;0^2*(K<
    3 MV7<-^U#T$J`H4J2W(@YDQ7:5.'9@*:BH7]_9]RPE!X$`:3G?S.R\=ZEW?__^
    4 MYL^F:=AU\\>;WYJ?]KO]ZG%[^]/EQ;N(P'6#Q`_;I^U^-K^\<+_-]75SO][L
    5 MGU^VQ[N_UA]VJZ>[_U:[_7J?I?AUD]=BU?1]<__R_*5Y>'XYWCUF1*Z:E^W3
    6 M0_/N:C8L/\V7LV\SMEK!?'F(O\?P.U]^_%HL4M?-E^W3U^?'\>H3M*P`^KIQ
    7 MU.;M%>J9WXC%T?U`!PO_S!>H=AZ)6<BLFC8P>!BYHM2!ZLCLMF;'+T!XPL6&
    8 M58.[>@U0LW3^::J6,100Q4P(9N(7S#,/X-:"6`JO,7+*",FEF@>3TN8H.?O:
    9 M:92`VB>]0W64H(I2Q:YJ]A*"BDN?C1)447)/.</,E+)BF(E<A+.W6)K_L/>_
    10 M7F"*/N#BBH45O`^U$`V-BB&`/(`^.EVNC7;6?9J7T+8S?/J60N*?<H"ZR(5Q
    11 M]0K%*PIK?5VML'M%(]KNW6%+_TE^PU!B`,RWUGZ[^7RW;W[F?,@(Q-9ZV32N
    12 MN3;87(?E6#42\-Q(S56SP5;JQ:9C/5.%1<26NC\@RP'06L>$!OL52+5!*3:`
    13 MF!<92:;#[/[P>F:"$K.AON;J`)6W=N;]^_SE^0&UH0]E)VQX1"\OJ&'CB66+
    14 ML2@UM6WC#QBW&,^:9TL:^.#2D+(`7&6`I2R@!YB%]9DL<*!96-.!QGD*@1,_
    15 M=.OY8C;B=V$0E3O?=V8]SU4_AL>JPK).21Q3U#%C,UTGO[:^NK;HUWIYZZH,
    16 M/2OBAKJVK5RSU+5U>^LFT(:TNAA^T#64;6?;^6*3O?.4SI/.>BB85[W;?SS5
    17 M>T:VT#TY*8'HP$-P8.,<N*4.<.K`P_<<\!O>MM2#6:2<=T!D!T[TGHHF<MHD
    18 M*2%Y%ICGO,;<?MX^/C8OQ17,8T@WK>+E<;FK*EG8<C#7A2R'E.VKQF@^]%PO
    19 MUHO#C5R,-PRG/"YV-[)E6JB,&8>QC%$Q)(^()TB8('7``P-E\&C"A0.LA@AH
    20 M!PP9*!)('!&-0">DM+TP?I>LS.TB`@3"0UD=@:)45A@AX+U!,G<2$/<)9(%D
    21 MA61;41VS1:K*5#L,V7.=@@(>8H9@?F>3,2K&W/8R0UQ8Z(4M*9#17MYQ;7@/
    22 MP15%L\,[/1@6@C8!E#4BJ3/)3Z*.A:!9FE#>,<$4!'T3A)KG4VW/FH?;E"J@
    23 MYM5`"YJI'GA=<"+88(6W/"8[`RVW`JHBY45FD-ZE*=!*P2'MDXLWR'!C3-A'
    24 M5T"K#8:.%OQ0[Z-/Z)4[N1&F[N1:.'7'R^@S[M1`RR3S[I!&X$$9GJD!R&W`
    25 M)Q*Y"2+`M.PQ*[FHAEB*O(-!YRJU,=50A%0&=!813)3"AM@J<+*1A\39C9C+
    26 M',^0M**>2&A>B`TSIII'.@)4PH=-1$"Q:N*D1$/'``0=.28C121WJ0=:KK"!
    27 M8QOHU%;@(8MN3J9D`'!(1F53`(HR;X#-$+-RZ">#-2)")753Q#5;G'BF0JC5
    28 MWB%UQFHFR#RB5D\`OTV<N=X">=8"+Y6CTP%.Q=0A*0U>1C+=E]EN`[63JK"G
    29 MW&3V,N]59*?:4\8FVKT6'LG:6E>2I/(QO9ZJ2&DGFN?,I>NH!DR*IR6]TQJK
    30 M\R0D"6V9TI846B%+E?,"I:&\GCBA:;Y:SJ4A=9G(Q!S?1N*,.:JT%S6'DH%K
    31 M51U!/D<M`Y.M2?%"LC#,D*/'$[NXFTVI;(660,\A4U1J.D>0:!57Y>SQ-*R#
    32 M:J1,C$SE-S$RI:HRLA"3D6GB((498:KC:$`B5U;1LT-/&..009.$H">)OU%T
    33 MPBIQ<FT2K5+D``DD8:PB)X2_>G36@CFY6HF6<5"]KFEE^UP4]?:Y@<OVA80'
    34 MU$"/#F>3.QP'0XX-XXF%,T]%7JZ3[@)_U=PO[@L)R&V[.;W7=UH!`[P3]0QC
    35 M7=Z+QN,.WQTU[^VP[C"#O1$#OD3">.PT&B`DOE#"$7O;X+LD=T\=TQQO>QRP
    36 M"G?YQGX8Y5'L.-ZRI>BMQC>U41RY(R@3G@\<%;GS=L#G\+3#:<+]DSSN.J7\
    37 M<MSE_Q+&L)+N_2VN%:ZAPY?<,?Z'H9%`WT_Q(_PGOX1*\E^<%"O_;Y[[K^[;
    38 1;L;FE\TO%_\#E'X])004````
     2M'XL(".QDKE```V9A8W1O<FEZ95%A7W,N<F5S`)5:6V\=MQ%^]Z]8I'TX.JO5
     3MDL-[#>NAZ$N`HDB1OA5)("N6J\2Q`TF!M?KU^6;();GGK(,T`JQ=#B]S^>:;
     4MX4;?_N<?7_]K&`9]/?SSZ[\/7ST]/EU]N'_[U>M7WQ8)70\8_.'^X_W3X>+U
     5M*_X]7%\/=S>W3Y\>[E_>_?OFA\>KC^\^7ST^W3S55>9ZJ,_V:ICGX>[ATR_#
     6M^T\/+^\^5(F[&A[N/[X?OGUS4)<_75P>?COHJRNZN'PNOU_R[XO+'W]M&OGK
     7MX9?[C[]^^K"\^8E&W03A>N#1X9LWV.?B>WM\X5\TT5'>S1';7I3!NBA>#6.>
     8M(&+,*JN>^SWJ]+2=CG\(XI-96ET-.%5VH.V42=Y.M]4:"VQ3D[*:^(<NZAS"
     9MT;;3E+XTT?03:35I.P=!&:N76+_QU$O4Z^?$H*V7:..ES72_G=Y<L)D5=KU$
     10M&R_Q6XVPC@U6&I&H(#Q\`VC^5W_WMU<(T0]X>*/S$WV7L5`4+1M3%IHL%.],
     11M%1OC8?KIHKEV/.#MM]4E\E8=-)59\*ML:+^PX7:_:;OA](4=H;N8HR_E9[6;
     12M5/,!:4FMI_O;G]\]#7\Q1E4)E=1ZN!TXN6Z17,^7RR:1R-1$&MX,MTBEV=Y.
     13M>M:^3;$EI>Z>,>69H"U/@L+R1,[?8I569"_:&M>QP^'N^<N1R9O$V][6B@[R
     14M]6A6[W^??OGT'KO!AG82$A[2UZ]ZQ98SS8Y+VS1N=5O^A'+'95>]U,)@%(=A
     15MC0(97P5ZC0(L0!1N=J)@J(_"34]HQJPNX.7/T\W%\;#@WS;!;LSY8V-N+BKJ
     16ME_RZ05C=TW6&^=ZPF.IX6.VZ%W3=PZZ;R[>,,EC6EL?>M/N-::DW[69\RPQT
     17MVZ6Z57_2-*P=#_<7Q]MJG8Q,,K1KH=6R]>/3C^?[[JQMXS*\;D+%@/?9@%LV
     18MX&UO@.D->/]'!LB!;\?>@D,9V3?`5@/.]CU?N@ZOAZR;='&VFSA;3\/#NU\_
     19M/3R]^W%XNYP4;5MC_UF[#.O/.["VF]A_!O-^'FV3=MGCD#T9"AHSK5>1`BFK
     20MDD]>*75\_CY`^?/QSTCV[_UQF1)I[ZQ542>3*"]QQP7Q..RL.I_.^UC,-[OS
     21MQ[,QGF\PWXY[)Q,D;E_AW:TPW>],7MAJ8TCIX`,9FTSPHKY1WH80G38I6;)9
     22M'1R80M#!!1<59"3'::6T5TX[4B:0C=545L]ZDZ"]T>1$A/DX)Z5H%;FHZW23
     23M/3DY[!N<\TXI(\9B0?1>H^BX:!1K+_,I>W(ZUV?:U4<<"4N]=<E$9:SR(4\G
     24MKY+#@+4Q>BO>RJZE$*V+(9)Q6)&CJHE\4G`@;\\>S+:.!ZTC]K36F:`<E=DA
     25M&NV35MYH72<;=HQ-+J6$4[US-L\>M34N4#(^:J?C.IV*8WP,.-7JI&PJVHQ$
     26M.D:X,K";K:J1-@(,YTP*B#.V5"LFO<?^-JC@M"JF6JY`*&!.P3%:IZ`1&_8+
     27M>:1HA+4)VD-_41Z6FLA>Q.[14L0XYN)58UI`8#&=XJKY>(#SE.8=M598(K.C
     28M5L$ZFVQ(/A:58:+&:4$[2$R*"`X,-/`?5`T``N*/?R^*=7R03=Y:33`^>R-H
     29M2M;#B89:QK'K#.Q2B(/'DN+L"8CR2F,IF1"KYQ@A&E8Q)@"KDLK1..\Y/4S0
     30M#"?1`AL;G0`0@\GP1U`Q,585_,(J1P?MH$QN8I!XACV0$(*(G8GC[1FI[$Z'
     31M3-.*6XCQX`U0B*3Q*1*MAD%'3=!`"UA:97:Z(SA:"8Y`<`1?).@7`&F*.%Y8
     32M(R(@.P+AN"#AVI,BO$"9B<DALH`H8[FP(@AW1UB8T4S[6C`+VB^L,VOR[2JR
     33M,[KFB/_2HG%_D5#?WH)%O*2`.0="!"DXBP@)'#50%P)>D-4@BT#9#0Q=($"%
     34MZ)$_D722Z1.231.BCC0'C3!\,XL*,S(2D=+)<_29#L71AJD,!`V=0&A,QFO9
     35MD-[3$+(36F%%(N@FE`0@&P]>\$`W4<Z2[$C.5@9=A(_A:PI*,MMI3`6S*P.>
     36M"11\S5<A`_(:_`LC%:>BA8JY((!C41\(``V6O//%BQPM'<@983[4"P45K60O
     37M,LE)-ML(F.<JDB.%LPUV`0$@)=8\<TA2O`'K"1ELUA3F`TP(<",BP0<EG1,#
     38M[C)PMD?T.)>LVE0>YSB[$!CP3J+"$<8QY2!07#>B)K6M/@1*!B2BCXG_*_44
     39M?`=34!K!0M`NJFT)BC&"!U%$$`(EE8)S-B'C?0`20&C16=55(<#'!Z95$CO+
     40M*0PY(6=M^2!JE<BBUP>G6=``2A)*A.=4P,Y020-VH#?0C_.E%$U@,+`1?HC`
     41M9B`>XV7_B/D)X0`D$$3;JA$S6W`):$PA0AR$GE1BRU"J@T,A`.1]5X^2XKKF
     42MF-4B:G9)3[!O8+8&3QGP,,9;00(2&=C@1^@#L6821(X0SD0=0QRYTCI::Q*)
     43MM@I4SD2O"T9`MLY@-1<RQ'&-N50\[BB@-+H$'B\1A^<\N@8$!T626ET0D/P_
     44M\2Y%BA.#>9^8HXM6(Z.<HH$/K70H)79BMD.J81471\?9SJ%(@!X*(_QA440=
     45M:GNI5:B!R&L,(P]0=`)R4RH%)S`*,HH5:CZ.BJ5<:8_<-MQA<$5$.Z5]+MUX
     46M!9"@*>I81)6^6"D$V,,BP`N=@TVY!QHQ"R8@VA;EUJK<[NVS(T*/;<$D("<7
     47MN'@F01=@Y9CDP.2("[<+K4IUG^F<[;ZG#(<[?;RCLTL+ZH%#@6:`<X5`86=-
     48MB8LM=!?WMCLGM^U<P/S"7WG<`BOA`0S8!?Z'\_!H%CM"2`MS21Y:_+1@*?`]
     49M6^VP(GA^@`1S8I3!,2DJ@W;)",OCB$<9-WP>U[(L"+&,TY*I(6_>]EFX"U4F
     50M#]LP1X/(2,$S2KL9]!$CM[`:M)7?^'!P`!HQ-W/W9\'%((3R(BI`C'YL!D\0
     51MC#/(2'D6-:2IYI:R[#VB4042Z]ZB)]I$K`\>MP`<[F0'>8-RG(L@[YAFL#SJ
     52M"_HA]">^O/'YXP'HUKK*@0[LW280%(S<"]<9[($J9A4!KK!*1^0&JD"=(!IB
     53M:$:(<+FAP`^\K51$^"'")0`'/^0O,^A[9^1IO@K,F5/V^K7Y[$*4NS*0(6>^
     54M1IY!K=/K5^[H`G,]9PR('I209L<CR!Q<0Z2N,./BU@,R1AH%3LFS*=+P.3VC
     55MY0>'!/[=OIX\HPUA7(=E!;1?*$/<3,"CY6>3$3UI<;-OZ`[C@O4F@QIU;P6W
     56M9_CI`GE+@C_LR#&V>.$[2ZR0EY)HU\F^0AX!H0)L8RO@&2@V%&BCUU\1+_5;
     57ME\Q!*F?,>[GLF0KY:+5MJ"QK8H,\:+0B7I(1M\0&:C!KA^F<E*1X"1H5Y"L?
     58MQ(\U,YGU5\2/(%:G*N(E1\'`2"*,`'$H5?*8,]5P@6M81P/KJ8$YWZ:"2@W.
     59M7.]FOE^ZDJSH_ZVM8B'=/EF@.S"99@^&Q@'<&^HN6X17N)6K.H`<G6WIDGLX
     60M-Z.A0-B,/.0TY7JWNL0ZW[GDR^YB=4!&LMN(EBKO)EJ@AP`/(>N2MCYQGO'U
     61M!I[3GAMFZ;98B@P@*`Q7<>9RRRM<KD.^1["]N"EQJXE\`>$;9`+4X[1$C9>"
     62MBAB!`0DLA?Z8PW0^I:0^W(`+,@B2VVA@$)6.T`IROX.[*9Q%O$H:-G069Q,R
     63M4R"L(6<ERK>D)7*>60Q-ETIR0TWHUM@7,:#'0KBC$S6YTTT>C1':E`!^X4;>
     64M<,7F?GG_.YOK/I$Y?S7\?/_AP_#0JF>X+E_"^H^[ER^7CYLO8:Y]"3OYONOJ
     65M1]`W`[15LPG'FW)%T_;X@H='M)DZ@`U76629KK)^&89Q1:HB-$\BRK<4;2"P
     66M(N#>(@L""U05M!5:/D"M`F[90<E13JF;\2DVB\B*J&[7B<JJNF$1D9EC:>\U
     67ME7/RL"WWU[09Y<F)KRAU%)"HEH?5*20B^493O:**5^ALF98[;149"_JPJ87`
     68M%7T-;CG1S)1-\7UTS(1RI;/33@2XB=IUN[C:V6VGL]-2'U"#*P(ZS;S?B:17
     69M3T*==M73U*&@5V\K&'%A]3.9+>!LUB%9T;P$NPI&`\;8@-2T-4@K-NE4,'(#
     70MOIY3P9O7<)G.YX2-`,T:7-<#7FW/"6?C&W-J(IR:4[%P;HZL"3OF;`6@'2WF
     71M=(E@\F8*!50$-0W,R8J:!$6`<C,C*A54JD#1@/)#16DJH::VR%=!J$LLUX+5
     72M&"JI0F<'B<CN'J3ETU`5X<JT922HEWVC<?/JPQ.*H%\A;K-%X/6&<=9`$W^U
     73MM3WEQ"II2VJ6BF#D6_F:!F%-*Q(1JNU\PI)9`)(LFYT*J&TF"J0JTLFI^818
     74MB\3Z=;M3"2=;8;RXD?1:BT%^1VMM.S[JM3X1R#&%<T4#MZN!K*K>F2ARCV`V
     75MA"EK<$>8&[>G/#KQMY^:4"4V=7KC>U^F][NO$3O9778Q99B+-$+7(1_AE5'?
     76M07L=DYD5NCR*>\_JS]3ESHA+:67"+J"X/834`:T-.U_C0BVA9)_"T'V\1F-P
     77MHVRX7(<[=22-[(XZOJ57KTX_3'(OZ$J0Q`B]>:S:K/[",%J:V)4>&9S*:6D-
     78MY6B#H[X.Q;9EZ'D$@XFOC[7VR!APL*&4$R57^)THN89JHV0;7)5<&0<C:$?C
     79MIAPI#!K<_?K:$4XF%I*!2M;VE40ZBHF_3IVU37;TOBL@>0@=K.\JA+0>$[K0
     80M>-9:6=SBR<]A.]:.KZ#8'E\3N!W?AB:^/76E@W7BXJAB5S:B#+:9E15-;2<]
     81M_R_S-\/=\:X-Z>O-1YW3#SJX+./"BYYHQE4HM4\WR\LCFFU<&9.ZF1#!.7^4
     82MI.5E"E#`.KY^O""WXZQQ)<';Q)_1I&<_OCRVJ_+B7NPC7TEP#TKAAB]!+X8'
     83M?,SO?"5\X7JK\)[?'L$F1M[<R^/DO3PNC_5/;);\Y/C/&LJSQS--N&8LY4][
     84K`@;Z/]O`CY6?^K<9GEIS[\V5_)$;_PG;;X\'??%Z^.NKWP&KI%B;&R<`````
    3985`
    4086end
  • Tst/Short/factorizeQa_s.stat

    r32a76d rc8101d  
    1 1 >> tst_memory_0 :: 1309869508:3132- 13777 :3-1-3:ix86-Linux:mamawutz:559656
    2 1 >> tst_memory_1 :: 1309869508:3132- 13777 :3-1-3:ix86-Linux:mamawutz:1718136
    3 1 >> tst_memory_2 :: 1309869508:3132- 13777 :3-1-3:ix86-Linux:mamawutz:1750920
    4 1 >> tst_timer_1 :: 1309869508:3132- 13777 :3-1-3:ix86-Linux:mamawutz:1988
     11 >> tst_memory_0 :: 1353606379:3150:3-1-5:ix86-Linux:mamawutz:913456
     21 >> tst_memory_1 :: 1353606379:3150:3-1-5:ix86-Linux:mamawutz:2240284
     31 >> tst_memory_2 :: 1353606379:3150:3-1-5:ix86-Linux:mamawutz:2273068
     41 >> tst_timer_1 :: 1353606379:3150:3-1-5:ix86-Linux:mamawutz:576
  • Tst/Short/factorizeQa_s.tst

    r32a76d rc8101d  
    4444facstd(g);
    4545
     46//ticket #462 reported by gorzel
     47ring rw15 = (0,w),(x,y),dp;
     48minpoly = w^2-w+4;
     49
     50poly f1 = 46082720409696000*x^7+(-46082720409696000*w)*x^6*y-92165440819392000*x^5*y^2+(46082720409696000*w-92165440819392000)*x^4*y^3+(46082720409696000*w+46082720409696000)*x^3*y^4+92165440819392000*x^2*y^5+(-46082720409696000*w+46082720409696000)*x*y^6-46082720409696000*y^7+(33201767234937600*w-30647785139942400)*x^5+(9771757580851200*w+100160515203724800)*x^4*y+(-44639165312524800*w+72399840258124800)*x^3*y^2+(-50857556500339200*w+8661330583027200)*x^2*y^3+(-9771757580851200*w-100160515203724800)*x*y^4+(33645938034067200*w-26095034448864000)*y^5+(-27845878235380000*w-122690040515260000)*x^4+(118340445370520000*w-78316910631160000)*x^3*y+(49599903465540000*w+143572936815180000)*x^2*y^2+(-68740541904980000*w+221889847446340000)*x*y^3+(-46553976962930000*w-92669364707510000)*y^4+(-10245093811971840*w-22646289009116160)*x^3+(13836455538428160*w-45510917399009280)*x^2*y+(23501184011055360*w-81074549479680)*x*y^2+(1628715454398720*w+33167517920305920)*y^3+(-39904964412744000*w+71294643532392000)*x^2+(-33810691604940000*w-61360144023780000)*x*y+(33142826091756000*w-83566672337148000)*y^2+(31945832606457089*w+80538751785644435)*x+(-60831105992681752*w+16100113835778104)*y+(6386463969822000*w+7137812672154000);
     51
     52poly f2 = 2294919476402860800*x^8+(2294919476402860800*w)*x^7*y+(2294919476402860800*w-4589838952805721600)*x^6*y^2-4589838952805721600*x^5*y^3-2294919476402860800*x^4*y^4-4589838952805721600*x^3*y^5+(-2294919476402860800*w-2294919476402860800)*x^2*y^6+(-2294919476402860800*w+2294919476402860800)*x*y^7+2294919476402860800*y^8+(2079252344885483520*w+199077352169886720)*x^6+(1664507861198219520*w-6691211003487859200)*x^5*y+(-940087496357798400*w-4357582041940853760)*x^4*y^2+(-132718234779924480*w-1360361906494225920)*x^3*y^3+(11059852898327040*w-5164951303518727680)*x^2*y^4+(-2615655210454344960*w-3058049326387426560)*x*y^5+(-1725337052139018240*w+3428554398481382400)*y^6+(-303374279659956000*w-5069995781923932000)*x^5+(-3770035487253912000*w-433219676416104000)*x^4*y+(-4550011664055924000*w+3596807869771812000)*x^3*y^2+(-2903294868999996000*w+8363429372035788000)*x^2*y^3+(-888281095906038000*w+7908367952545854000)*x*y^4+(2166700912923936000*w+2079936471472032000)*y^5+(423632341377847296*w-2525937150738157056)*x^4+(-1427080802231483136*w+208937943910563840)*x^3*y+(233775974997891072*w+1098882998754621696)*x^2*y^2+(909106583118508800*w-2643717921543353088)*x*y^3+(-1102041053136433152*w-662978218196823552)*y^4+(-2937940392496416000*w-2605343366930784000)*x^3+(-4025809830284004000*w+6326272590446292000)*x^2*y+(-2903294868999996000*w+8363429372035788000)*x*y^2+(1552119452639616000*w+5543283759427200000)*y^3+(-15951155173959635*w+2981235020448425687)*x^2+(1622440449955667768*w+1652892262372213288)*x*y+(1685231063399012416*w-2263997141199178816)*y^2+(-1166168320889497200*w+991554882467540400)*x+2294919476402860800*y+(941170437657378096*w+239157859721078160);
     53
     54factorize (f1*f2);
    4655
    4756kill r;
  • factory/facBivar.cc

    r32a76d rc8101d  
    102102        K *= degs[i] + 1;
    103103    }
    104     K /= power (CanonicalForm (2), k);
    105     K= K.sqrt()+1;
     104    K /= power (CanonicalForm (2), k/2);
    106105    K *= power (CanonicalForm (2), M);
    107106    int N= degree (mipo);
    108107    CanonicalForm b;
    109108    b= 2*power (maxNorm (f), N)*power (maxNorm (mipo), 4*N)*K*
    110        power (CanonicalForm (2), N)*(CanonicalForm (M+1).sqrt()+1)*
    111        power (CanonicalForm (N+1).sqrt()+1, 7*N);
     109       power (CanonicalForm (2), N)*
     110       power (CanonicalForm (N+1), 4*N);
    112111    b /= power (abs (lc (mipo)), N);
    113 
    114     ZZX NTLmipo= convertFacCF2NTLZZX (mipo);
    115     ZZX NTLLcf= convertFacCF2NTLZZX (Lc (f));
    116     ZZ NTLf= resultant (NTLmipo, NTLLcf);
    117     ZZ NTLD= discriminant (NTLmipo);
    118     b /= abs (convertZZ2CF (NTLf))*abs (convertZZ2CF (NTLD));
    119112
    120113    CanonicalForm B = p;
Note: See TracChangeset for help on using the changeset viewer.