Changeset fff32b in git

Timestamp:

Feb 1, 2019, 2:18:53 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ad62229092fc8ebe6427ffe920f831abe60d4619c79e0a8f7547f0e11de702dde7d7da4b36994029

Parents:

64dfab7cf1b26074304621f8a4c209d347712ac7

Message:

add: ascii-dump for Plural rings

File:

• Singular/links/asciiLink.cc (modified) (5 diffs)

Singular/links/asciiLink.cc

@@ -24 +24 @@
 static const char* GetIdString(idhdl h);
 static int DumpRhs(FILE *fd, idhdl h);
-static BOOLEAN DumpQring(FILE *fd, idhdl h, const char *type_str);
+static BOOLEAN DumpQring(FILE *fd, idhdl h);
+static BOOLEAN DumpNCring(FILE *fd, idhdl h);
 static BOOLEAN DumpAsciiMaps(FILE *fd, idhdl h, idhdl rhdl);
 static BOOLEAN CollectLibs(char *name, char ***list_of_libs);
@@ -294 +295 @@
     if (strcmp(IDID(h),"Top")==0) return FALSE; // do not dump "Top"
     if (IDPACKAGE(h)->language==LANG_SINGULAR) return FALSE;
+    if (IDPACKAGE(h)->language==LANG_MIX) return FALSE;
   }
   if (type_id == CRING_CMD)
@@ -310 +312 @@
     return FALSE;
 
+  // handle nc-rings separately
+  if ((type_id == RING_CMD)&&(rIsNCRing(IDRING(h))))
+    return DumpNCring(fd,h);
+
   // handle qrings separately
   if ((type_id == RING_CMD)&&(IDRING(h)->qideal!=NULL))
-    return DumpQring(fd, h, type_str);
+    return DumpQring(fd, h);
 
   // C-proc not to be dumped
@@ -368 +374 @@
   {
     case LIST_CMD:
-    {
-      lists l = IDLIST(h);
-      int i, nl = l->nr + 1;
-
-      for (i=0; i<nl; i++)
-        if (GetIdString((idhdl) &(l->m[i])) == NULL) return NULL;
-    }
+    //{
+    //
+    //
+    //  lists l = IDLIST(h);
+    //  int i, nl = l->nr + 1;
+//
+    //  for (i=0; i<nl; i++)
+    //    if (GetIdString((idhdl) &(l->m[i])) == NULL) return NULL;
+    //  break;
+    //}
     case CRING_CMD:
     #ifdef SINGULAR_4_2
@@ -408 +417 @@
 }
 
-static BOOLEAN DumpQring(FILE *fd, idhdl h, const char *type_str)
+static BOOLEAN DumpNCring(FILE *fd, idhdl h)
 {
   char *ring_str = h->String();
-  if (fprintf(fd, "%s temp_ring = %s;\n", Tok2Cmdname(RING_CMD), ring_str)
-              == EOF) return TRUE;
-  if (fprintf(fd, "%s temp_ideal = %s;\n", Tok2Cmdname(IDEAL_CMD),
-              iiStringMatrix((matrix) IDRING(h)->qideal, 1, currRing, n_GetChar(currRing->cf)))
+  ring r=IDRING(h);
+
+  if (rIsPluralRing(r))
+  {
+    if (fprintf(fd, "ring temp_ring = %s;\n", ring_str)
+      == EOF) return TRUE;
+    if (fprintf(fd, "ideal temp_C = %s;\n",
+              iiStringMatrix((matrix) r->GetNC()->C, 2, r, n_GetChar(r->cf)))
+      == EOF) return TRUE;
+    if (fprintf(fd, "ideal temp_D = %s;\n",
+              iiStringMatrix((matrix) r->GetNC()->D, 2, r, n_GetChar(r->cf)))
+      == EOF) return TRUE;
+    if (fprintf(fd, "def %s = nc_algebra(temp_C,temp_D);\n",IDID(h)) == EOF)
+      return TRUE;
+    if (fputs("kill temp_ring;\n",fd) == EOF) return TRUE;
+  }
+  if (rIsLPRing(r))
+  {
+    //if (fprintf(fd, "ring %s = %s;\n", IDID(h), ring_str) == EOF) return TRUE;
+    //if (fprintf(fd, "attrib(%s,\"isLetterplaceRing\",%d);\n",IDID(h),r->isLPring) ==EOF) return TRUE;
+    Warn("cannot write LP ring %s",IDID(h));
+    return TRUE;
+  }
+  omFree(ring_str);
+  return FALSE;
+}
+
+static BOOLEAN DumpQring(FILE *fd, idhdl h)
+{
+  char *ring_str = h->String();
+  ring r=IDRING(h);
+  if (fprintf(fd, "ring temp_ring = %s;\n", ring_str) == EOF) return TRUE;
+  if (fprintf(fd, "ideal temp_ideal = %s;\n",
+              iiStringMatrix((matrix) r->qideal, 1, currRing, n_GetChar(r->cf)))
       == EOF) return TRUE;
   if (fputs("attrib(temp_ideal, \"isSB\", 1);\n",fd) == EOF) return TRUE;
-  if (fprintf(fd, "%s %s = temp_ideal;\n", type_str, IDID(h)) == EOF)
+  if (fprintf(fd, "qring %s = temp_ideal;\n",IDID(h)) == EOF)
     return TRUE;
   if (fputs("kill temp_ring;\n",fd) == EOF) return TRUE;