Changeset 1c473f in git

Timestamp:

Feb 24, 2008, 6:41:32 PM (15 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

4d43ff458adf4e30c9059ffaf846500aa5d64c61

Parents:

c1d4a79cef5604c9608af4eb2e48128ef65c70fb

Message:

*levandov: modifications of shift free gb


git-svn-id: file:///usr/local/Singular/svn/trunk@10606 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• kstd1.cc (modified) (2 diffs)
• kstd1.h (modified) (2 diffs)
• kstd2.cc (modified) (4 diffs)
• kutil.cc (modified) (25 diffs)
• kutil.h (modified) (3 diffs)
• shiftgb.cc (modified) (3 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.32 2008-02-08 10:11:28 wienand Exp $ */
+/* $Id: kstd1.cc,v 1.33 2008-02-24 17:41:31 levandov Exp $ */
 /*
 * ABSTRACT:
@@ -1715 +1715 @@
         r=bba(F,Q,NULL,hilb,strat);
     }
+  }
+#ifdef KDEBUG
+  idTest(r);
+#endif
+  if (toReset)
+  {
+    kModW = NULL;
+    pRestoreDegProcs(pFDegOld, pLDegOld);
+  }
+  pLexOrder = b;
+//Print("%d reductions canceled \n",strat->cel);
+  HCord=strat->HCord;
+  delete(strat);
+  if ((delete_w)&&(w!=NULL)&&(*w!=NULL)) delete *w;
+  return r;
+}
+
+ideal kStdShift(ideal F, ideal Q, tHomog h,intvec ** w, intvec *hilb,int syzComp,
+                int newIdeal, intvec *vw, int uptodeg, int lV)
+{
+  ideal r;
+  BOOLEAN b=pLexOrder,toReset=FALSE;
+  BOOLEAN delete_w=(w==NULL);
+  kStrategy strat=new skStrategy;
+
+  if(!TEST_OPT_RETURN_SB)
+    strat->syzComp = syzComp;
+  if (TEST_OPT_SB_1)
+    strat->newIdeal = newIdeal;
+  if (rField_has_simple_inverse())
+    strat->LazyPass=20;
+  else
+    strat->LazyPass=2;
+  strat->LazyDegree = 1;
+  strat->ak = idRankFreeModule(F);
+  strat->kModW=kModW=NULL;
+  strat->kHomW=kHomW=NULL;
+  if (vw != NULL)
+  {
+    pLexOrder=FALSE;
+    strat->kHomW=kHomW=vw;
+    pFDegOld = pFDeg;
+    pLDegOld = pLDeg;
+    pSetDegProcs(kHomModDeg);
+    toReset = TRUE;
+  }
+  if (h==testHomog)
+  {
+    if (strat->ak == 0)
+    {
+      h = (tHomog)idHomIdeal(F,Q);
+      w=NULL;
+    }
+    else if (!TEST_OPT_DEGBOUND)
+    {
+      h = (tHomog)idHomModule(F,Q,w);
+    }
+  }
+  pLexOrder=b;
+  if (h==isHomog)
+  {
+    if (strat->ak > 0 && (w!=NULL) && (*w!=NULL))
+    {
+      strat->kModW = kModW = *w;
+      if (vw == NULL)
+      {
+        pFDegOld = pFDeg;
+        pLDegOld = pLDeg;
+        pSetDegProcs(kModDeg);
+        toReset = TRUE;
+      }
+    }
+    pLexOrder = TRUE;
+    if (hilb==NULL) strat->LazyPass*=2;
+  }
+  strat->homog=h;
+#ifdef KDEBUG
+  idTest(F);
+#endif
+  if (pOrdSgn==-1)
+  {
+    /* error: no local ord yet with shifts */
+    Print("No local ordering possible for shifts");
+    return(NULL);
+  }
+  else
+  {
+    /* global ordering */
+    if (w!=NULL)
+      r=bbaShift(F,Q,*w,hilb,strat,uptodeg,lV);
+    else
+      r=bbaShift(F,Q,NULL,hilb,strat,uptodeg,lV);
   }
 #ifdef KDEBUG

kernel/kstd1.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.h,v 1.2 2007-07-25 10:53:15 Singular Exp $ */
+/* $Id: kstd1.h,v 1.3 2008-02-24 17:41:31 levandov Exp $ */
 /*
 * ABSTRACT
@@ -33 +33 @@
 ideal kStd(ideal F, ideal Q, tHomog h, intvec ** mw,intvec *hilb=NULL,
           int syzComp=0,int newIdeal=0, intvec *vw=NULL);
+
+ideal kStdShift(ideal F, ideal Q, tHomog h,intvec ** w, intvec *hilb,int syzComp,
+                int newIdeal, intvec *vw, int uptodeg, int lVblock);
 
 /* the following global data are defined in kutil.cc */

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.62 2008-02-23 20:12:51 levandov Exp $ */
+/* $Id: kstd2.cc,v 1.63 2008-02-24 17:41:31 levandov Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1691 +1691 @@
 }
 
+
 ideal freegb(ideal I, int uptodeg, int lVblock)
 {
@@ -1698 +1699 @@
   /* uptodeg and lVblock are correct - test them! */
 
-  kStrategy strat = new skStrategy;
+  //  kStrategy strat = new skStrategy;
   /* ideal bbaShift(ideal F, ideal Q,intvec *w,intvec *hilb,kStrategy strat, int uptodeg, int lV) */
   /* at the moment:
@@ -1704 +1705 @@
 - no *w, no *hilb
   */
-  ideal RS = bbaShift(I,NULL, NULL, NULL, strat, uptodeg, lVblock);
+  /* ideal F, ideal Q, tHomog h,intvec ** w, intvec *hilb,int syzComp,
+     int newIdeal, intvec *vw) */
+  ideal RS = kStdShift(I,NULL, testHomog, NULL,NULL,0,0,NULL, uptodeg, lVblock);
+    //bbaShift(I,NULL, NULL, NULL, strat, uptodeg, lVblock);
   idSkipZeroes(RS);
   return(RS);

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.85 2008-02-23 20:12:52 levandov Exp $ */
+/* $Id: kutil.cc,v 1.86 2008-02-24 17:41:31 levandov Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -4307 +4307 @@
   Print("product criterion:%d chain criterion:%d\n",strat->cp,strat->c3);
   if (hilbcount!=0) Print("hilbert series criterion:%d\n",hilbcount);
+  /* in usual case strat->cv is 0, it gets changed only in shift routines */
+  if (strat->cv!=0) Print("shift V criterion:%d\n",strat->cv);
   /*mflush();*/
 }
