Changeset f6b8d2e in git for Singular

Timestamp:

Aug 18, 2016, 5:05:18 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0e5cd369e35cc3230104546ffdff7ed15be6654c

Parents:

780c1bafdf8b748d2ed4de0d4fd797d06d060904

Message:

fix: handling of qring in newstruct

Location:

Singular

Files:

• LIB/graal.lib (modified) (1 diff)
• newstruct.cc (modified) (2 diffs)

Singular/LIB/graal.lib

@@ -47 +47 @@
    * ideal H     ideal such that A=Q/H
    * ideal J     preimage of L
-   * qring Q0y   Q^0[Y1,...,Ys]
+   * ring Q0y    Q^0[Y1,...,Ys]
    * ideal scriptI <Y1-f1,...,Ys-fs>, where f1,...,fs are the generators of L
-   * qring Al    the ring A_L = Q0y/scriptI
-   * qring Ky    K[Y1,...,Ys], where K quotient field of A/L
+   * ring Al     the ring A_L = Q0y/scriptI
+   * ring Ky     K[Y1,...,Ys], where K quotient field of A/L
    * ideal scriptIin I_in
-   * qring Graal associated graded ring, isomorphic to Ky/scriptIin
+   * ring Graal associated graded ring, isomorphic to Ky/scriptIin
    * map ina     Al -> Graal, maps standard basis of ideals
    *               to standard basis of their respective initial ideals
    **/
-  newstruct("graalBearer","int s, qring A, ideal L, ring Q, ideal H, ideal J, ring Q0, ideal J0, ring Q0y, ideal scriptI, qring Al, qring Ky, ideal scriptIin, map Q0yToKy, qring Graal, map ina");
+  newstruct("graalBearer","int s, ring A, ideal L, ring Q, ideal H, ideal J, ring Q0, ideal J0, ring Q0y, ideal scriptI, ring Al, ring Ky, ideal scriptIin, map Q0yToKy, ring Graal, map ina");
   system("install","graalBearer","print",graalBearer_print,1);
 

Singular/newstruct.cc

@@ -556 +556 @@
   int lt=L->Typ();
   int rt=R->Typ();
-  if ((lt!=DEF_CMD)&&(lt!=rt))
+  if (((lt!=DEF_CMD)&&(lt!=rt))
   {
     const char *rt1=Tok2Cmdname(rt);
@@ -743 +743 @@
       return NULL;
     }
-    if (RingDependend(t) || (t==DEF_CMD)||(t==LIST_CMD))
+    if (t==QRING_CMD) t=RING_CMD;
+    else if (RingDependend(t) || (t==DEF_CMD)||(t==LIST_CMD))
       res->size++;    // one additional field for the ring (before the data)
     //Print("found type %s at real-pos %d",start,res->size);