Changeset 5efe1c2 in git

Timestamp:

Dec 7, 2018, 5:34:11 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

ac8f852ee98f3d2c31345586af75ef366f73758d

Parents:

5161f3c439dd28c1bc0dd5d9a4aa7ae701a0a64d98f7fbb26f42b8f7d64633fd9e10348c9df52a6d

Message:

Merge branch 'spielwiese' into christmas-release

Files:

• Singular/LIB/fpalgebras.lib (modified) (1 diff)
• Singular/LIB/freegb.lib (modified) (4 diffs)
• Singular/extra.cc (modified) (1 diff)
• libpolys/polys/shiftop.cc (modified) (4 diffs)

Singular/LIB/fpalgebras.lib

@@ -4 +4 @@
 info="
 LIBRARY: fpalgebras.lib    Definitions of some finitely presented algebras and groups (Letterplace)
-AUTHORS: Karim Abou Zeid,       karim.abou.zeid at rwth-aachen.de
-         Viktor Levandovskyy,   viktor.levandovskyy at math.rwth-aachen.de
+AUTHORS: Karim Abou Zeid,       karim.abou.zeid at rwth-aachen.de@*
+         Viktor Levandovskyy,   viktor.levandovskyy at math.rwth-aachen.de@*
          Grischa Studzinski,    grischa.studzinski at rwth-aachen.de
 

Singular/LIB/freegb.lib

@@ -22 +22 @@
 
 PROCEDURES:
-makeLetterplaceRing(d);          creates a ring with d blocks of shifted original variables
+freeAlgebra(r, d);               creates a ring with d blocks of shifted original variables
+makeLetterplaceRing(d);          (deprecated) creates a ring with d blocks of shifted original variables
 setLetterplaceAttributes(R,d,b); supplies ring R with the letterplace structure
 lieBracket(a,b[, N]);            Lie bracket ab-ba of two letterplace polynomials
@@ -983 +984 @@
 }
 
+proc freeAlgebra(def r, int d)
+"USAGE:  freeAlgebra(r, d); r a ring, d an integer
+RETURN:  ring
+PURPOSE: creates a letterplace ring with the ordering of r
+EXAMPLE: example freeAlgebra; shows examples
+"
+{
+  return (system("freeAlgebra", r, d));
+}
+example
+{
+  "EXAMPLE:"; echo = 2;
+  ring r = 0,(x,y,z),dp;
+  def R = freeAlgebra(r, 7);
+  R;
+  ring r2 = 0,(x,y,z),lp;
+  def R2 = freeAlgebra(r2, 7);
+  R2;
+}
+
 // united all previous makes, including mLR1 (homog) and mLR2 (nonhomog)
 proc makeLetterplaceRing(int d, list #)
-"USAGE:  makeLetterplaceRing(d [,h]); d an integer, h an optional integer
+"USAGE:  makeLetterplaceRing(d [,h]); d an integer, h an optional integer (deprecated, use freeAlgebra instead)
 RETURN:  ring
 PURPOSE: creates a ring with the ordering, used in letterplace computations
-NOTE: h = 0 (default) : Dp ordering will be used
+NOTE: h = -1 (default) : the ordering of the current ring will be used
+h = 0 : Dp ordering will be used
 h = 2 : weights 1 used for all the variables, a tie breaker is a list of block of original ring
 h = 1 : the pure homogeneous letterplace block ordering (applicable in the situation of homogeneous input ideals) will be used.
@@ -994 +1016 @@
 "
 {
-  int alternativeVersion = 0;
+  int alternativeVersion = -1;
   if ( size(#)>0 )
   {
@@ -1012 +1034 @@
     }
     else {
-      def @A = makeLetterplaceRing4(d);
+      if (alternativeVersion == 0)
+      {
+        def @A = makeLetterplaceRing4(d);
+      }
+      else {
+        def @A = freeAlgebra(basering, d);
+      }
     }
   }

Singular/extra.cc

@@ -1243 +1243 @@
     else
   #endif
+ /*==================== freeAlgebra for freeGB  ==================*/
+  #ifdef HAVE_SHIFTBBA
+    if (strcmp(sys_cmd, "freeAlgebra") == 0)
+    {
+      const short t[]={2,RING_CMD,INT_CMD};
+      if (iiCheckTypes(h,t,1))
+      {
+        ring r=(ring)h->CopyD();
+        int d=(int)((long)h->next->Data());
+        res->rtyp = RING_CMD;
+        res->data = freeAlgebra(r, d);
+        return FALSE;
+      }
+      else return TRUE;
+    }
+    else
+  #endif
   /*==================== pcv ==================================*/
   #ifdef HAVE_PCV

libpolys/polys/shiftop.cc

@@ -823 +823 @@
         return NULL;
       }
-      int ** wvhdl=(int**)omAlloc0((r->N+2)*sizeof(int*));
-      rRingOrder_t* ord=(rRingOrder_t*)omAlloc0((r->N+2)*sizeof(rRingOrder_t));
-      int* blk0=(int*)omAlloc0((r->N+2)*sizeof(int));
-      int* blk1=(int*)omAlloc0((r->N+2)*sizeof(int));
+      int ** wvhdl=(int**)omAlloc0((r->N+3)*sizeof(int*));
+      rRingOrder_t* ord=(rRingOrder_t*)omAlloc0((r->N+3)*sizeof(rRingOrder_t));
+      int* blk0=(int*)omAlloc0((r->N+3)*sizeof(int));
+      int* blk1=(int*)omAlloc0((r->N+3)*sizeof(int));
       omFree(R->wvhdl);  R->wvhdl=wvhdl;
       omFree(R->order);  R->order=ord;
@@ -834 +834 @@
       {
         ord[i+p]=ringorder_a;
+        //Print("entry:%d->a\n",i+p);
         blk0[i+p]=1;
         blk1[i+p]=R->N;
@@ -847 +848 @@
       }
       ord[r->N+p]=r->order[p]; /* lp or rp */
+      //Print("entry:%d->lp\n",r->N+p);
       blk0[r->N+p]=1;
       blk1[r->N+p]=R->N;
@@ -857 +859 @@
         return NULL;
       }
+      //if (p==1) PrintS("entry:0 ->c/C\n");
+      //else if (p==0) Print("entry:%d ->c/C\n",r->N+1);
       break;
     }