@@ -6170 +6172 @@
   strat->cp = 0;
   strat->c3 = 0;
+  strat->cv = 0;
   strat->tail = pInit();
   /*- set s -*/
@@ -6244 +6247 @@
   /* that is create the pairs (f, s \dot g)  */
 
-  poly qq = strat->S[i]; // previously thought and now again: lm in currRing, tail in tailRing
-// elt's of S are compl. in currRing 
-// previously thought: lm in currRing, tail in tailRing
+  poly qq = strat->S[i]; //  lm in currRing, tail in tailRing
 
   //  poly q = pCopy(pHead(strat->S[i])); // lm in currRing
@@ -6255 +6256 @@
   /* hence, a total number of elt's to add is: */
   /*  int toInsert = 1 + (uptodeg-1) - (pLastVblock(p.p, lV) -1);  */
-  //  int toInsert = uptodeg  - pLastVblock(q, lV) +1; 
   int toInsert =  itoInsert(qq, uptodeg,  lV, strat->tailRing);
 
@@ -6286 +6286 @@
 
   // for the 0th shift: insert the orig. pair
-
   enterOnePairShift(qq, p, ecart, isFromQ, strat, -1, ecartq, qfromQ, j, i, uptodeg, lV);
 
-  for (j=1; j<= toInsert; j++) // toIns - 1?
+  for (j=1; j<= toInsert; j++) 
   {
     //    q = pLPshift(strat->S[i],j,uptodeg,lV);
@@ -6296 +6295 @@
     //    s = p_LPshift(pNext(qq), j, uptodeg, lV, strat->tailRing); // from tailRing
     //    pNext(q) = s; // in tailRing
-    //    qq = pLPshift(q,j,uptodeg,lV); // need move
-    // ??? no move needed: in currRing
-    //    qq = pMoveCurrTail2poly(qq,strat);
     /* here we need to call enterOnePair with two polys ... */
 
@@ -6313 +6309 @@
     enterOnePairShift(q, p, ecart, isFromQ, strat, -1, ecartq, qfromQ, j, i, uptodeg, lV);
   }
