Changeset 97c955 in git for Singular/links/ssiLink.cc

Timestamp:

Nov 29, 2013, 3:41:32 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d349786aef1f8f2b89aa38d805322367d4c96364

Parents:

c42a9f75e7b92be96e4b082346d946500227e213

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-29 15:41:32+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-29 15:41:51+01:00

Message:

fix: ring dep. stuff in newstruct: send/receive via links (ssi:6)

from master

File:

• Singular/links/ssiLink.cc (modified) (9 diffs)

Singular/links/ssiLink.cc

@@ -53 +53 @@
 #include <Singular/si_signals.h>
 
-#define SSI_VERSION 5
+#define SSI_VERSION 6
+// 5->6: changed newstruct representation
 
 // 64 bit version:
@@ -163 +164 @@
       {
         mpz_t tmp;
-        mpz_init_set_si(tmp,nn);
+        mpz_init_set_si(tmp,nn);
         fputs("8 ",d->f_write);
         mpz_out_str (d->f_write,32, tmp);
         fputc(' ',d->f_write);
-        mpz_clear(tmp);
+        mpz_clear(tmp);
       }
       #endif
@@ -434 +435 @@
        {
          LONG dd=s_readlong(d->f_read);
-         //#if SIZEOF_LONG == 8
+         //#if SIZEOF_LONG == 8
          return INT_TO_SR(dd);
-         //#else
-         //return nlInit(dd,NULL);
-         //#endif
+         //#else
+         //return nlInit(dd,NULL);
+         //#endif
        }
      case 5:
@@ -1230 +1231 @@
              // we are in the top-level, so set the basering to d->r:
              if (d->r!=NULL)
-             {
-               d->r->ref++;
+             {
+               d->r->ref++;
                ssiSetCurrRing(d->r);
-             }
+             }
              if (t==15) return ssiRead1(l);
            }
@@ -1289 +1290 @@
     case 19: res->rtyp=BIGINTMAT_CMD;
              res->data=ssiReadBigintmat(d);
-             break;
+             break;
     case 20: ssiReadBlackbox(res,l);
              break;
@@ -1311 +1312 @@
                 #endif
                 si_opt_1=n98_o1;
-                si_opt_2=n98_o2;
+                si_opt_2=n98_o2;
                 return ssiRead1(l);
              }
@@ -1332 +1333 @@
 }
 //**************************************************************************/
+BOOLEAN ssiSetRing(si_link l, ring r, BOOLEAN send)
+{
+  if(SI_LINK_W_OPEN_P(l)==0)
+     if (slOpen(l,SI_LINK_OPEN|SI_LINK_WRITE,NULL)) return TRUE;
+  ssiInfo *d = (ssiInfo *)l->data;
+  if (d->r!=r)
+  {
+    if (send)
+    {
+      fputs("15 ",d->f_write);
+      ssiWriteRing(d,r);
+    }
+    d->r=r;
+  }
+  if (currRing!=r) rChangeCurrRing(r);
+  return FALSE;
+}
+//**************************************************************************/
+
 BOOLEAN ssiWrite(si_link l, leftv data)
 {
@@ -1463 +1483 @@
 
   s->Status=slStatusSsi;
+  s->SetRing=ssiSetRing;
   s->type="ssi";
   return s;
@@ -2010 +2031 @@
 // 19 bigintmat <r> <c> ...
 //
-// 20 blackbox <name> ...
+// 20 blackbox <name> 1 <len> ...
 //
 // 98: verify version: <ssi-version> <MAX_TOK> <OPT1> <OPT2>