Changeset f006a1 in git

Timestamp:

Jul 23, 2019, 4:33:05 PM (4 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

9102bbc549613cd829348b8de22f634afde32b53

Parents:

dcddf9cfa6c64ce8c0dc05e26e136194af70b1e3

git-author:

Karim Abou Zeid <karim23697@gmail.com>2019-07-23 16:33:05+02:00

git-committer:

Karim Abou Zeid <karim23697@gmail.com>2019-07-24 14:54:41+02:00

Message:

Syzygies via LPncGenCount ring variable

Files:

• Singular/dyn_modules/freealgebra/freealgebra.cc (modified) (4 diffs)
• Singular/iparith.cc (modified) (1 diff)
• kernel/GBEngine/kstd1.cc (modified) (1 diff)
• kernel/GBEngine/kutil.cc (modified) (2 diffs)
• kernel/GBEngine/kutil.h (modified) (1 diff)
• kernel/ideals.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (4 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)
• libpolys/polys/shiftop.cc (modified) (8 diffs)
• libpolys/polys/shiftop.h (modified) (1 diff)

Singular/dyn_modules/freealgebra/freealgebra.cc

@@ -5 +5 @@
 {
   const short t1[]={2,RING_CMD,INT_CMD};
-  if (iiCheckTypes(args,t1,1))
+  const short t2[]={3,RING_CMD,INT_CMD,INT_CMD};
+  if (iiCheckTypes(args, t2, 0) || iiCheckTypes(args, t1, 1))
   {
     ring r=(ring)args->Data();
@@ -32 +33 @@
       return TRUE;
     }
-    ring R=freeAlgebra(r,d);
+    int ncGenCount = 0; 
+    if (iiCheckTypes(args,t2,0))
+      ncGenCount = (int)(long) args->next->next->Data();
+    ring R=freeAlgebra(r,d,ncGenCount);
     res->rtyp=RING_CMD;
     res->data=R;
@@ -124 +128 @@
   else return TRUE;
 }
-
-// copied from iparith.cc
-// NOTE: they do not set res->rtyp
-static BOOLEAN jjSYZYGY(leftv res, leftv v)
-{
-  intvec *ww=(intvec *)atGet(v,"isHomog",INTVEC_CMD);
-  intvec *w=NULL;
-  ideal v_id=(ideal)v->Data();
-  tHomog hom=testHomog;
-  if (ww!=NULL)
-  {
-    if (idTestHomModule(v_id,currRing->qideal,ww))
-    {
-      w=ivCopy(ww);
-      int add_row_shift=w->min_in();
-      (*w)-=add_row_shift;
-      hom=isHomog;
-    }
-    else
-    {
-      //WarnS("wrong weights");
-      delete ww; ww=NULL;
-      hom=testHomog;
-    }
-  }
-  else
-  {
-    if (v->Typ()==IDEAL_CMD)
-      if (idHomIdeal(v_id,currRing->qideal))
-        hom=isHomog;
-  }
-  ideal S=idSyzygies(v_id,hom,&w);
-  res->data = (char *)S;
-  if (hom==isHomog)
-  {
-    int vl=S->rank;
-    intvec *vv=new intvec(vl);
-    if ((v->Typ()==IDEAL_CMD)||(ww==NULL))
-    {
-      for(int i=0;i<vl;i++)
-      {
-        if (v_id->m[i]!=NULL)
-          (*vv)[i]=p_Deg(v_id->m[i],currRing);
-      }
-    }
-    else
-    {
-      p_SetModDeg(ww, currRing);
-      for(int i=0;i<vl;i++)
-      {
-        if (v_id->m[i]!=NULL)
-          (*vv)[i]=currRing->pFDeg(v_id->m[i],currRing);
-      }
-      p_SetModDeg(NULL, currRing);
-    }
-    if (idTestHomModule(S,currRing->qideal,vv))
-      atSet(res,omStrDup("isHomog"),vv,INTVEC_CMD);
-    else
-      delete vv;
-  }
-  if (w!=NULL) delete w;
-  return FALSE;
-}
-
-static ring tagRing(ideal I)
-{
-  ring tagRing = currRing;
-  for (int i = 1; i <= IDELEMS(I); i++)
-  {
-    char *varname=(char *)omAlloc(256);
-    sprintf(varname, "ncgen(%d)", i);
-    tagRing = rPlusVar(tagRing, varname, 0);
-    omFreeSize(varname, 256);
-  }
-  return tagRing;
-}
-
-static BOOLEAN lpSyzRing(leftv res, leftv v)
-{
-  const short t1[]={1,IDEAL_CMD};
-  const short t2[]={1,MODUL_CMD};
-  if (iiCheckTypes(v,t1,1) || iiCheckTypes(v,t2,1))
-  {
-    ring origRing = currRing;
-    currRing = tagRing((ideal)v->Data());
-
-    BOOLEAN error = jjSYZYGY(res, v);
-    if (error || errorreported) return TRUE;
-
-    ideal syzygy = (ideal) res->data;
-    for (int i = 0; i < IDELEMS(syzygy); i++)
-    {
-      pWrite(syzygy->m[i]);
-    }
-
-    res->rtyp = RING_CMD;
-    res->data = currRing;
-    currRing = origRing;
-    return FALSE;
-  }
-  else return TRUE;
-}
-
-static BOOLEAN lpTagRing(leftv res, leftv v)
-{
-  const short t[]={1,IDEAL_CMD};
-  if (iiCheckTypes(v,t,1))
-  {
-    res->rtyp = RING_CMD;
-    res->data = tagRing((ideal)v->Data());
-    return FALSE;
-  }
-  else return TRUE;
-}
 #endif
 
@@ -248 +138 @@
   p->iiAddCproc("freealgebra.so","lpLmDivides",FALSE,lpLmDivides);
   p->iiAddCproc("freealgebra.so","lpVarAt",FALSE,lpVarAt);
-  p->iiAddCproc("freealgebra.so","lpSyzRing",FALSE,lpSyzRing);
-  p->iiAddCproc("freealgebra.so","lpTagRing",FALSE,lpTagRing);
   p->iiAddCproc("freealgebra.so","stest",TRUE,stest);
   p->iiAddCproc("freealgebra.so","btest",TRUE,btest);

Singular/iparith.cc

@@ -5153 +5153 @@
   ideal v_id=(ideal)v->Data();
   tHomog hom=testHomog;
+#ifdef HAVE_SHIFTBBA
+  if (rIsLPRing(currRing))
+  {
+    if (currRing->LPncGenCount < IDELEMS(v_id))
+    {
+      Werror("At least %d ncgen variables are needed for this computation.", IDELEMS(v_id));
+      return TRUE;
+    }
+  }
+#endif
   if (ww!=NULL)
   {

kernel/GBEngine/kstd1.cc

@@ -2832 +2832 @@
 
   strat->rightGB = rightGB;
-  // this relies on the implementation of idPrepare,
-  // nonMultiplicativeVars should be the number of rows added in idPrepare() (relevant for syzygies)
-  strat->nonMultiplicativeVars = syzComp > 0 ? F->rank - syzComp : 0;
-  assume(syzComp <= 0 || strat->nonMultiplicativeVars == IDELEMS(F));
-  Print("#tagvars: %d\n", strat->nonMultiplicativeVars);
 
   if(!TEST_OPT_RETURN_SB)
     strat->syzComp = syzComp;
-  Print("syzComp: %d\n", strat->syzComp);
   if (TEST_OPT_SB_1)
     if(!rField_is_Ring(currRing))

kernel/GBEngine/kutil.cc

@@ -12271 +12271 @@
 * put the pair (q,p)  into the set B, ecart=ecart(p), q is the shift of some s[i]
 */
-#define CRITERION_DEBUG
 void enterOnePairShift (poly q, poly p, int ecart, int isFromQ, kStrategy strat, int atR, int ecartq, int qisFromQ, int shiftcount, int ifromS)
 {
@@ -12313 +12312 @@
   /*- computes the lcm(s[i],p) -*/
   Lp.lcm = p_Lcm(p,q, currRing); // q is what was strat->S[i], so a poly in LM/TR presentation
-
-  BOOLEAN lcmHasNonMultiplicativeVar = FALSE;
-  int lV = currRing->isLPring;
-  int degbound = currRing->N/lV;
-  for (int i = 1; i <= degbound; i++)
-  {
-    for (int j = i*lV; j > (i*lV - strat->nonMultiplicativeVars); j--)
-    {
-      if (pGetExp(Lp.lcm,j))
-      {
-        if (lcmHasNonMultiplicativeVar) {
-          pLmFree(Lp.lcm);
-#ifdef CRITERION_DEBUG
-          /* if (TEST_OPT_DEBUG) PrintS("--- NCGEN crit\n"); */
-          if (TEST_OPT_DEBUG) PrintS("--- NCGEN crit\n");
-#endif
-          return;
-        }
-        lcmHasNonMultiplicativeVar = TRUE;
-      }
-    }
-  }
 
   /* the V criterion */

kernel/GBEngine/kutil.h

@@ -367 +367 @@
   int cv; // in shift bases: counting V criterion
   /*BOOLEAN*/ char rightGB;
-  int nonMultiplicativeVars; // number of variables at the end that are non multipicative (needed for syzygies)
   #endif
   /*BOOLEAN*/ char interpt;

kernel/ideals.cc

@@ -621 +621 @@
     if (rIsLPRing(currRing))
     {
-      pSetExp(q, currRing->isLPring - i + j + 1, 1);
+      pSetExp(q, currRing->isLPring - currRing->LPncGenCount + j + 1, 1);
       p_Setm(q, currRing);
     }

libpolys/polys/monomials/ring.cc

@@ -432 +432 @@
   if (rIsLPRing(r))
   {
-    Print("\n// letterplace ring (block size %d)",r->isLPring);
+    Print("\n// letterplace ring (block size %d, ncgen count %d)",r->isLPring, r->LPncGenCount);
   }
 #endif
@@ -1393 +1393 @@
 #ifdef HAVE_SHIFTBBA
   res->isLPring=r->isLPring; /* 0 for non-letterplace rings, otherwise the number of LP blocks, at least 1, known also as lV */
+  res->LPncGenCount=r->LPncGenCount;
 #endif
 
@@ -1522 +1523 @@
 #ifdef HAVE_SHIFTBBA
   res->isLPring=r->isLPring; /* 0 for non-letterplace rings, otherwise the number of LP blocks, at least 1, known also as lV */
+  res->LPncGenCount=r->LPncGenCount;
 #endif
 
@@ -1667 +1669 @@
   #ifdef HAVE_SHIFTBBA
   if (r1->isLPring!=r2->isLPring) return FALSE;
+  if (r1->LPncGenCount!=r2->LPncGenCount) return FALSE;
   #endif
 

libpolys/polys/monomials/ring.h

@@ -312 +312 @@
 #ifdef HAVE_SHIFTBBA
   short          isLPring; /* 0 for non-letterplace rings, otherwise the number of LP blocks, at least 1, known also as lV */
+  short          LPncGenCount;
 #endif
 

libpolys/polys/shiftop.cc

@@ -529 +529 @@
   PrintLn(); WriteLPExpV(m1ExpV, ri);
 #endif
+  assume(_p_mLPNCGenValid(m1ExpV, ri));
 }
 
@@ -564 +565 @@
   PrintLn(); WriteLPExpV(m1ExpV, ri);
 #endif
+  assume(_p_mLPNCGenValid(m1ExpV, ri));
 }
 
@@ -608 +610 @@
   assume(p_FirstVblock(m1,r) <= 1);
   assume(p_FirstVblock(m2,r) <= 1);
+}
+
+BOOLEAN _p_mLPNCGenValid(int *mExpV, const ring r)
+{
+  BOOLEAN hasNCGen = FALSE;
+  int lV = r->isLPring;
+  int degbound = r->N/lV;
+  int ncGenCount = r->LPncGenCount;
+  for (int i = 1; i <= degbound; i++)
+  {
+    for (int j = i*lV; j > (i*lV - ncGenCount); j--)
+    {
+      if (mExpV[j])
+      {
+        if (hasNCGen)
+        {
+          return FALSE;
+        }
+        hasNCGen = TRUE;
+      }
+    }
+  }
+  return TRUE;
 }
 