-  /* delete qq */
-  //  pDelete(&qq);
 }
 
 /*1
 * put the pairs (sh \dot qq,p)  into the set B, ecart=ecart(p)
+* despite the name, not only self shifts
 */
 void enterOnePairSelfShifts (poly qq, poly p, int ecart, int isFromQ, kStrategy strat, int atR, int uptodeg, int lV)
@@ -6325 +6320 @@
   /* format: p,qq are in LObject form: lm in CR, tail in TR */
   /* for true self pairs qq ==p  */
-  /* we test both */
+  /* we test both qq and p */
   assume(p_LmCheckIsFromRing(qq,currRing));
   assume(p_CheckIsFromRing(pNext(qq),strat->tailRing));
@@ -6333 +6328 @@
   int j = 0;
 
-  /* for such pairs start with 1, not with 0 */
+  /* for such self pairs start with 1, not with 0 */
   if (qq == p) j=1;
 
@@ -6339 +6334 @@
   /* that is create the pairs (f, s \dot g)  */
 
- /* determine how many elements we have to insert for a given s[i] */
-  /* x(0)y(1)z(2) : lastVblock-1=2, to add until lastVblock=uptodeg-1 */
-  /* hence, a total number of elt's to add is: */
-  /*  int toInsert = 1 + (uptodeg-1) - (pLastVblock(p.p, lV) -1);  */
-
-  //  poly q = pHead(qq); // lm in currRing
-  //  pNext(q) = prCopyR(pNext(qq), strat->tailRing, currRing);
-  //  pTest(q);
-
   int toInsert =  itoInsert(qq, uptodeg,  lV, strat->tailRing);
 
@@ -6357 +6343 @@
 #endif
 
-//   int toInsert = p_mLastVblock(qq, lV,currRing);
-//   if (pNext(qq) != NULL)
-//   {
-//     toInsert = si_max(toInsert, p_LastVblock(pNext(qq), lV,strat->tailRing) );
-//   }
-//   toInsert = uptodeg  - toInsert +1; 
-
   poly q, s;
 
-  //  assume(i<=strat->sl); // from OnePair
   if (strat->interred_flag) return; // ?
 
@@ -6373 +6351 @@
   int qfromQ = 0; // strat->fromQ[i]; 
 
-  for (; j<= toInsert; j++) // toIns - 1?
+  for (; j<= toInsert; j++)
   {
     //    q = pLPshift(strat->S[i],j,uptodeg,lV);
@@ -6383 +6361 @@
     //    s = p_LPshift(pNext(qq), j, uptodeg, lV, strat->tailRing); // from tailRing
     //    pNext(q) = s; // in tailRing
-    //prMoveR(s,strat->tailRing,currRing); // in currRing
     /* here we need to call enterOnePair with two polys ... */
 #ifdef KDEBUG
@@ -6397 +6374 @@
     enterOnePairShift(q, p, ecart, isFromQ, strat, -1, ecartq, qfromQ, j, -1, uptodeg, lV);
   }
-  /* delete q? */
-  //  pDelete(&q);
 }
 
