Changeset 680ca3e in git


Ignore:
Timestamp:
Feb 21, 2013, 3:20:06 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cbf866d4f8c3861325311c042cb2033c053453b2')
Children:
f48707971b394befdb9c3fce8f6366610b334e92
Parents:
dd290f48322737d7fcc47f0fb8ea2059467097c07600fb155db01a25b5e1a80b4394e4ff39585f53
Message:
Merge pull request #292 from mmklee/imap

chg: extended naCopyTrans2AlgExt
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    r7600fb1 r680ca3e  
    18941894  int d=-1;
    18951895  int i;
    1896   for(i=IDELEMS(I);i>=0;i--) d=si_max(d,(int)pDegW(I->m[i],iv));
    1897   omFreeSize((ADDRESS)iv,(currRing->N+1)*sizeof(short));
     1896  for(i=IDELEMS(I);i>=0;i--) d=si_max(d,(int)p_DegW(I->m[i],iv,currRing));
     1897  omFreeSize( (ADDRESS)iv, (rVar(currRing)+1)*sizeof(short) );
    18981898  res->data = (char *)((long)d);
    18991899  return FALSE;
     
    19051905  {
    19061906    short *iv=iv2array((intvec *)v->Data(),currRing);
    1907     int d=(int)pDegW(p,iv);
    1908     omFreeSize((ADDRESS)iv,(currRing->N+1)*sizeof(short));
    1909     res->data = (char *)(long(d));
     1907    const long d = p_DegW(p,iv,currRing);
     1908    omFreeSize( (ADDRESS)iv, (rVar(currRing)+1)*sizeof(short) );
     1909    res->data = (char *)(d);
    19101910  }
    19111911  else
     
    59915991  short *iw=iv2array((intvec *)w->Data(),currRing);
    59925992  res->data = (char *)ppJetW((poly)u->Data(),(int)(long)v->Data(),iw);
    5993   omFreeSize((ADDRESS)iw,(currRing->N+1)*sizeof(short));
     5993  omFreeSize( (ADDRESS)iw, (rVar(currRing)+1)*sizeof(short) );
    59945994  return FALSE;
    59955995}
     
    67436743  if(v4!=NULL)
    67446744  {
    6745     w=iv2array((intvec *)v4->Data(),currRing);
    6746     short *w0=w+1;
    6747     int i=currRing->N;
    6748     while(i>0&&*w0>0)
     6745    w = iv2array((intvec *)v4->Data(),currRing);
     6746    short * w0 = w + 1;
     6747    int i = currRing->N;
     6748    while( (i > 0) && ((*w0) > 0) )
    67496749    {
    67506750      w0++;
     
    67626762  w2.CleanUp();
    67636763  if(w!=NULL)
    6764     omFree(w);
     6764    omFreeSize( (ADDRESS)w, (rVar(currRing)+1)*sizeof(short) );
    67656765
    67666766  lists L=(lists) omAllocBin(slists_bin);
  • Tst/New/print_minpoly.res.gz.uu

    r7600fb1 r680ca3e  
    11begin 644 print_minpoly.res.gz
    2 M'XL("-3_S$X``W!R:6YT7VUI;G!O;'DN<F5S`.U9;6_;-A#^[E]Q]0947A1'
    3 ME*PWNS&*;MA08!NZM-B7HBX86TZ$ZL60Y+Q@V'_?49+)T\(LBI.N15!]D,C3
    4 M\7AW/-YSE-Z^^^GU[P#`YO#KZU<PK,IJG,2GPQE@ZV.<Q94QF@W$$^9SV!1Q
    5 M5GU,XVR3)]?C++H<EQ6O!F];(?8<9-L9(W>^A'=169W$V=D;,12?QBI:0V%"
    6 M62'A#+*1'#$9PU^RXX[Q)EA+?A'!,9SR,A(#9I+#%QRR%XI>&35""\G%&.5B
    7 MCN@-_R37^Z$)F0G##Y0X5./=SOAZSF$!Q\>PW!:%L`N,ZCR"=9XD^:7H5M>;
    8 M"'BV:GP%Y7F^359P'4=X%YPE3R/(M]5F6ST;38%,59LP%.,%F1AAUT8,:X&&
    9 M,+`>!VU_-%,*VFB@;->JU_YX647I!IUHFR^YN2IGTE'U"S5/QZ5VV!K[K+>Q
    10 M*;^&TPA6\7H=%5'6&JA$.NPV$QWGOTV4?)WU<)KU6)!+KB<E*B<[M5&?XB3Y
    11 ME^V33J!,'!I.(@05(VKPM^QX<Q"&Q^JU/V]\?H+^-D*3C\PK<T7F"=0>F:`R
    12 M-[;'"2J_S--TBQLKQM`7.RW+TY@GC=S\(BK@EY\-9V&/ANB83C!#WY'0B??!
    13 M8T;TH%G>P=$1NO`[."OR+8Y=U^Q3"!LZBDKC6LLHB5(,%7S%FU=M=H'VF@+[
    14 M@2_L`QOOK+Y;#5^V34_1H'P-%[PH!5]#KZ_3)%]^$FD-Z7FQJE,'K#:$0UU3
    15 MR-""4C2O-")L*N+'02=$GZJ1#]WTCQX#X_'XVZI_;B,[>?0>J82.V^4VUU)Y
    16 MSL7<NLX+(\:4:,T@?H%())X'!Q+\79N`O]N`072U01`P(3;%G2]V?;Y0Z=:M
    17 MLW']!BR07.BP]DEHO*79E&:W1(<2G98X(<3#G4B7<KHMT:-$KR7ZE.BWQ$"C
    18 M9:C1DEDZ-1G3Z<ELG:+,T6G*)CI5F:O3E7DZE_HZ;0.MMJ%.6]OJ:KM;2H]$
    19 M#`)[#=(G:J4)<+JA*G,\B[09:=ND3<HB#\M,!="6`&BH$5KNSF,TX(#)B3U7
    20 M3>QY^R+V'^_YAZ,70O!\#]0FH_\OY%Z>\X(O*\P-914O,5&TN8G!!E^D$;YI
    21 M,@R'6Y*;(?0=?6UI^TG8]:CX_'"/?(7H_"26^9Z`W,D2.E#V?)+*@CM!V0L)
    22 M*/M6;U#V[?Z@;/"1!I8EAE$(,PXE[T0CU=5*]712?;W4NZ!92666%G"97FX'
    23 MGK7H3"1K:XX./%/)=P(TD1QH)8=ZR79WX78KZZ@`\B<W,-HG4.E["G-]G[0#
    24 MT@XI%F-\;Y+HRG0H*.]8`U)/!FSO<_-O;Z"=IMW3)5S&U;E*"E-XSI_O<Z[N
    25 M)_G+H;?T[]2Q$`S.XJK$!5ZM\*B29VB*I(YN2Y2WYLG%%T^4O0#@27O@,U<$
    26 M3]IWWZ+GOB?_OLE.5X0$Y"]!X-Q9A`3TMT#@]BY"`O]A7P:T)<@A[UF`\+[E
    27 MAY2XUW<!?>DA9=Y=>/#^98>2NM]7`7W)(:7J"XZ`G/H#<NH/K1O%1\@4:T@.
    28 :_R'&F/B7)?Y4;4N#C6;?#_X!IPT9[_8:````
     2M'XL("'HK)E$``W!R:6YT7VUI;G!O;'DN<F5S`.U9;6_;-A#^[E]Q]0947A1'
     3ME*PWNS&*;MA08!NZM-B7HBX86TZ$ZL60Y+R@Z'_?49+)T\(NBI.N15!]D,CC
     4M\7AW/-YSDEZ_^>7EGP#`YO#[RQ<PK,IJG,2GPQE@ZWV<Q94QF@W$$^9SV!1Q
     5M5KU/XVR3)]?C++H<EQ6O!J];(?8<9-L9(W>^A#=169W$V=DK,16?QBI:0V%"
     6M62'A#+*1G#$9PT?9<<=X$ZPEOXC@&$YY&8D),\GA"P[9"T6OC!JAA>1BC'(Q
     7M1_2&?Y/K[="$S(3A.TH<JOEN9WZ]YK"`XV-8;HM"V`5&=1[!.D^2_%)TJ^M-
     8M!#Q;-;Z"\CS?)BNXCB.\"\Z2IQ'DVVJSK9Z,ID"6JDT8BOF"3(RP:R.&M4!#
     9M&%C/@[8_FBD%;310MFO5:W\\KZ)T@TZTS>?<7)4SZ:AZ0*W3<:D=ML8^Z6UL
     10MRJ_A-()5O%Y'192U!BJ1#ON<B8[SWR9*OLY^.,U^+,@E]Y,2E9.=VJ@/<9+\
     11MR_9))U`F#@TG$8**$37X)#O>'(3AL1KVYXW/3]#?1FCRD7EEKL@Z@3HC$U3F
     12MQO$X0>67>9IN\6#%&/KBI&5Y&O.DD9M?1`7\]JOA+.S1$!W3"6;H.Q,Z\3YX
     13MR(@>--L[.#I"%_X`9T6^Q;GKFGT*84-'46E<:QDE48JA@D.\&6JS"[37%-A/
     14M?&$?V'AG]=UJ^+)M>HH&Y6NXX$4I^!IZ?9TF^?*#2&M(SXM5G3I@M2$<ZII"
     15MAA:4HGFE$6%3$3\/.B'Z6(V\[Z%_\!@8C\??=_U+&]G)HW=()73>+K>YELIS
     16M+N;6=5X8,:9$:P;Q,T0B\3PXD.#OV@3\W08,HJL-@H`)L2GN?+'K\X5*MVZ=
     17MC>L1L$!RH</:)Z'QEF93FMT2'4IT6N*$$`]W(EW*Z;9$CQ*]ENA3HM\2`XV6
     18MH49+9NG49$RG)[-UBC)'IRF;Z%1EKDY7YNE<ZNNT#;3:ACIM;:NK[6XK/1(Q
     19M".PU2)^HG2;`Z8:JS/$LTF:D;9,V*8L\+#,50%L"H*%&:'DZC]&``R87]ERU
     20ML.?MB]A_O>7OCIX)P?,]4)O,_K^0>WG."[ZL,#>45;S$1-'F)@8;'$@C'&DR
     21M#(?/)#=#Z#OZUM+VH[#K0?'Y_A[Y!M'Y46SS'0&YDR5TH.SY))4%MX*R%Q)0
     22M]JW>H.S;_4'9X",-+$L,HQ!F'$K>B4:JJY7JZ:3Z>JFW0;.2RBPMX#*]W`X\
     23M:]&92-;6'!UXII)O!6@B.=!*#O62[>[&[7;640'D3VY@M$^@TO<4YOH^:0>D
     24M'5(LQOC>)-&5Z5!0WK$&I)X,V-[OS7^\@G:9]DR7<!E7YRHI3.$I?[K/>W4_
     25MR5\/O:5_IXZ%8'`65R5N\&J%KRIYAJ9(ZNCNB7+QU3-E+P1XW"[XPC7!XW;>
     26M]_BY\]M_WX2G*T0"\J<@<&XM1`+Z:R!P>Q<B@7^_KP/:,N20]RQ">-\21$K<
     27MZ]N`OOR0,F\O/GC_TD-)W>_+@+[LD%+U14=`WOP#\N8?6C<*D)`IUI!\``@Q
     287QL3_+/&W:EL:;#3[<?`/6.(\^?H:````
    2929`
    3030end
  • Tst/New/print_minpoly.stat

    r7600fb1 r680ca3e  
    1 1 >> tst_memory_0 :: 1322057684:0- 0815 :spielwiese:version:aermel.mathematik.uni-kl.de:126640
    2 1 >> tst_memory_1 :: 1322057684:0- 0815 :spielwiese:version:aermel.mathematik.uni-kl.de:671744
    3 1 >> tst_memory_2 :: 1322057684:0- 0815 :spielwiese:version:aermel.mathematik.uni-kl.de:671744
    4 1 >> tst_timer_1 :: 1322057684:0- 0815 :spielwiese:version:aermel.mathematik.uni-kl.de:2
     11 >> tst_memory_0 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:100192
     21 >> tst_memory_1 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:2215936
     31 >> tst_memory_2 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:2215936
     41 >> tst_timer_1 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:7
  • Tst/New/print_nc_relations.res.gz.uu

    r7600fb1 r680ca3e  
    1 begin 640 print_nc_relations.res.gz
    2 M'XL(""+:C4X``W!R:6YT7VYC7W)E;&%T:6]N<RYR97,`[5A13]LP$'[OKSBB
    3 M/:1:&YJDZ4:K5FQ,FI`F-`':"X+*3=P2D<0E=J!AVG_?V0F)`UU!6A\VP`^)
    4 MS[X[WYWOOIQR<OKE\`@`[`E\._P,AN#"BL*9,0*<3<,D%&9[U))OF$Q@F8:)
    5 MF";^-*41$2%+N)706XL+(EHGI29G`M7<M5"$^7!*N3@.D\5W*8]O,Z!S2#O`
    6 M!2XL(&E7$GT+?E:$9^%#LG)R0V$,,\*I%!A5'!\D1T7M28K30FE:<=FVSF6[
    7 MDC)^:./,Z$#2`>-<7S1J>:\AK\XT4AB/P<_25/H%IKBD,&=1Q&XE*?(E!9($
    8 M1<"`7[(L"B`/*3XE)R<Q!9:)929VVD/0CE(N&%)>+FM..,H)0RDTI8-*#DJZ
    9 M/:H-=-#!:JY,5_'8%S1>8A"=SC[I!'Q4!4IMU.<T0NKLE<[N/-O9F.0PHQ"$
    10 M\SE-:5(Z6*MT[3^YZ+J;7:SX&O?A%O=QH8WJ/O7%.LBN<NHJC*('OO<;B=)W
    11 M]722*5@SH@6_*F)09WP?C7F0??V/VC:>_*@6L`X,3'*210)\%L<95E.(^;YD
    12 M49ZP."214FE@`!I)"\\0@D9*M[:9M*WB!EN[NQ@E_Y*DQ!=8G5R$/@S!=7H]
    13 MM]A+LGA&4V!SN"$IEWO%NAJSB/E7$G]PG:6!*F\(EAI'/8:0H`E<3E>0P]T:
    14 M-8ZNYJ#52*5_VM*_K;"WV]BFI0TP>5Z=Z2+WY>[UZM+W$%ODIVR!$(P?4!(M
    15 MZ"PE9M?N@%U#FZ=]/3UW#5@L$"R.#N!K]U.AX#$JZ+NOO/R+\UFB7US5N0Q+
    16 M^7PU[J[R]W9)WDGRKB;S<3>7Y/^3O-OT^C7`TN9X@659+^;RE3--<&O"Q5H4
    17 MZVN8A(W/?4=4M^&>U@%YV`%=%_L(-R!N&1>!&0:41"9&P[3;%TY;`SRM._+V
    18 MZL9UT%L'?FF)?L>5Q>9UQD2(V08EHNZTUT/B1I$WG-P:8B!9Q5>IGZ<L!G7_
    19 MK>F9?3Y>.2^FG+8?F3>\51"U(50O#X^?<O8Q7C^!9>M`?&#7.#MP+/5W1_ZV
    20 0R3@B\NA=ZS>4%HQA"!(`````
     1begin 644 print_nc_relations.res.gz
     2M'XL("'HK)E$``W!R:6YT7VYC7W)E;&%T:6]N<RYR97,`[5A?;YLP$'_G4US1
     3M'HB6T``A6Q,EZOY(4Z6IFMIJ+U4;.<%)40&GV+2AT[[[SH:":;,LTO*P*?4#
     4M^.R[\]WY[L>)\XO/)Z<`X(SAZ\E',`47=A1.S2'@;!(FH;!:0T.^83R&91HF
     5M8I+,)BF-B`A9PNV$/MA<$&&<EYK<,51SST81-H,+RL59F"R^27E\6P&=0]H&
     6M+G!A`4FKDNC9\*,B?!L?DI63>PHCF!).I<"PXG@G.2KJ2%*<%DK3BLMQ="['
     7MDY3Y71N79AN2-IA7^J)9R_L->76FF<)H!+,L3:5?8(D;"G,61>Q!DB)?4B!)
     8M4`0,^`W+H@#RD.)3<G(24V"96&;BH#4`[2CE@BGEY;+FA*N<,)5"2SJHY*"D
     9M6\/:0!<=K.;*=!6/8T'C)0;1;1^3=L"'5:#41GU.(Z3N4>GLP=;.QB2'*84@
     10MG,]I2I/2P5JEY_S.1<_;[&+%U[@/K[B/:VU4]ZDOUD'VE%.W810]\[W72)2>
     11MIZ>33,&:$2WX61'].N-[:,RS[.N]U[;QY!>U@'5@8I*3+!(P8W&<836%F.]+
     12M%N4)BT,2*94F!J"1M+"%$#12VMAETAK%#1J'AQBEV0U)R4Q@=7(1SF``GMOM
     13M>L5>DL53F@*;PSU)N=PKUM681FQV*_$'UUD:J/*&8*EQU&,`"9K`Y70%.3RN
     14M4>/J:CX9C53ZIRW]VPI[O8U=6MH`D^WJ3!=Y*G>_6Y>^C]@B/V4+A&#\@))H
     15M0:<IL3I.&YP:VGSMZ^E[:\!B@6!Q^@F^=#X4"EZB@KZ[Y^5?G,\2_>*JSF50
     16MRN>K46>5OW5*\E&2CS69CSJY)/^?Y-VEU_L`2YOC!;9M[^GE-U&PB2MKX:ZG
     17M@1=V2$^M4]VO^UJKY&.K=%?L(RZ!>&!<!%884!)9&#;+:5V[+0T9M3;*/ZH[
     18MW'YW'4JF)4R>519;=QD3(:8EE-![T%J/G1M%7@%U9]F%9!5?I7Z>LAC4_1N3
     19M2^=JM'+WM.ZVB<PK,"M@WA"J/0;N;1+H);C_`?C6(7[?J4&Y[]KJGY'\&91Q
     20.A._A&^,7M:F(QUX2````
    2121`
    2222end
  • Tst/New/print_nc_relations.stat

    r7600fb1 r680ca3e  
    1 1 >> tst_memory_0 :: 1317919266:3133- exportiert :3-1-3:ix86-Linux:mamawutz:304556
    2 1 >> tst_memory_1 :: 1317919266:3133- exportiert :3-1-3:ix86-Linux:mamawutz:794356
    3 1 >> tst_memory_2 :: 1317919266:3133- exportiert :3-1-3:ix86-Linux:mamawutz:827140
    4 1 >> tst_timer_1 :: 1317919266:3133- exportiert :3-1-3:ix86-Linux:mamawutz:11
     11 >> tst_memory_0 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:239136
     21 >> tst_memory_1 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:2375680
     31 >> tst_memory_2 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:2375680
     41 >> tst_timer_1 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:8
  • Tst/New/print_param_poly_short.res.gz.uu

    r7600fb1 r680ca3e  
    1 begin 640 print_param_poly_short.res.gz
    2 M'XL("&%_5T\``W!R:6YT7W!A<F%M7W!O;'E?<VAO<G0N<F5S`.V;66_B2!#'
     1begin 644 print_param_poly_short.res.gz
     2M'XL("'LK)E$``W!R:6YT7W!A<F%M7W!O;'E?<VAO<G0N<F5S`.V;66_B2!#'
    33MW_TI.ME]X#+CMO%1H$':2[LCC6;6DV@?B0AX$FNX!`[+:K7??=L'=OLBU0$L
    44MDPP/Q)CJZG:W?U7]=Y&;VU\_?"*$T"'Y^.%G<NUMO.[,O;\>$'9TYRY<K]$<
  • Tst/New/print_param_poly_short.stat

    r7600fb1 r680ca3e  
    1 1 >> tst_memory_0 :: 1331134303:3140- 14654 :3-1-4:x86_64-Linux:murrumesh:211008
    2 1 >> tst_memory_1 :: 1331134303:3140- 14654 :3-1-4:x86_64-Linux:murrumesh:2240200
    3 1 >> tst_memory_2 :: 1331134303:3140- 14654 :3-1-4:x86_64-Linux:murrumesh:2273000
    4 1 >> tst_timer_1 :: 1331134303:3140- 14654 :3-1-4:x86_64-Linux:murrumesh:4
     11 >> tst_memory_0 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:102392
     21 >> tst_memory_1 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:2215936
     31 >> tst_memory_2 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:2215936
     41 >> tst_timer_1 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:8
  • Tst/New/print_qring.res.gz.uu

    r7600fb1 r680ca3e  
    1 begin 640 print_qring.res.gz
    2 M'XL(""/:C4X``W!R:6YT7W%R:6YG+G)E<P#M5E]OFS`0?^=37-$>0(IH@+"M
     1begin 644 print_qring.res.gz
     2M'XL("'LK)E$``W!R:6YT7W%R:6YG+G)E<P#M5E]OFS`0?^=37-$>0(IH@+"M
    33M08FJ;2^5IFE:J[U47>2`6:P")MBT2:=]]YU-!J9+JTCKP[;.#\9GWYWO=__P
    44M^<6[LP\`X,_A_=D;L*607LZ6=@RX6K"22<>-+?6%^1RJFI5RL<;YJU?26T](
     
    1313MM>H\N,_K5-<WI)7!T8\IE&B"4,L-;.%NCYK`5//6&N32'VWI[Y;8_V@\I:6#
    1414M;G)8G9DB/\L]&O>E'V%ST;],6&,7%C)U6$I)[FP"MV]MD?'WC,(]O6*-O6+=
    15 M<,DP[`]TA<'Q,Z]_9!BZ(ZMY`=KQUN+2OYIM@K\H*P]!\QSZR"-^`,_S_HV(
    16 D:B3#/G2OLO=VG(G10/"5HI[OZGG>",=WXQ?6#^[KA0_I"P``
     15M<,DP[`]TA<'Q,Z]_9!BZ(ZMY`=KQUN+2OYIM@K\H*P]!\QSZR"-^`,_S_K&(
     16C#GO1O>K>VW4F1A/!EXIZPJLG>B,<WXU?6#\`%>--P^T+````
    1717`
    1818end
  • Tst/New/print_qring.stat

    r7600fb1 r680ca3e  
    1 1 >> tst_memory_0 :: 1317919266:3133- exportiert :3-1-3:ix86-Linux:mamawutz:301480
    2 1 >> tst_memory_1 :: 1317919266:3133- exportiert :3-1-3:ix86-Linux:mamawutz:794356
    3 1 >> tst_memory_2 :: 1317919266:3133- exportiert :3-1-3:ix86-Linux:mamawutz:827140
    4 1 >> tst_timer_1 :: 1317919266:3133- exportiert :3-1-3:ix86-Linux:mamawutz:11
     11 >> tst_memory_0 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:233896
     21 >> tst_memory_1 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:2375680
     31 >> tst_memory_2 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:2375680
     41 >> tst_timer_1 :: 1361455994:3.1.3.sw $Id: af6ba3f Tue Feb 12 20:21:27 2013 +0100$:spielwiese:version:dilbert:9
  • kernel/ideals.cc

    r7600fb1 r680ca3e  
    11421142      N=si_max(N,p_Deg(Q->m[i],currRing));
    11431143    else
    1144       N=si_max(N,pDegW(Q->m[i],w));
     1144      N=si_max(N,p_DegW(Q->m[i],w,currRing));
    11451145  N+=n;
    11461146
     
    11671167          p=pJetW(pSub(p,ppMult_mm(Q->m[j],p0)),N,w);
    11681168        pNormalize(p);
    1169         if(((w==NULL)&&(p_Deg(p0,currRing)>n))||((w!=NULL)&&(pDegW(p0,w)>n)))
     1169        if(((w==NULL)&&(p_Deg(p0,currRing)>n))||((w!=NULL)&&(p_DegW(p0,w,currRing)>n)))
    11701170          p_Delete(&p0,currRing);
    11711171        else
     
    11811181          pNext(p0)=NULL;
    11821182          if(((w==NULL)&&(p_Deg(p0,currRing)>n))
    1183           ||((w!=NULL)&&(pDegW(p0,w)>n)))
     1183          ||((w!=NULL)&&(p_DegW(p0,w,currRing)>n)))
    11841184            p_Delete(&p0,currRing);
    11851185          else
  • kernel/polys.h

    r7600fb1 r680ca3e  
    342342// maximum weigthed degree of all monomials of p, w is indexed from
    343343// 1..pVariables
     344
     345/// Deprecated: only for compatibility with older code!
    344346#define    pDegW(p,w) p_DegW(p,w,currRing)
    345347
  • libpolys/polys/ext_fields/algext.cc

    rdd290f r680ca3e  
    926926  assume (nCoeff_is_algExt (dst));
    927927  fraction fa=(fraction)a;
    928   assume( rSamePolyRep(src->extRing, dst->extRing) );
    929   poly p = p_Copy(NUM(fa),src->extRing);
     928  poly p, q;
     929  if (rSamePolyRep(src->extRing, dst->extRing))
     930  {
     931    p = p_Copy(NUM(fa),src->extRing);
     932    if (!DENIS1(fa))
     933    {
     934      q = p_Copy(DEN(fa),src->extRing);
     935      assume (q != NULL);
     936    }
     937  }
     938  else
     939  {
     940    assume ((strcmp(rRingVar(0,src->extRing),rRingVar(0,dst->extRing))==0) && (rVar (src->extRing) == rVar (dst->extRing)));
     941
     942    nMapFunc nMap= n_SetMap (src->extRing->cf, dst->extRing->cf);
     943
     944    assume (nMap != NULL);
     945    p= p_PermPoly (NUM (fa), NULL, src->extRing, dst->extRing,nMap, NULL,rVar (src->extRing));
     946    if (!DENIS1(fa))
     947    {
     948      q= p_PermPoly (DEN (fa), NULL, src->extRing, dst->extRing,nMap, NULL,rVar (src->extRing));
     949      assume (q != NULL);
     950    }
     951  }
    930952  definiteReduce(p, dst->extRing->qideal->m[0], dst);
    931953  assume (p_Test (p, dst->extRing));
    932   return (number)p;
     954  if (!DENIS1(fa))
     955  {
     956    definiteReduce(q, dst->extRing->qideal->m[0], dst);
     957    assume (p_Test (q, dst->extRing));
     958    if (q != NULL)
     959    {
     960      number t= naDiv ((number)p,(number)q, dst);
     961      p_Delete (&p, dst->extRing);
     962      p_Delete (&q, dst->extRing);
     963      return t;
     964    }
     965    WerrorS ("mapping denominator to zero");
     966  }
     967  return (number) p;
    933968}
    934969
     
    10211056         return naCopyTrans2AlgExt;
    10221057    }
    1023     else
    1024       return NULL;                               /// Z/p(b) --> Z/p(a)
     1058    else if ((strcmp(rRingVar(0,src->extRing),rRingVar(0,dst->extRing))==0) && (rVar (src->extRing) == rVar (dst->extRing)))
     1059    {
     1060      if (src->type==n_transExt)
     1061        return naCopyTrans2AlgExt;
     1062    }
    10251063  }
    10261064
  • libpolys/polys/monomials/p_polys.cc

    r7600fb1 r680ca3e  
    692692long p_DegW(poly p, const short *w, const ring R)
    693693{
    694   long r=~0L;
    695 
    696   while (p!=NULL)
    697   {
    698     long t=totaldegreeWecart_IV(p,R,w);
    699     if (t>r) r=t;
    700     pIter(p);
    701   }
     694  assume( p_Test(p, R) );
     695  assume( w != NULL );
     696   
     697  if( p == NULL ) // TODO: ???
     698     return -1;
     699   
     700  long r = totaldegreeWecart_IV(p, R, w); pIter(p);
     701
     702  for ( ; p!=NULL; pIter(p) )
     703  {
     704    const long t = totaldegreeWecart_IV(p, R, w);
     705    if (t > r) r = t;
     706  }
     707   
    702708  return r;
    703709}
Note: See TracChangeset for help on using the changeset viewer.