Changeset 61ef55 in git

Timestamp:

Apr 10, 2017, 12:25:43 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fd6436ff5d8b43e9c109225aa65e1ae0347088a1

Parents:

3c5f5fdf2c64b5ced7e254997007e96a6d07accc

Message:

fix: ssi: ring handling, ring as data

Files:

• Singular/links/ssiLink.cc (modified) (5 diffs)
• Tst/Short/bug_ssi_algring.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_ssi_algring.stat (modified) (1 diff)

Singular/links/ssiLink.cc

@@ -88 +88 @@
     char name[20];
     int nr=0;
-    do
-    { sprintf(name,"ssiRing%d",nr); nr++; }
-    while(IDROOT->get(name, 0)!=NULL);
-    idhdl h=enterid(omStrDup(name),0,RING_CMD,&IDROOT,FALSE);
-    IDRING(h)=r;
-    r->ref++;
+    idhdl h=NULL;
+    loop
+    {
+      sprintf(name,"ssiRing%d",nr); nr++;
+      h=IDROOT->get(name, 0);
+      if (h==NULL)
+      {
+        h=enterid(omStrDup(name),0,RING_CMD,&IDROOT,FALSE);
+        IDRING(h)=r;
+        r->ref++;
+        break;
+      }
+      else if ((IDTYP(h)==RING_CMD)
+      && (rEqual(r,IDRING(h),1)))
+        break;
+    }
     rSetHdl(h);
     return FALSE;
@@ -430 +440 @@
 number ssiReadNumber(const ssiInfo *d)
 {
+  if (currRing==NULL) ssiSetCurrRing(d->r);
   return ssiReadNumber_CF(d,d->r->cf);
 }
@@ -586 +597 @@
 poly ssiReadPoly(const ssiInfo *D)
 {
+  if (currRing==NULL) ssiSetCurrRing(D->r);
+  return ssiReadPoly_R(D,D->r);
+}
+
+ideal ssiReadIdeal_R(const ssiInfo *d,const ring r)
+{
 // < # of terms> < term1> < .....
-  return ssiReadPoly_R(D,D->r);
-}
-
-ideal ssiReadIdeal_R(const ssiInfo *d,const ring r)
-{
   int n,i;
   ideal I;
@@ -605 +617 @@
 ideal ssiReadIdeal(const ssiInfo *d)
 {
+  if (currRing==NULL) ssiSetCurrRing(d->r);
   return ssiReadIdeal_R(d,d->r);
 }
@@ -1281 +1294 @@
              if (d->r==NULL) return NULL;
              res->data=(char*)d->r;
+             d->r->ref++;
              res->rtyp=RING_CMD;
-             // we are in the top-level, so set the basering to d->r:
-             if (d->r!=NULL)
+             if (t==15) // setring
              {
                if(ssiSetCurrRing(d->r)) { d->r=currRing; d->r->ref++; }
-             }
-             if (t==15) // setring
-             {
                omFreeBin(res,sleftv_bin);
                return ssiRead1(l);

Tst/Short/bug_ssi_algring.res.gz.uu

@@ -1 +1 @@
 begin 640 bug_ssi_algring.res.gz
-M'XL("*=C15@``V)U9U]S<VE?86QG<FEN9RYR97,`M93!CILP$(;O/,4HZ@%*
-M`L%`T@6%0]O+2E6ES?:T595U@A-92VR$G4WHT]=V*/8AJGK8Y8+]SXS]S8_Q
-MXX^O]]\!(*G@V_UGF$@AHX9N)Z7W.$10!4K<4$:E'Y2>?D-5P?9TV`A!-[@Y
-M=)0=(D;.D9!8CG5I!>,XBR".X=Q12>*.X!ITB0#^2CJ0F(G?4:S6B<A%$B8H
-M9V*LS".3"VM8@3^?XF!ZF=:MI5M4<*2LY4VO$C`*$QM:5M!0]@*-BDP4:G$&
-M#6RV=OK[5%W!_&8*Z\#J=U;'(0K3BXTE\VJ@0BM_J:%Z%RI);.D:.67(ZAD.
-M\W#1.T'EUZ[A0@4=,5,]K`Q\=PL^R2NHR1ZZ9*5MU:5J7'K*[!TG^SW=4<*D
-M*.#AX2?^%?O:H$!'V>FX5=[S/;SB3D`!B5:'9]OPW8L^$TKG74U,JW7K9-BG
-M`(:/1.CAY<82R%WBRXB]&+"1@XU*+_UX"7UE=C`F+H?$U$E,;_3W]!0O??QN
-MK?7_WYHZ3HT!E'U+5(KZ:GIVY+6>=890+7N-7+^GUGA+F-)Z8F;F'RG,RVQM
-M3HWBX7+0_NYV-_B3.?YDI3?K0W^6XIEU$LW?D,MR_(,-)0-;[K#EI??<Y<]C
-?#KIQZ)%S<R!U<^C;1]\L)^$G0?G!^P-\8"K_LP0`````
+M'XL("-%#ZU@"`V)U9U]S<VE?86QG<FEN9RYR97,`M93/;YLP%,?O_!5/T0XP
+M$@@&DA44#MLNE:9)37?J-*5.<"*KQ$;8:<+^^MD.PSY$TPZM+[:_[X<_[V'\
+M^./K_7<`2"KX=O\9)E+(J*';2>D]#A94@1(WE%'I!Z6G9Z@JV)X.&R'H!C>'
+MCK)#Q,@Y$A++,2ZM8%QG$<0QG#LJ2=P17(,.$<!?20<2,_$[BE6>B%PD88)R
+M)L;(/#*^L(85^/,I#J:7:=U:ND4%1\I:WO3*`:,PL:9E!0UE+]`HRT2A%F?0
+MP.9HI[Y/U17,;Z:P#JQ^9W4<HC"]6%LRKP8JM/*7&JIWH9+$AJZ1$X:LGN$P
+M#Q>]8U3]VC5<**,C9JJ&E8'O;L$G>04UV4.7K'1;=:A:EYYJ]HZ3_9[N*&%2
+M%/#P\!/_BOTHB@)M9*?C5K6>[^$5=P(*2+0ZC&W#=R_Z2BB==S4QE=:MXV%'
+M`0P?B=#+RXT4R$WQ9:1>#-3(H4:EEWZ\A+[J=3`Z+@?'U'%,;Y3W]!0O??QN
+MI?7_7YJZ38T!E'U+E(OZ:'IWY+7>=890I;U:KI]3:[PE3&D],3OSBQ1F,D>;
+M2Z-XN!RTOZ?=#?W)G/YDI3?K0W^6XIGM))J_(9?E^`<;2@:VW&'+2^^YRY]'
+?'W3CSB/GX4#JX="/CWY83L)/@O*#]P><_FP(L@0`````
 `
 end

Tst/Short/bug_ssi_algring.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:113240
-1 >> tst_memory_1 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2228224
-1 >> tst_memory_2 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2228224
-1 >> tst_timer_1 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:0
+1 >> tst_memory_0 :: 1491813329:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:88624
+1 >> tst_memory_1 :: 1491813329:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:2211840
+1 >> tst_memory_2 :: 1491813329:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:2211840
+1 >> tst_timer_1 :: 1491813329:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:1