@@ -6407 +6382 @@
 {
 
-  /* New Format: q and p are like strat->P.p, so lm in CR, tail in TR */
-  /* Format: q is a poly compl. in currRing, p is like strat->P.p, so lm in CR, tail in TR */
+  /* Format: q and p are like strat->P.p, so lm in CR, tail in TR */
 
   /* check this Formats: */
-  //  assume(p_CheckIsFromRing(q,currRing));
   assume(p_LmCheckIsFromRing(q,currRing));
   assume(p_CheckIsFromRing(pNext(q),strat->tailRing));
@@ -6428 +6401 @@
 #endif
 
-  /* indeed we need LM only before real spoly */
   /* poly q stays for s[i], ecartq = ecart(q), qisFromQ = applies to q */
 
@@ -6435 +6407 @@
   /* need additionally: int up_to_degree, poly V0 with the variables in (0)  or just the number lV = the length of the first block */
 
-  //  atR = -1;
-  //  assume(i<=strat->sl); // satisfied automatically
   if (strat->interred_flag) return;
 
@@ -6453 +6423 @@
 
   /* apply the V criterion */
-  /* or do it in ManyShifts? */
   if (!isInV(Lp.lcm, lV))
   {
@@ -6468 +6437 @@
     pLmFree(Lp.lcm);
     Lp.lcm=NULL;
+    /* + counter for applying the V criterion */
+    strat->cv++;
     return;
-    /* + add the counter for applying the V criterion */
-    /* like strat->cv */
   }
 
@@ -6672 +6641 @@
     /*- the pair (S[i],p) enters B -*/
     /* both of them should have their LM in currRing and TAIL in tailring */
-    Lp.p1 = q;  // already converted with pMove2CurrTail(q,strat);
+    Lp.p1 = q;  // already in the needed form 
     Lp.p2 = p; // already in the needed form 
 
@@ -6820 +6789 @@
   /*  int toInsert = 1 + (uptodeg-1) - (pLastVblock(p.p, lV) -1);  */
 
-  //  int toInsert = uptodeg  - pLastVblock(pCopy(p.p), lV) +1; 
-  //  int toInsert = uptodeg  - pLastVblock(p.p, lV) +1; 
-  
   int toInsert =  itoInsert(p.p, uptodeg,  lV, strat->tailRing);
 
@@ -6833 +6799 @@
     atT = strat->posInT(strat->T, strat->tl, p);
   
-  //  LObject q;
-  //  poly s;
   /* can call enterT in a sequence, e.g. */
 
-  /* first we create the 0th shift */
-  //  q = p;
-//   if (q.t_p!=NULL)
-//   {
-//     q.p = pHead(s); // in currRing
-//     q.t_p = prMoveR(s, /* sourcering: */currRing, /* destring: */ strat->tailRing);
-//     if (pNext(q.t_p)!=NULL)
-//     {
-//       pNext(q.p)=pNext(q.t_p);
-//     }
-//   }
-//   else
-//   {
-//     q.p=s;
-//   }
   /* shift0 = it's our model for further shifts */
   enterT(p,strat,atT);
@@ -6861 +6810 @@
     qq.t_p = p_LPshift(p.t_p, i, uptodeg, lV, strat->tailRing); // direct shift
     qq.GetP();
-    /* shift p, that is create another LObject and shift its poly */
-    /* change: p.p, p.t_p, */
-    /* change: i_r (must be -1 because we're not yet in T ? */
-    //    s = pLPshift(pCopyL2p(q,strat), i, uptodeg, lV); // deletes 1st arg, hence pCopy
-    //    q.p = pLPshift(q.p, 1, uptodeg, lV);
-//       qq.p = pHead(s); // in currRing
-//       qq.t_p = prMoveR(s, /* sourcering: */currRing, /* destring: */ strat->tailRing);
-//       if (pNext(q.t_p)!=NULL)
-//       {
-//         pNext(q.p)=pNext(q.t_p);
-//       }
-//     }
-//     else
-//     {
-//       q.p=s;
-//     }
     // update q.sev
     qq.sev = pGetShortExpVector(qq.p);
@@ -6884 +6817 @@
     enterT(qq,strat,atT);
   }
-
 /* Q: what to do with this one in the orig enterT ? */
 /*  strat->R[strat->tl] = &(strat->T[atT]); */

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.33 2008-02-23 20:12:52 levandov Exp $ */
+/* $Id: kutil.h,v 1.34 2008-02-24 17:41:32 levandov Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -298 +298 @@
 #endif
   int cp,c3;
+  int cv; // in shift bases: counting V criterion
   int sl,mu;
   int tl,tmax;
@@ -649 +650 @@
 
 ideal freegb(ideal I, int uptodeg, int lVblock);
-#endif
+
+ideal bbaShift(ideal F, ideal Q,intvec *w,intvec *hilb,kStrategy strat, int uptodeg, int lV);
+#endif

kernel/shiftgb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: shiftgb.cc,v 1.5 2008-02-23 20:12:53 levandov Exp $ */
+/* $Id: shiftgb.cc,v 1.6 2008-02-24 17:41:32 levandov Exp $ */
 /*
 * ABSTRACT: kernel: utils for shift GB and free GB
@@ -370 +370 @@
 }
 
+  /* there should be two routines: */
+  /* 1. tests squarefreeness: in homog this suffices */
+  /* 2. test the presence of a hole -> in the tail??? */
 
 int isInV(poly p, int lV)
 {
+
   if (lV <= 0) return(0);
   /* returns 1 iff p is in V */
@@ -431 +435 @@
   //  i = uptodeg  - i +1; 
   i = uptodeg  - i; 
-  p_wrp(p,currRing,r); Print("----i:%d",i); PrintLn();
+  //  p_wrp(p,currRing,r); Print("----i:%d",i); PrintLn();
   return(i);
 }