@@ -673 +698 @@
     if (B[j]!=0) break;
   }
-  /* do not need e anymore */
+
+  if (j==0)
+  {
+    omFreeSize((ADDRESS) e, (r->N+1)*sizeof(int));
+    omFreeSize((ADDRESS) B, (b+1)*sizeof(int));
+    return 1;
+  }
+
+  if (!_p_mLPNCGenValid(e, r))
+  {
+    omFreeSize((ADDRESS) e, (r->N+1)*sizeof(int));
+    omFreeSize((ADDRESS) B, (b+1)*sizeof(int));
+    return 0;
+  }
+
   omFreeSize((ADDRESS) e, (r->N+1)*sizeof(int));
 
-  if (j==0) goto ret_true;
 //   {
 //     /* it is a zero exp vector, which is in V */
@@ -688 +726 @@
     {
       omFreeSize((ADDRESS) B, (b+1)*sizeof(int));
-      return(0);
-    }
-  }
- ret_true:
+      return 0;
+    }
+  }
+
   omFreeSize((ADDRESS) B, (b+1)*sizeof(int));
-  return(1);
+  return 1;
 }
 
@@ -783 +821 @@
 }
 
-ring freeAlgebra(ring r, int d)
-{
+ring freeAlgebra(ring r, int d, int ncGenCount)
+{
+  if (ncGenCount) r = rCopy0(r);
+  for (int i = 1; i <= ncGenCount; i++)
+  {
+    char *varname=(char *)omAlloc(256);
+    sprintf(varname, "ncgen(%d)", i);
+    ring save = r;
+    r = rPlusVar(r, varname, 0);
+    omFreeSize(varname, 256);
+    rDelete(save);
+  }
   ring R=rCopy0(r);
   int p;
@@ -795 +843 @@
   R->N=r->N*d;
   R->isLPring=r->N;
+  R->LPncGenCount=ncGenCount;
   // create R->order
   BOOLEAN has_order_a=FALSE;
@@ -883 +932 @@
   R->names=names;
 
+  if (ncGenCount) rDelete(r);
   rComplete(R,TRUE);
   return R;

libpolys/polys/shiftop.h

@@ -55 +55 @@
 BOOLEAN _p_LPLmDivisibleByNoComp(poly a, poly b, const ring r);
 
+BOOLEAN _p_mLPNCGenValid(int *mExpV, const ring r);
+
 poly p_LPVarAt(poly p, int pos, const ring r);
 
 /// create the letterplace ring corresponding to r up to degree d
-ring freeAlgebra(ring r, int d);
+ring freeAlgebra(ring r, int d, int LPncGenCount = 0);
 #endif
 #endif