Changeset 5656667 in git

Timestamp:

Mar 15, 2016, 10:57:57 AM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7d27c2cf53cbb1726b60e7ceeb7ae640f03543d9

Parents:

2305c15573dd242bf4dc04766efa1f2ed2131ce0

Message:

fix: dim int crash and forgot else

Files:

• Singular/iparith.cc (modified) (2 diffs)
• Tst/New/dim_integers.res.gz.uu (modified) (1 diff)
• Tst/New/dim_integers.stat (modified) (1 diff)
• Tst/New/dim_integers.tst (modified) (1 diff)

Singular/iparith.cc

@@ -4057 +4057 @@
     }
     ideal vv = id_Head(vid,currRing);
-    int j;
-    long d = 0;
+    idSkipZeroes(vv);
+    int j = idPosConstant(vv);
+    long d;
+    if(j == -1)
+    {
+      d = (long)scDimInt(vv, currRing->qideal);
+      if(rField_is_Ring_Z(currRing))
+        d++;
+    }
+    else
+    {
+      if(n_IsUnit(pGetCoeff(vv->m[j]),currRing->cf))
+        d = -1;
+      else
+        d = (long)scDimInt(vv, currRing->qideal);
+    }
     //Anne's Idea for std(4,2x) = 0 bug
     long dcurr = d;
     for(i=0;i<idSize(vv);i++)
     {
-      if(!n_IsUnit(pGetCoeff(vv->m[i]),currRing->cf))
+      if(vv->m[i] != NULL && !n_IsUnit(pGetCoeff(vv->m[i]),currRing->cf))
       {
         ideal vc = idCopy(vv);
@@ -4086 +4100 @@
           dcurr++;
         }
-        if(dcurr > d)
+        idDelete(&vc);
+      }
+      if(dcurr > d)
           d = dcurr;
-        idDelete(&vc);
-      }
-      else
-      {
-        if(idPosConstant(vv)!= -1)
-        {
-          dcurr = -1;
-        }
-      }
     }
     res->data = (char *)d;

Tst/New/dim_integers.res.gz.uu

@@ -1 +1 @@
 begin 664 dim_integers.res.gz
