Changeset 35a23c9 in git


Ignore:
Timestamp:
Jul 9, 2015, 9:59:01 AM (8 years ago)
Author:
Adi Popescu <adi_popescum@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
cfb76991db369d1e2260fe445a2db3c51eec3616
Parents:
6eb2185c03b38906584bfd5975f6f6aeaac9a407
Message:
fix: std over Z tests with global ordering.
Still have to check the memory leaks from preIntegerCheck
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • Tst/New/stdZtests.tst

    r6eb218 r35a23c9  
    6060gI;
    6161ggI;
    62 
    63 
    64 
    65 ring rng = (integer),(x,y,z),(dp(3),C);
    66 option(redSB);
    67 option(redTail);
    68 ideal I = -5*x*z^2-73*y*z^2, 2*x^3*y*z-129*x*z^2+8, 11*y^3*z^2+85*x^2*y*z;
    69 ideal gI =  std(I);
    70 ideal ggI =  std(gI);
    71 size(gI)==size(ggI);
    7262
    7363
    … …  
    177167ideal I = -4*xk+10;
    178168ideal J = -7*xw+4*xk,-13;
    179 idealsEqual( intersect(I,J) , intersect(std(I),std(J) ) );
     169ideal IJ = intersect(I,J);
     170ideal stdIstdJ = intersect(std(I),std(J) ) );
     171reduce(IJ,stdIstdJ);
     172reduce(stdIstdJ,IJ);
    180173
    181174
    … …  
    286279qring QR = std(Q);
    287280poly a = z;
     281std(a);
    288282ideal J = 5,z,x;
    289283ideal aJJ =  quotient( a*J, J );

  • Tst/New/std_integer.res.gz.uu

    r6eb218 r35a23c9  
    11begin 664 std_integer.res.gz
    2 M'XL("/Z#"54``W-T9%]I;G1E9V5R+G)E<P!]4TMO@S`,OO=76-4./`)M'J6@
    3 M"@Y[')"F7;K;1*M.11525U6%:?WYLT,(09-V(+&_V-\7&V?[_ER^`0`OX+5\
    4 MA'G7=O&Y^9QO`*U]<VDZS]_,:(>B@+8[(M;5I_H67^J?N.T.W6QK*$0!UI;Q
    5 M:*L8%@MXN1^^KN<:N,57,=R:RPEN^.7@&5Z?>7>/^^SN"5HD+8J6E8]'QRON
    6 M[`FO-+`D!33'^G"&$I"%8G<BHKR`4IBQE!]95Y]K2DXV%UR'DME;$6<BT)$R
    7 MDH%E"#5#I`)*#(R2&+Q!<`I@E@6FAYCK,#&5*D.I(T.AQ$BZ$Z$0YCC4EQS4
    8 MHO0_.>7*,?>N+$O2,:F75&I$HE[?[8I3N9Q4KB9"@XRI2(X5F9X*4]L@J^F5
    9 M\T?7>LZ\$J']!Z]RGN(NJESV/R=!3U9YIK/05E7>*Z*]JG+3K]20+Q%-"#4]
    10 M07=-[G1,$$T)=6<%L<PF:B6^[&/,`!'"^PCJDOPS1;:BU'D96:Q?%KV<[Q93
    11 ,-P^S7T&$W36$`P``
     2M'XL("-S?FU4``W-T9%]I;G1E9V5R+G)E<P!]4TMKPS`,OO=7B+)#'G8Z/]HF
     3ME.2PQR$P=MEN(RT=#270E=)XK#]_DN,D#H,=8DN?I>^S%/GM_:E\!0!1P$OY
     4M`'/3FN34?,XW@-:N.3<F"#<SVJ$HH#4'Q$Q]K*_)N?Y)6K,WLS='(0L8;)6,
     5MMDY@L8#GV_[K<JI!#/@R@6MS/L(5OQP"QQNRX!:(D-T"28NB1=.R#/'H<,&=
     6M/>*5>I95`<VAWI^@!&2AV*WDE!=1"G.6#OG@VG-+*<@64MA0,CN+"R8C&ZFX
     7MB@:&V#)P'5%BY)1D[_6"4P"S!F!ZB+D>$].I=I0V,I9:CJ1;&4OICF-[R5Z-
     8MI__):5^.^7=EV2H=DSI)K4>$=_I^5[S*U:1R/1'J95Q%:JS(]52ZVGI92Z^]
     9M/[JV<Q:4".T^1)6+%'=9Y<K%2W15E6<V#6U=Y9TDVLLJ[QOFBD)P1:#K";IK
     10M<J=C@FA*J#\KB&5#HA42]UV,&R!"1!=!75)_IFBH*/5>1I;8ET4OY[O%U,W=
     11*[!<82*W;A`,`````
    1212`
    1313end

  • Tst/New/std_integer.stat

    r6eb218 r35a23c9  
    1 1 >> tst_memory_0 :: 1426686974:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:203720
    2 1 >> tst_memory_1 :: 1426686974:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2240328
    3 1 >> tst_memory_2 :: 1426686974:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2281312
    4 1 >> tst_timer_1 :: 1426686974:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2
     11 >> tst_memory_0 :: 1436278748:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:130744
     21 >> tst_memory_1 :: 1436278748:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2228224
     31 >> tst_memory_2 :: 1436278748:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2228224
     41 >> tst_timer_1 :: 1436278748:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2

  • Tst/New/std_integer2.res.gz.uu

    r6eb218 r35a23c9  
    11begin 664 std_integer2.res.gz
    2 M'XL("`.$"54``W-T9%]I;G1E9V5R,BYR97,`C5K+;MTV$-WG*X2B"]]0O!%)
     2M'XL("-??G%4``W-T9%]I;G1E9V5R,BYR97,`C5K+;MTV$-WG*X2B"]]0O!%)
    33MB9)@V(NB700HNDEW11RDB!$82(,@=E'G[TN*,\,SY"W217SU(.<]9V:HO/G]
    44MY]>_#</@;H=?7_\T_/#T^'3^]/#G#]=#NGKW\/GAZ>IT_2+_#K>WP^/3A_3L
    … …  
    4646M)Y39T%H[GT:L-9Z`BF`ZD:#"6:TBHK0>/%J0UC)'SK?)J!PKWR;KD4A?A!3A
    4747MB@SQ.Q'3)2;$D/H<P1O'+NWLCJFOLX[=<MS4C^7K\<W^ZG5Z].X/]_;&[>G7
    48 MO[TY6KU\'=[>Y!WI:LY7]'3)UQDNA-`&W_;W\_&?`_*W_[\?T[+K'U_\"RU#
    49 &X\1'(```
     48MO[TY6KU\'=[>Y!WI:LY7]'3)USEZ@E#:X./^?C[^=T#^^/_W8UIW_>.+?P'8
     49'`$2]2"``````
    5050`
    5151end

  • Tst/New/std_integer2.stat

    r6eb218 r35a23c9  
    1 1 >> tst_memory_0 :: 1426686979:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:258264
    2 1 >> tst_memory_1 :: 1426686979:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2241464
    3 1 >> tst_memory_2 :: 1426686979:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2282448
    4 1 >> tst_timer_1 :: 1426686979:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2
     11 >> tst_memory_0 :: 1436344279:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:180968
     21 >> tst_memory_1 :: 1436344279:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2228224
     31 >> tst_memory_2 :: 1436344279:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2228224
     41 >> tst_timer_1 :: 1436344279:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:3

  • Tst/New/std_integer3.res.gz.uu

    r6eb218 r35a23c9  
    11begin 664 std_integer3.res.gz
    2 M'XL(")IJ*E0``W-T9%]I;G1E9V5R,RYR97,`38]+"X)`%(7W_HI#M!AAFE#+
     2M'XL("-W?G%4``W-T9%]I;G1E9V5R,RYR97,`38]+"X)`%(7W_HI#M!AAFE#+
    33M#'$6/19"M*E=2!@.,F`2.I'^^ZYBVF+F?%S.N8_+]1"?`3@2IWB'F:F-*/1C
    44M%H+HKDMMF!U:G4)*U":CFE&YJCQ1JH^H36JLR]##E1C9$Q.O!)9+')OT^2H4

  • Tst/New/std_integer3.stat

    r6eb218 r35a23c9  
    1 1 >> tst_memory_0 :: 1412065946:4.0.1, 64 bit:4.0.1:x86_64-Linux:maunzerle:176624
    2 1 >> tst_memory_1 :: 1412065946:4.0.1, 64 bit:4.0.1:x86_64-Linux:maunzerle:2240296
    3 1 >> tst_memory_2 :: 1412065946:4.0.1, 64 bit:4.0.1:x86_64-Linux:maunzerle:2281280
    4 1 >> tst_timer_1 :: 1412065946:4.0.1, 64 bit:4.0.1:x86_64-Linux:maunzerle:1
     11 >> tst_memory_0 :: 1436344285:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:106840
     21 >> tst_memory_1 :: 1436344285:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2228224
     31 >> tst_memory_2 :: 1436344285:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2228224
     41 >> tst_timer_1 :: 1436344285:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:1

  • Tst/New/std_integer4.res.gz.uu

    r6eb218 r35a23c9  
    11begin 664 std_integer4.res.gz
    2 M'XL(")YJ*E0``W-T9%]I;G1E9V5R-"YR97,`15#+;L(P$+SG*T:(@X,L0TQX
     2M'XL(".#?G%4``W-T9%]I;G1E9V5R-"YR97,`15#+;L(P$+SG*T:(@X,L0TQX
    33M*<*'/@Z@BDNX514RBH4LA9`FB^K\?9>*)@>O1SNSLX_\^+8[`$@,/G8O&%%+
    44MJO3G409&)U]Y$G$6/7X8@Y8*SI&[N"95E?M1+5F*\J>'-NCQ7`TX59A.\1[L

  • Tst/New/std_integer4.stat

    r6eb218 r35a23c9  
    1 1 >> tst_memory_0 :: 1412065950:4.0.1, 64 bit:4.0.1:x86_64-Linux:maunzerle:179368
    2 1 >> tst_memory_1 :: 1412065950:4.0.1, 64 bit:4.0.1:x86_64-Linux:maunzerle:2240296
    3 1 >> tst_memory_2 :: 1412065950:4.0.1, 64 bit:4.0.1:x86_64-Linux:maunzerle:2281280
    4 1 >> tst_timer_1 :: 1412065950:4.0.1, 64 bit:4.0.1:x86_64-Linux:maunzerle:2
     11 >> tst_memory_0 :: 1436344288:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:107992
     21 >> tst_memory_1 :: 1436344288:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2228224
     31 >> tst_memory_2 :: 1436344288:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2228224
     41 >> tst_timer_1 :: 1436344288:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2

  • Tst/New/std_integer5.res.gz.uu

    r6eb218 r35a23c9  
    1 begin 644 std_integer5.res.gz
    2 M'XL("#(*_U0``W-T9%]I;G1E9V5R-2YR97,`K5--2\-`$+WW5PSBH279-;,?
    3 M:20D!]%#BGC1FQ2I-$B@%FDC[N;7.[.-FUX5#V%F-N^]G?=@'Y]NFP<`P!KN
    4 MFQNXZ(^]W'6O%R50]]+MNWZ^*&=<H:[AV&_IK&_?VH.5^_9+'OM-/WL<-50-
    5 ML==RZHV$JRNX<YOWCUT+-IY;"8=N_P8'^BH8==.Y2WTZ+-+=1QF1>0W=MMWL
    6 M`)I5!:B='Y+<^619N"'1N1.(7@TBS_V01M)2`N8%0PM#6,PR1MO,N`25UP*M
    7 M(5*R5%Z):V7.J84$P5SE!R6(354$OJ*9%8CGO`Y+Z(2$'"DIGE38QZN$%.EJ
    8 M%26O61*]"5OJ(7K#;$H-41+RY)2B;E84"]5YLUI,>$H93G_+62C/N*[0LBA[
    9 M^?%%&^B<US$Z&E0C0:VK$,DI"Z;^A!$X)_"(U>N*(Z2D/?DC.8I%:`Z0G&8%
    10 MWR14AI;96)@B)&:IQ(5U/5DZ=Q7Z,V-F-#9Y^XN]7SK\+Y.6EX]3+L/SX=?Q
    11 0>9SCHKR<?0,^GX.0:0,`````
     1begin 664 std_integer5.res.gz
     2M'XL("./?G%4``W-T9%]I;G1E9V5R-2YR97,`K5/!:NLP$+SG*Y;20X(MU;N2
     3M'!=C'<KKP>'Q+NVMA)(24PQI*(E+)7_]6RFNDFM+#V97TLQH9XP>'O^T_P``
     4M+?QM[^!J.`YRU[]<U<#=<[_OA_FBGH4*UL)QV/+>T+UV!R/WW:<\#IMA]C!I
     5MD(74*WGNM82;&[AWF[?W70<F[1L)AW[_"@?^&IAT\[G+?3XN\MU[G9"EA7[;
     6M;78`[:H!5,Z/6>E\MJS<F*G2"41/HRA+/^:)M)2`916@E68L%D5`FT*[#,DK
     7M@48S*5N2)W%+^I):21"!2WXDP6RN(O*)UT&!><ZK.(3*6,BQ$H45Q7D\9:S(
     8M5U.2O`V2Z'6<4HW)&Q;GU!#EY).#;E<<"M=YNUJ<T61/9_4LEB=<-VB"8/#Q
     9MY8EO5V481:MDCB8"K9L8QRF'0/T*(G).X`FKUDV(CU/V[(WE.!*A0GCLLJC"
     10M38(*-(&-E:YB6H9+&E?9LZ%+3[&_L*5M0D1G/S'W37^_9=%8_KMI5<KX<,*[
     111^#C.<5%?S_X#U>E;,6,#````
    1212`
    1313end

  • Tst/New/std_integer5.stat

    r6eb218 r35a23c9  
    1 1 >> tst_memory_0 :: 1426000434:4012, 64 bit:4.0.1:x86_64-Linux:andromeda.math.uni-hannover.de:185992
    2 1 >> tst_memory_1 :: 1426000434:4012, 64 bit:4.0.1:x86_64-Linux:andromeda.math.uni-hannover.de:2240312
    3 1 >> tst_memory_2 :: 1426000434:4012, 64 bit:4.0.1:x86_64-Linux:andromeda.math.uni-hannover.de:2281296
    4 1 >> tst_timer_1 :: 1426000434:4012, 64 bit:4.0.1:x86_64-Linux:andromeda.math.uni-hannover.de:4
     11 >> tst_memory_0 :: 1436344291:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:113800
     21 >> tst_memory_1 :: 1436344291:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2228224
     31 >> tst_memory_2 :: 1436344291:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2228224
     41 >> tst_timer_1 :: 1436344291:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2

  • Tst/New/std_integer6.res.gz.uu

    r6eb218 r35a23c9  
    11begin 664 std_integer6.res.gz
    2 M'XL("`:$"54``W-T9%]I;G1E9V5R-BYR97,`C5E+3V6Y$=[WKS@:90$8WSE^
    3 MVT*PB)(%4I3-S"Z"48\:C9`ZK5%#%"Z_/E4NNZI\Z$46<,_QM>OYU<OWEU__
    4 M=O_/;=O<W?:/^[]N/[V^O)Z^/O_^T\T&3[\]?WM^O;B\^82?V]W=]O+Z!=9>
    5 MG_YX^IY/WY[^>WIY_?SZZ9=!P]]M_!Q.\AQ/V\\_;W]_^_SO/[\^;9G7TVG[
    6 M_OSMC^T[_-UN%X/PY?7%V_7Y^OWR^LN?-[PW*]KEM#U_>?K\=;N'8S[ZJ[?'
    7 M</5NSH_^ZMV>X<FYJ_,U;Z^G[8P;'KWM6QY]WX"/)M8H&QMNC$@#MUNWYUB1
    8 M-FT/-D8\9?"##[G]M"'[<Z?O9=V=X*]+QIPZ+8_OUFL2'K<6YY%9ML[/8\&T
    9 M7"<)R\^=1+2Q[^CDA!28G<YGD"<8D,JB.60#^,*[@I0\"09ZN9@\+?1#+K4B
    10 M[XHX^$NV#HNJ!3)M:37+@AS.I\T6G\4B:$FR"?$QW?9`,@7/RW;P,7ZPM.PZ
    11 MU'/1'6#AVQX7\0ZZ`IW0DEHQ(;G0I5"$`#`D:3<T\)0WQ%DI88\=&<D$U^+D
    12 MZ*UZ$VJ`*O$=$=!F0"@\)F1"A@N$,>)LO/-MK%I/?F=#*'CN'9\N^(\`]0!0
    13 M4#DL7K(YU%K%QZ;LOF1>D,.`8K6U\]7OJP47=WA`M4VPE#N#1EH":SA,"@\=
    14 MT2DI#$N''$C)'(>QT'0(]'X,[86@61B%Z:[4T9PUMDT08-L0?H!J'^4X!7'0
    15 M")H$R&YR"F+!4NK)O(V!;074WD\HRUD,A::81*-ECC8O*L@Y`+A5L`3M%"R5
    16 M?B2YG`,\1X$?;/1*6##1(KL<0^`ZO_!K*[\!=_)K:XO=T(,:<2[\**<$0"<;
    17 M/"T&CPM0TV+"`+@L0^J1-)2"WN0LK]85%6ZFU@\."9B`1]*;(,AY1<$"@PY3
    18 M?K><,(5B0+64)D;[QG+(I"5_&GD12A'#B#)BOAK%3;218J$+Q,BKHT3D#Q4G
    19 M('K97P-**Y:6E`?'8T@:E>!?3K5D$4E]VK((=::<Q#?B8#$EQO^:P!63U=!+
    20 M`@@8%VR5N(3=D+X.+[CI@5[*R4!H1G^@6)$BITR2>[&7MYPQ.V(@&]?V?^L1
    21 M2W/YHQY-@R9KT*0%--V?"CC1Z++,]"+$%MLA4>ED&QFR.V5;59ZD)J/3\6#'
    22 MSR@[0AL"L$N7CET$&<L=RLT/0C_ZJ6Z2<DUV6H,]<C!E)LAM$796'P(Z8M#X
    23 M'%*H(J)9:[K@#O&PU/36^"N[%'CSHP(?,9A<V??<:H^1:FJI,4_%P#![2F&^
    24 M>R.<DUF^L\'GPCY-=>>RJ_&D+`C1-5E1D,=<DZ.B=-8>AK8G^BY<MM$'3I:3
    25 M";F[%V;K6ACYTOB]N]YE0L;*'*/.`^S#'A4.P/42"0,+6D<J%3'4*QU,+L4,
    26 MQWB/[B)[W`*V]B4?';L292T2X]"FB-P]MA>7A`4<N?-;7(9=3PI1M-)X(9\*
    27 M9L"I+KL%:@I#44N*C/67*K[:[$IF\,;4IJ=Z^!+#H*'"!2^3&E9UCXA#=BR%
    28 MS4Z4#3>2!`)"06#3TY.I2^9D01,6<%^A!9WELVNE$E+N;>P!)]!8E#TI@SK(
    29 M[2DS#1S16F$<`1*#5Y#!XZ6PC6TM3HTE<-;5_:-1D\,91.5M4$N"L9CEJZ"C
    30 M,>MH3#H:97Q,D,\DY#*TZ[UB!)*?3E"Z15.6)>GV0,ODN$3-O]`-6NI*Q<<K
    31 M[$HQEB#T\4K'5UB[F34["Z>XA$:E2&164<)LNEF]ZAA+::(W#]2$6KPD<#.@
    32 MF*ET3E3V@4=UJCK+"VUL*52^Z%+:$0YI1@=WIJ.^9QV\";!7.+CA[#'52%T-
    33 M"E:Z)Q)Q,`U*-J@Z&R2*)"5+7"135"`IC4.CVH[(I<P[(S3/")VP(OD(59$M
    34 M)V1["S_K\KF/&C(JQ3ER]KF),Z!&1-ZEPE35%W+5-WIT$AIG92UQ778*%C1!
    35 M9%*YCR%3_]X('&YU_&Q]SP9SA9#TO0H5A<)>597*R:Z]O416#HMYQBRF%OQJ
    36 MI>-`EB%>1K7+LELI&&<=&_J:6;WD"H2O,V8C[=<..O=!4\*;9#QH#'@9UQKB
    37 MF&5P.@QKNJU1K.2*9L21]N^8"U2>KL?&7VJ9T"Q\9Y2%QFJSP+E>^KM)*8\Q
    38 M>KIP#MN4C?*LH91%YXW*N!FBT@5Q(=)4UK!VH*C;`=G4V_`.S#J\>!C^^)#H
    39 M6?:9_%OWAUP)OAVF\>)Z_FK#A&=RG^I[T1[22H?#Z"GY21Q7/&>/RC;E)%?7
    40 M`;9G8T52)3R>*80RWJT0A-LJVW`,PWU@65UK\<4'-8[H+*,HXT7D[-!9ZF/U
    41 M00#JRA<.!0COA:CTRQQRL*4JZH>F_SB5Z8E6Y(3X\RFY/98^&(&.=)OA2FY#
    42 M]%%4]Q1=\DH=V*;7UHNVWN_+[*OZ$J,:C[`TMDIB$;#7PRE.8YPPO38G]#D_
    43 M-MTRS*CD"3\?D38]+;T-]"O2V_#0A@-#G[/GK;7M70T@9LPF5V>^SB_E;ESA
    44 MO[Q^P5M\^+BXOY3O:_^MX?[F$_[_EWNX=94>_<-MQ@BGM_!PZ\\@*+U%>'L'
    45 M>;"EH)7T<'O&"R!($;20'V[#FX?7MT&A/-R^^;-M;WC*S=4*JPA&2#&TT'#;
    46 JNS<5#\.N*6>3GR7J+C]Y5`AR_/T$?Q[YS\N%N[SYRZ?_`:N[\"=J&0``
     2M'XL(",CRG%4``W-T9%]I;G1E9V5R-BYR97,`C5E+3R0W$+[S*UI1#H#Q;/OM
     3M%H)#E!R0HEPVMPBBC4`KI,UJM1"%X=>GRF57E1L..<!T>^QZ?O7R?/S]YYO?
     4MEF5QU\NO-S\M/SP_/1^^//[UP^4"3W\^?GU\/CV[/,'/Y?IZ>7J^A[7GA\\/
     5MW_/AZ\._AZ?G3\\G'SL-?[WP<SC(<SPL'SXLO[Q\^OO;EX<E\WHZ+-\?OWY>
     6MOL/?U7+:"9]=G+Y<'"]>SR[NOUWRWJQHE\/R>/_PZ<MR`\=\].<O=^'\U1SO
     7M_/FK/<*3<^?'"]Y>#\L1-]QYV[;<^;8!'TVL439NN#$B#=QNW9IC1=JT/=@8
     8M\93!#S[DUL."[(^-OI=U=X"_)AES:K0\OENO27C<6IQ'9MDZ/XX%L^4Z2%A^
     9M;B2BC6U'(R>DP.QT/H,\P8!4%LTA&\`7WA6DY$DPT,O%Y&FA'7)I*_*NB(._
     10M9&NWJ%H@TY:M9EF0P_FPV.*S6`0M238A/J;9'DBFX'G9=C[&=Y:678=Z3KH#
     11M+/RVQDF\G:Y`)VQ)K9B07&A2*$(`&)*T&1IXRAOBK)2PQH:,9(+;XN#HK7H3
     12M:H`J\1T1T&9`*-PE9$*&"X0QXFR\\UM?M9[\SH90\%P;/EWP;P'J`:"@<IB\
     13M9'.HM8J/35E]R;P@AP'%:FOCJ]]G"T[N\(!JFV`I-P8;:0FLX3`IW'5$IZ30
     14M+1UR("5S[,9"TR'0VS&T%X)F8A2&NU)#<];8-D&`;4-X!]4^RG$*XJ`1-`B0
     15MW>04Q(*EU)-Y&P/;"JB]'U"6LQ@*FV(2C98YVCRI(.<`X%;!$K13L%3ZD>1R
     16M#O`<!7ZPT2MAP423['(,@>O\Q&^;^76XDU^W;;(;>E`CSH7W<DH`=++!TV3P
     17M.`$U328,@,O2I>Y)0RGH3<[R:EU1X69J?>.0@`FX)[T!@IQG%$PP:##E=\L)
     18M4R@&5$MI8K1O+(=,FO*GD1>A%#&,*"/F\U[<1!LI%KI`]+S:2T1^4W$"HI?]
     19MU:$T8VE*>7`\AJ11"?[E5$L6D=2G+8M09\I)?",.%E-B_,\)7#&9#3TE@(!Q
     20MP5:)4]AUZ6OW@AL>:*6<#(1F]#N*%2ERRB2Y)WMYRQFS(0:R<=W^MQZQ;"Z_
     21MU6/3H,D:-&D"3?.G`DXTNBPSO0BQQ79(5#K91H;L3ME6E2>IR>AT/-CPT\N.
     22MT(8`;-*E?1=!QG*[<O-.Z$<_U$U2KLE.<[!'#J;,!+DMPL[J34!'#!J?0PI5
     23M1#1S31?<(1ZFFKYM_)6="KQYK\!'#"97UC5OM<5(-;74F(=B8)@UI3#>O1'.
     24MR4S?V>!S89^FNG+9U7A2%H3H&JPHR&.NR5%1.FH/0]L3?1,NV^@#)\O!A-S=
     25M"K-U6^CYTOBUN=YE0L;,'*/.`^S#&A4.P/42"1T+6D<J%3'4<QU,+L4,QWB/
     26M[B);W`*VUBD?[;L292T28]>FB-PMMB>7A`D<N?&;7(9=3PI1M-)X(9\*9L"I
     27M+KL):@I#44N*C/67*KZVT96,X(UI&YYJX4L,@X8*%[Q,:EC5/2(.V;$4-BM1
     28M-MQ($@@(!8%-3T^F3IF3!4U8P'V%%G24SZ:52DBYM;$[G$!C4=:D#.H@MZ?,
     29M-'!$VPKC")`8O((,'B^%;6QK<6HL@;.NKF^-FAS.("IO@UH2C,5,7P4=C5E'
     30M8]+1*.-C@GPF(9>A76\5(Y#\=(+2+9JR3$FW!5HFQR5J_H5NT%)7*CY>85>*
     31ML02AC^<ZOL+<S<S963C%*30J12*SBA)FP\WJ5<=82@.]N:,FU.(E@9L.Q4RE
     32M<Z"R#3RJ4]597FAC2Z'R19/2]G!((SJX,^WU/>O@38"]PL$-9_>I1NIJ4+#2
     33M/9&(@VE0LD'5V2!1)"E9XB29H@))J1_JU;9'+F7>$:%Y1.B`%<E'J(IL.2';
     34M6OA1EX]MU)!1*8Z1L\U-G`$U(O(J%::JOI"KOM&CD]`X*FN)Z[)3L*`)(I/*
     35M;0P9^K=&8'>KXT?K>S28*X2D;U6H*!2VJJI43G;N[26R<IC,TV<QM>!G*^T'
     36ML@SQTJM=EMU*P3CJ6-?7C.HE5R!\G3$::3]WT+D-FA+>).-.8\!+O]80QTR#
     37MTVY8TVV-8B57-#V.M'_[7*#R=-TW_E++A&;A.Z,L-&:;!<[UTM\-2KF/T<.%
     38M8]BF;)1'#:4L.FY4^LT0E2Z("Y&FLH:U`47=#LBFUH8W8-;NQ=WPQX=$S[*.
     39MY+\U?\B5X,MN&B^NY:^MF_!([E-]+]I#6NFP&STE/XGCBN?L4=FFG.3J/,"V
     40M;*Q(JH3',X50QKL5@O`VR]8=PW#O6%;76GSQ08TC.LLHRG@1.3ITEGI??1"`
     41MNO*%70'">R$J_3*'[&RIBOJNZ=]/97JB%3DA_GQ*;HVE#4:@(]UFN)*W+GHO
     42MJFN*+GFE#FS3:_-%6^OW9?95?8E1C4>8&ELEL0C8ZN$09V.<,+UM3.AC?MQT
     43MRS"BDB?\O$?:\+3T-M"O2&_#0QL.#&W.'K?6MG4U@)@^FYP?^3J_E.M^A?_T
     44M?(^W^/!Q>G,FW]?V6\/-Y0G^_\/=7KE*C_[V*K^:3"_A]LI#@--+A)=7=`-"
     45MFI;2[=7QU4!^H-=\>Q5>/%XCO'A:*;=7+T`!5R%;C-4*JR`])A):V'#;*[JS
     46G'2^P<0BZR>\2=97?/"I$.?Z`@K^/_/-TZLXN?SSY#\N1A#=K&0``
    4747`
    4848end

  • Tst/New/std_integer6.stat

    r6eb218 r35a23c9  
    1 1 >> tst_memory_0 :: 1426686982:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:1080568
    2 1 >> tst_memory_1 :: 1426686982:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2240328
    3 1 >> tst_memory_2 :: 1426686982:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:2366592
    4 1 >> tst_timer_1 :: 1426686982:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:8
     11 >> tst_memory_0 :: 1436349128:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:1821776
     21 >> tst_memory_1 :: 1436349128:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:4358144
     31 >> tst_memory_2 :: 1436349128:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:4460544
     41 >> tst_timer_1 :: 1436349128:4020, 64 bit:4.0.2:x86_64-Linux:maunzerle:15

  • kernel/GBEngine/kstd1.cc

    r6eb218 r35a23c9  
    1414#define MYTEST 0
    1515
    16 #define ADIDEBUG 0
     16#define ADIDEBUG 1
    1717#define ADIDEBUG_NF 0
    1818
    … …  
    15921592    }
    15931593    #endif
     1594    getchar();
    15941595    #endif
    15951596    #ifdef KDEBUG
    … …  
    22182219    if(nCoeff_is_Ring_Z(currRing->cf))
    22192220    {
    2220         #if 0       
     2221        #if 1
    22212222        if(nCoeff_is_Ring_Z(currRing->cf))
    22222223        {
    … …  
    22262227            {   
    22272228              idInsertPoly(FCopy, pFmon);
     2229              #if ADIDEBUG
    22282230              printf("\nPreintegerCheck found this constant:\n");pWrite(pFmon);
     2231              #endif
    22292232            }
    22302233            strat->kModW=kModW=NULL;

  • kernel/GBEngine/kstd2.cc

    r6eb218 r35a23c9  
    15371537    {
    15381538        printf("L[%i]:",iii);
    1539         p_Write(strat->L[iii].p, /*strat->tailRing*/currRing);
    1540         p_Write(strat->L[iii].p1, /*strat->tailRing*/currRing);
    1541         p_Write(strat->L[iii].p2, strat->tailRing);
     1539        p_Write(strat->L[iii].p, currRing);
     1540        p_Write(strat->L[iii].p1, currRing);
     1541        p_Write(strat->L[iii].p2, currRing);
    15421542    }
    15431543    #else
    … …  
    15581558    }
    15591559    #endif
    1560     //getchar();
     1560    getchar();
    15611561    #endif
    15621562    #ifdef KDEBUG
    … …  
    18301830    }
    18311831#endif
    1832     #ifdef HAVE_RINGS
    1833     if(nCoeff_is_Ring_Z(currRing->cf))
    1834       finalReduceByMon(strat);
    1835     #endif
    18361832  }
    18371833  else if (TEST_OPT_PROT) PrintLn();
    18381834  /* release temp data-------------------------------- */
     1835  #ifdef HAVE_RINGS
     1836  if(nCoeff_is_Ring_Z(currRing->cf))
     1837    finalReduceByMon(strat);
     1838  #endif
    18391839  exitBuchMora(strat);
    18401840//  if (TEST_OPT_WEIGHTM)

  • kernel/GBEngine/kutil.cc

    r6eb218 r35a23c9  
    15121512  pSetCoeff0(m2, t);
    15131513  pNeg(m2);
    1514   p_Test(m1,strat->tailRing);
    1515   p_Test(m2,strat->tailRing);
     1514  p_Test(m1, strat->tailRing);
     1515  p_Test(m2, strat->tailRing);
    15161516  poly si = pCopy(strat->S[i]);
    15171517  poly pm1 = pp_Mult_mm(pNext(p), m1, strat->tailRing);
    … …  
    15301530    else
    15311531    {
    1532       gcd = pCopy(pm1);
     1532      gcd = p_Copy(pm1, strat->tailRing);
    15331533      pDelete(&pm1);
    15341534      pDelete(&sim2);
    … …  
    40484048void superenterpairs (poly h,int k,int ecart,int pos,kStrategy strat, int atR)
    40494049{
    4050 #if ADIDEBUG
    4051   PrintS("\nEnter superenterpairs\n");
    4052   int iii = strat->Ll;
    4053 #endif
    40544050  assume (rField_is_Ring(currRing));
    40554051  // enter also zero divisor * poly, if this is non zero and of smaller degree
    40564052  if (!(rField_is_Domain(currRing))) enterExtendedSpoly(h, strat);
    4057 #if ADIDEBUG
    4058   if(iii==strat->Ll)
    4059   {
    4060     PrintS("\n                enterExtendedSpoly has not changed the list L.\n");
    4061   }
    4062   else
    4063   {
    4064     PrintLn();
    4065     PrintS("\n                enterExtendedSpoly changed the list L:\n");
    4066     for(iii=0;iii<=strat->Ll;iii++)
    4067     {
    4068       Print("\n                L[%d]:\n",iii);
    4069       PrintS("                     ");p_Write(strat->L[iii].p1,strat->tailRing);
    4070       PrintS("                     ");p_Write(strat->L[iii].p2,strat->tailRing);
    4071       PrintS("                     ");p_Write(strat->L[iii].p,strat->tailRing);
    4072     }
    4073   }
    4074   iii = strat->Ll;
    4075 #endif
    40764053  initenterpairs(h, k, ecart, 0, strat, atR);
    4077 #if ADIDEBUG
    4078   if(iii==strat->Ll)
    4079   {
    4080     PrintS("\n                initenterpairs has not changed the list L.\n");
    4081   }
    4082   else
    4083   {
    4084     PrintS("\n                initenterpairs changed the list L:\n");
    4085     for(iii=0;iii<=strat->Ll;iii++)
    4086     {
    4087       Print("\n                L[%d]:\n",iii);
    4088       PrintS("                     ");p_Write(strat->L[iii].p1,strat->tailRing);
    4089       PrintS("                     ");p_Write(strat->L[iii].p2,strat->tailRing);
    4090       PrintS("                     ");p_Write(strat->L[iii].p,strat->tailRing);
    4091     }
    4092   }
    4093   iii = strat->Ll;
    4094 #endif
    40954054  initenterstrongPairs(h, k, ecart, 0, strat, atR);
    4096 #if ADIDEBUG
    4097   if(iii==strat->Ll)
    4098   {
    4099     PrintS("\n                initenterstrongPairs has not changed the list L.\n");
    4100   }
    4101   else
    4102   {
    4103     PrintS("\n                initenterstrongPairs changed the list L:\n");
    4104     for(iii=0;iii<=strat->Ll;iii++)
    4105     {
    4106       Print("\n                L[%d]:\n",iii);
    4107       PrintS("                     ");p_Write(strat->L[iii].p1,strat->tailRing);
    4108       PrintS("                     ");p_Write(strat->L[iii].p2,strat->tailRing);
    4109       PrintS("                     ");p_Write(strat->L[iii].p,strat->tailRing);
    4110     }
    4111   }
    4112   PrintS("\nEnd of superenterpairs\n");
    4113 #endif
    41144055  clearSbatch(h, k, pos, strat);
    41154056}
    … …  
    41274068  assume (!rField_is_Ring(currRing));
    41284069#endif
    4129   #if ADIDEBUG
    4130         Print("\n    Vor initenterpairs: The new pair list L -- after superenterpairs in loop\n");
    4131         for(int iii=0;iii<=strat->Ll;iii++)
    4132         {
    4133           printf("\n    L[%d]:\n",iii);
    4134           PrintS("         ");p_Write(strat->L[iii].p,strat->tailRing);
    4135           PrintS("         ");p_Write(strat->L[iii].p1,strat->tailRing);
    4136           PrintS("         ");p_Write(strat->L[iii].p2,strat->tailRing);
    4137         }
    4138         #endif
    4139 
    41404070  initenterpairs(h,k,ecart,0,strat, atR);
    4141 
    4142       #if ADIDEBUG
    4143         Print("\n    Nach initenterpairs: The new pair list L -- after superenterpairs in loop \n");
    4144         for(int iii=0;iii<=strat->Ll;iii++)
    4145         {
    4146           printf("\n    L[%d]:\n",iii);
    4147           PrintS("         ");p_Write(strat->L[iii].p,strat->tailRing);
    4148           PrintS("         ");p_Write(strat->L[iii].p1,strat->tailRing);
    4149           PrintS("         ");p_Write(strat->L[iii].p2,strat->tailRing);
    4150         }
    4151         #endif
    4152 
    41534071  if ( (!strat->fromT)
    41544072  && ((strat->syzComp==0)
    … …  
    41634081      j++;
    41644082    }
    4165     //Print("end clearS sl=%d\n",strat->sl);
    4166   }
    4167  // PrintS("end enterpairs\n");
     4083  }
    41684084}
    41694085
    … …  
    90438959  if((posconst != -1) && (!nIsZero(F->m[posconst]->coef)))
    90448960  {
    9045       pmon = pCopy(F->m[posconst]);
     8961      //pDelete(&pmon);
    90468962      idDelete(&F);
    9047       idDelete(&monred);
    9048       return pmon;
     8963      //idDelete(&monred);
     8964      return NULL;
    90498965  }
    90508966  int idelemQ = 0;
    … …  
    90628978      if((posconst != -1) && (!nIsZero(monred->m[posconst]->coef)))
    90638979      {
    9064           pmon = pCopy(monred->m[posconst]);
    90658980          idDelete(&F);
    90668981          idDelete(&monred);
    9067           return pmon;
     8982          return NULL;
    90688983      }
    90698984  }
    … …  
    90899004              II->m[i+1] = II->m[i];
    90909005      II->m[0] = pOne();
    9091       ideal syz = idSyzygies(II, isNotHomog, NULL);    
     9006      ideal syz = idSyzygies(II, isNotHomog, NULL);
    90929007      poly integer = NULL;
    90939008      for(int i = IDELEMS(syz)-1;i>=0; i--)
    … …  
    90959010          if(pGetComp(syz->m[i]) == 1)
    90969011          {
    9097               if(pIsConstant(syz->m[i]))
     9012              integer = pHead(syz->m[i]);
     9013              pSetComp(integer,0);
     9014              if(pIsConstant(integer))
    90989015              {
    9099                   integer = pHead(syz->m[i]);
    9100                   pSetComp(integer, 0);
    91019016                  break;
    91029017              }
    … …  
    91079022      pmon = prMapR(integer, nMap2, QQ_ring, origR);
    91089023      idDelete(&F);
    9109       idDelete(&monred);
    9110       idDelete(&II);
    9111       idDelete(&one);
    9112       idDelete(&syz);
    9113       pDelete(&integer);
     9024      //idDelete(&monred);
     9025      //idDelete(&II);
     9026      //idDelete(&one);
     9027      //idDelete(&syz);
     9028      //pDelete(&integer);
    91149029      rDelete(QQ_ring);
    91159030      return pmon;
    … …  
    91869101  }
    91879102  idDelete(&F);
    9188   idDelete(&monred);
    9189   idDelete(&II);
    9190   idDelete(&one);
    9191   pDelete(&pmon);
     9103  //idDelete(&monred);
     9104  //idDelete(&II);
     9105  //idDelete(&one);
     9106  //pDelete(&pmon);
    91929107  rDelete(QQ_ring);
    91939108  return NULL;
    … …  
    92819196          if(pLmDivisibleBy(strat->S[j], p))
    92829197          {
    9283             nDelete(&(p->coef));
    9284             p->coef = currRing->cf->cfIntMod(p->coef, strat->S[j]->coef, currRing->cf);
     9198            number n = currRing->cf->cfIntMod(p->coef, strat->S[j]->coef, currRing->cf);
     9199            pSetCoeff(p,n);
    92859200          }
    92869201          pp = pNext(p);
    … …  
    92959210                if(pLmDivisibleBy(strat->S[j], pp))
    92969211                {
    9297                   nDelete(&(pp->coef));
    9298                   pp->coef = currRing->cf->cfIntMod(pp->coef, strat->S[j]->coef, currRing->cf);
     9212                  number n = currRing->cf->cfIntMod(pp->coef, strat->S[j]->coef, currRing->cf);
     9213                  pSetCoeff(pp,n);
    92999214                  if(nIsZero(pp->coef))
    93009215                  {
Note: See TracChangeset for help on using the changeset viewer.