Changeset e7f87f in git

Timestamp:

Jan 31, 2019, 5:09:18 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

64dfab7cf1b26074304621f8a4c209d347712ac7

Parents:

d59bc4cf80963a61978ac9d26d399d9a7bcbffd2

Message:

add: ssi for NC-rings

File:

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

Singular/links/ssiLink.cc

@@ -49 +49 @@
 #include <netinet/in.h> /* for htons etc.*/
 
-#define SSI_VERSION 12
+#define SSI_VERSION 13
 // 5->6: changed newstruct representation
 // 6->7: attributes
@@ -57 +57 @@
 // 10->11: extended ring descr. for named coeffs (not in used until 4.1)
 // 11->12: add rank to ideal/module, add smatrix
+// 12->13: NC rings
 
 VAR link_list ssiToBeClosed=NULL;
@@ -233 +234 @@
   {
     fputs("0 0 0 0 "/*,r->ch,r->N, blocks, q-ideal*/,d->f_write);
+  }
+  if (rIsLPRing(r)) // cannot be combined with 23 2
+  {
+    fprintf(d->f_write,"23 1 %d %d ",SI_LOG2(r->bitmask),r->isLPring);
+  }
+  else
+  {
+    unsigned long bm=0;
+    int b=0;
+    bm=rGetExpSize(bm,b,r->N);
+    if (r->bitmask!=bm)
+    {
+      fprintf(d->f_write,"23 0 %d ",SI_LOG2(r->bitmask));
+    }
+    if (rIsPluralRing(r))
+    {
+      fputs("23 2 ",d->f_write);
+      void ssiWriteIdeal(const ssiInfo *d, int typ,const ideal I);
+      ssiWriteIdeal(d,MATRIX_CMD,(ideal)r->GetNC()->C);
+      ssiWriteIdeal(d,MATRIX_CMD,(ideal)r->GetNC()->D);
+    }
   }
 }
@@ -779 +801 @@
   }
   res->flag=fl;
+}
+void ssiReadRingProperties(si_link l)
+{
+  ssiInfo *d=(ssiInfo*)l->data;
+  int what=s_readint(d->f_read);
+  switch(what)
+  {
+    case 0: // bitmask
+    {
+      int lb=s_readint(d->f_read);
+      unsigned long bm=~0L;
+      bm=bm<<lb;
+      bm=~bm;
+      rUnComplete(d->r);
+      d->r->bitmask=bm;
+      rComplete(d->r);
+      break;
+    }
+    case 1: // LPRing
+    {
+      int lb=s_readint(d->f_read);
+      int isLPring=s_readint(d->f_read);
+      unsigned long bm=~0L;
+      bm=bm<<lb;
+      bm=~bm;
+      rUnComplete(d->r);
+      d->r->bitmask=bm;
+      d->r->isLPring=isLPring;
+      rComplete(d->r);
+      break;
+    }
+    case 2: // Plural rings
+    {
+      matrix C=ssiReadMatrix(d);
+      matrix D=ssiReadMatrix(d);
+      nc_CallPlural(C,D,NULL,NULL,d->r,true,true,false,d->r,false);
+      break;
+    }
+  }
 }
 //**************************************************************************/
@@ -1360 +1421 @@
     case 21: ssiReadAttrib(res,l);
              break;
+    case 23: ssiReadRingProperties(l);
+             return ssiRead1(l);
+             break;
     // ------------
     case 98: // version
@@ -1520 +1584 @@
                         else if(tt==MATRIX_CMD) fputs("8 ",d->f_write);
                         else if(tt==SMATRIX_CMD) fputs("22 ",d->f_write);
-                        else
+                        else /* tt==MODUL_CMD*/
                         {
                           ideal M=(ideal)dd;
@@ -2168 +2232 @@
 // 21 attrib <bit-attrib> <len> <a-name1> <val1>... <data>
 // 22 smatrix
+// 23 0 <log(bitmask)> ring properties: max.exp.
+// 23 1 <log(bitmask)> <r->IsLPRing> ring properties:LPRing
+// 23 2 <matrix C> <matrix D> ring properties: PLuralRing
 //
 // 98: verify version: <ssi-version> <MAX_TOK> <OPT1> <OPT2>