-M'XL("&,DX%8``V1I;5]I;G1E9V5R<RYR97,`E97/;YLP%(#O^2M>JQT2!='X
-M9T#1.$S;H5JU2ZL==JE(<3(K!"K;9)"_?J8;X!2G34\\/3\]?W[^+.X?OM[^
-M``"4P-WM%[@VVH2Y7%^OP$:/LI!F.EM-VB\D"61R;W-&;(7282'^A-JD9G+_
-MOP=.H(])"#<W\/!;:`&I$J#+O0`CM-&P*14\E?OGRLAB"]]5E>=M8U%H618:
-MR@W(3*2YC0Y"0;==WYEVG6$CE390%@*D!F,3I9);6:0YK*NMW:8J,E@W\%/N
-MC-WR3AS2(BL/>M<T8"/X=DCAEU#'OC,+!WX>@FKQ%'SN$((ZR)Y7?<4R^<<)
-MTI;0`-?#4I2\)+7)IG(VI..7`;8IF*`NBQ9)>QY+?'5EQZ*4>#*@A*YR8UL,
-M92B$G;234GT_Y,P;$0_OM`Z:F<N,J,O,ZX`VPQKS0B/N0.,^:P__FB9R:.)+
-M:/#BE`8MYG5CD?`<#U@8>;$P]LT2DQ$6I@,69F>P@N,I&'?!HCI`N`E0=!P*
-MEGZHR($B?38>09'%`$7095`$GT+A>=-RD3G"Q\!._TCG<8V'<N)%)-1WG82-
-M$;F#N'00IQTCIK/3%T&BLR^"Q%X:NO#=(D4C&NJH3LDYFI%A]`W?J=]WZO6=
-MCGVGCN\TOAB)72(]\TO/O-*SL?3,D9ZQM]A>2<;>,Y_YS6=>\]G8?.Z8S]$'
-GR/C'].=^_;E7?S[6GSOZ<ZM_^S-L_W65GJ+9ZM/D+^%-K`PW!P``
+M'XL("(S<YU8``V1I;5]I;G1E9V5R<RYR97,`G9;/3]LP%(#O_!5O:(>61B7^
+MF5@5/4S;`0WM`MIA%Q2HZ2Q*@N*T:_K7S^E([&"7-CO5<OS\OO?\)>[MW=?K
+M'P"`YG!S_07.*UU-5^KA?`9F=*]R58W&L[/F%^9S6*@7,U?)I2SU-)=_IKK*
+MJK/;MSWP'+HQF<+E)=S]EEI"5DK0Q8N$2NI*PU-1PF/Q\KJN5+Z$[^5ZM6HV
+MEKE61:ZA>`*UD-G*C#:RA#9=MS-M=X8G5>H*BER"TE"9B:)42Y5G*WA8+TV:
+M=;Z`AQI^JN?*I+R1FRQ?%!O]7-=@1O!MD\$O6>ZZG=G4\O,IE`U>"5<M0K2-
+M%J^S;D4R_\<)RBRA$=[:1^E\/ZFKQ4B-[;38-W`_A=I)%,^;<@SPIT^F*V4I
+M'RLHI5ZO*K.#78:F\*Q,H\IN.^2T&Y$`[F@;U6,7&5$7F6\C6MMG+,B,N&7&
+MW:0I_3U,ZL"(4V!PW(=!\61;&R(\P98*HR`5QH%.8N)186JI,#M`%>WZ7-SE
+M2K<1PG6$TIU=D(294LM$NDGA,9'8,A%T&A/!?28\J1LL,D%X%YG>[^A$;+%=
+M3H*$A`;.DC"?D#N$B4,X:A$Q'?=?!I(>?!F(",+0.'"$%'DPU+&<DD,PGEWT
+M`]5I6'4:4IWZJE-'=2I.)F*G^,["OK.0[\SWG3F^,_81VCO!V#'I65AZ%I*>
+M^=)S1WJ.!H#Q8>;SL/D\9#[WS>>.^3QD?L/8YVL;T#":9R:!^9I?7,!]<R?E
+MA2$Q5TU6FHLHTTK;T^/"#<0#(I.X'QG%`V*1&QM'@_)B-Y8/B23]K$-"J7=(
+M";.'E'37])4U*0J]?DGRGP>5I#Z!L`1I?("@]WU,W_J^][(E,`AQMP![65+B
+M9*%^%A0'RDQ9.%%73LK]1(F3*/VH'+M,'*E'Q%X:@6P:@4^L1Y`C]0A?$.$(
+M(@X)TCL>T9?C!$%MH0,_`#;P2`M1[+40Q;:%*#8M;/ZB-__`UWJ$QK//9W\!
+(B3=:A,T+````
 `
 end

Tst/New/dim_integers.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1457529955:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:122040
-1 >> tst_memory_1 :: 1457529955:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:2228224
-1 >> tst_memory_2 :: 1457529955:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:2228224
-1 >> tst_timer_1 :: 1457529955:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:4
+1 >> tst_memory_0 :: 1458035852:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:122432
+1 >> tst_memory_1 :: 1458035852:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:2228224
+1 >> tst_memory_2 :: 1458035852:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:2228224
+1 >> tst_timer_1 :: 1458035852:4030, 64 bit:4.0.3:x86_64-Linux:maunzerle:4

Tst/New/dim_integers.tst

@@ -65 +65 @@
 kill r;
 
+ring r = (integer),(x),dp;
+dim(ideal(x));
+dim(ideal(2x));
+dim(ideal(2x,0));
+dim(ideal(0,2x));
+dim(ideal(6x));
+dim(ideal(0,x));
+kill r;
+
+ring r=(integer,2,4),(x,y),dp;
+dim(ideal(x));
+kill r;
+
+ring r=(integer,2,4),x,dp;
+dim(std(ideal(x)));
+kill r;
+
+ring r=(integer,10),(x,y),dp;
+dim(std(ideal(x)));
+kill r;
+
+ring r=(integer,2,4),x,dp; 
+dim(std(ideal(x)));
+kill r;
+
+ring r=(integer,10),(x,y),dp;
+dim(std(ideal(x)));
+kill r;
+
+ring r=(integer,2,4),x,dp;
+dim(ideal(x,x));
+dim(ideal(x));
+dim(std(ideal(x)));
+kill r;
+
 tst_status(1);$