Changeset cbc616 in git

Timestamp:

Jul 25, 2008, 12:23:09 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fe7424e916aeb90c55dfb281c0392f267f374df6

Parents:

3f685ce735ca6b7086ca139f15b88896cb2decd0

Message:

*hannes:bbaPart


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

File:

• kernel/kstd2.cc (modified) (5 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.71 2008-07-24 10:27:17 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.72 2008-07-25 10:23:09 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -14 +14 @@
 
 #include "mod2.h"
+#ifdef HAVE_PLURAL
+#define PLURAL_INTERNAL_DECLARATIONS 1
+#endif
 #include "kutil.h"
 #include "structs.h"
@@ -1243 +1246 @@
   {
     completeReduce(strat);
+#ifdef HAVE_TAIL_RING
     if (strat->completeReduce_retry)
     {
@@ -1253 +1257 @@
       completeReduce(strat);
     }
+#endif
   }
   else if (TEST_OPT_PROT) PrintLn();
@@ -1271 +1276 @@
   return (strat->Shdl);
 }
-
+#ifdef HAVE_PLURAL
+ideal bbaPart (ideal F, ideal Q,intvec *w,intvec *hilb,kStrategy strat)
+{
+  om_Opts.MinTrack = 5;
+  int   srmax,lrmax, red_result = 1;
+  int   olddeg,reduc;
+  int hilbeledeg=1,hilbcount=0,minimcnt=0;
+  BOOLEAN withT = FALSE;
+
+  initBuchMoraCrit(strat); /*set Gebauer, honey, sugarCrit*/
+  nc_gr_initBba(F,strat);
+  initBuchMoraPos(strat);
+  //initHilbCrit(F,Q,&hilb,strat);
+  /*set enterS, spSpolyShort, reduce, red, initEcart, initEcartPair*/
+  /*Shdl=*/initBuchMora(F, Q,strat);
+  //if (strat->minim>0) strat->M=idInit(IDELEMS(F),F->rank);
+  strat->posInT=posInT110;
+
+  srmax = strat->sl;
+  reduc = olddeg = lrmax = 0;
+
+#ifndef NO_BUCKETS
+  if (!TEST_OPT_NOT_BUCKETS)
+    strat->use_buckets = 1;
+#endif
+
+  // redtailBBa against T for inhomogenous input
+  if (!K_TEST_OPT_OLDSTD)
+    withT = ! strat->homog;
+
+  // strat->posInT = posInT_pLength;
+  kTest_TS(strat);
+
+//#ifdef HAVE_TAIL_RING
+//  kStratInitChangeTailRing(strat);
+//#endif
+
+  /* compute------------------------------------------------------- */
+  while (strat->Ll >= 0)
+  {
+    if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
+    #ifdef KDEBUG
+      #ifdef HAVE_RINGS
+        if (TEST_OPT_DEBUG) PrintS("--- next step ---\n");
+      #endif
+      if (TEST_OPT_DEBUG) messageSets(strat);
+    #endif
+    if (strat->Ll== 0) strat->interpt=TRUE;
+    if (TEST_OPT_DEGBOUND
+        && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
+            || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
+    {
+      /*
+       *stops computation if
+       * 24 IN test and the degree +ecart of L[strat->Ll] is bigger then
+       *a predefined number Kstd1_deg
+       */
+      while ((strat->Ll >= 0)
+        && (strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL)
+        && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
+            || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))
+        )
+        deleteInL(strat->L,&strat->Ll,strat->Ll,strat);
+      if (strat->Ll<0) break;
+      else strat->noClearS=TRUE;
+    }
+    /* picks the last element from the lazyset L */
+    strat->P = strat->L[strat->Ll];
+    strat->Ll--;
+
+    if (pNext(strat->P.p) == strat->tail)
+    {
+      // deletes the short spoly
+#ifdef HAVE_RINGS
+      if (rField_is_Ring(currRing))
+        pLmDelete(strat->P.p);
+      else
+#endif
+        pLmFree(strat->P.p);
+      strat->P.p = NULL;
+      poly m1 = NULL, m2 = NULL;
+
+//#ifdef HAVE_TAIL_RING
+//      // check that spoly creation is ok
+//      while (strat->tailRing != currRing &&
+//             !kCheckSpolyCreation(&(strat->P), strat, m1, m2))
+//      {
+//        assume(m1 == NULL && m2 == NULL);
+//        // if not, change to a ring where exponents are at least
+//        // large enough
+//        kStratChangeTailRing(strat);
+//      }
+//#endif
+      // create the real one
+      strat->P.p = nc_CreateSpoly(strat->P.p1,strat->P.p2,currRing);
+    }
+    //else if (strat->P.p1 == NULL)
+    //{
+    //  if (strat->minim > 0)
+    //    strat->P.p2=p_Copy(strat->P.p, currRing, strat->tailRing);
+    //  // for input polys, prepare reduction
+    //  strat->P.PrepareRed(strat->use_buckets);
+    //}
+
+    if (strat->P.p == NULL && strat->P.t_p == NULL)
+    {
+      red_result = 0;
+    }
+    else
+    {
+      if (TEST_OPT_PROT)
+        message((strat->honey ? strat->P.ecart : 0) + strat->P.pFDeg(),
+                &olddeg,&reduc,strat, red_result);
+
+      /* reduction of the element choosen from L */
+      red_result = strat->red(&strat->P,strat);
+    }
+
+    // reduction to non-zero new poly
+    if (red_result == 1)
+    {
+      /* statistic */
+      if (TEST_OPT_PROT) PrintS("s");
+
+      // get the polynomial (canonicalize bucket, make sure P.p is set)
+      strat->P.GetP(strat->lmBin);
+
+      int pos=posInS(strat,strat->sl,strat->P.p,strat->P.ecart);
+
+      // reduce the tail and normalize poly
+      // in the ring case we cannot expect LC(f) = 1,
+      // therefore we call pContent instead of pNorm
+      if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
+      {
+        strat->P.pCleardenom();
+        if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
+        {
+          strat->P.p = redtailBba(&(strat->P),pos-1,strat, withT);
+          strat->P.pCleardenom();
+        }
+      }
+      else
+      {
+        strat->P.pNorm();
+        if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
+          strat->P.p = redtailBba(&(strat->P),pos-1,strat, withT);
+      }
+
+#ifdef KDEBUG
+      if (TEST_OPT_DEBUG){PrintS("new s:");strat->P.wrp();PrintLn();}
+#endif
+
+      // min_std stuff
+      //if ((strat->P.p1==NULL) && (strat->minim>0))
+      //{
+      //  if (strat->minim==1)
+      //  {
+      //    strat->M->m[minimcnt]=p_Copy(strat->P.p,currRing,strat->tailRing);
+      //    p_Delete(&strat->P.p2, currRing, strat->tailRing);
+      //  }
+      //  else
+      //  {
+      //    strat->M->m[minimcnt]=strat->P.p2;
+      //    strat->P.p2=NULL;
+      //  }
+      //  if (strat->tailRing!=currRing && pNext(strat->M->m[minimcnt])!=NULL)
+      //    pNext(strat->M->m[minimcnt])
+      //      = strat->p_shallow_copy_delete(pNext(strat->M->m[minimcnt]),
+      //                                     strat->tailRing, currRing,
+      //                                     currRing->PolyBin);
+      //  minimcnt++;
+      //}
+
+      // enter into S, L, and T
+      //if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
+        enterT(strat->P, strat);
+#ifdef HAVE_RINGS
+      if (rField_is_Ring(currRing))
+        superenterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
+      else
+#endif
+        enterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
+      // posInS only depends on the leading term
+      if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
+      {
+      strat->enterS(strat->P, pos, strat, strat->tl);
+      }
+      else
+      {
+      //  strat->P.Delete(); // syzComp test: it is in T
+      }
+      //if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
+//      Print("[%d]",hilbeledeg);
+      if (strat->P.lcm!=NULL)
+#ifdef HAVE_RINGS
+        pLmDelete(strat->P.lcm);
+#else
+        pLmFree(strat->P.lcm);
+#endif
+      if (strat->sl>srmax) srmax = strat->sl;
+    }
+    //else if (strat->P.p1 == NULL && strat->minim > 0)
+    //{
+    //  p_Delete(&strat->P.p2, currRing, strat->tailRing);
+    //}
+
+#ifdef KDEBUG
+    memset(&(strat->P), 0, sizeof(strat->P));
+#endif
+    kTest_TS(strat);
+  }
+#ifdef KDEBUG
+  if (TEST_OPT_DEBUG) messageSets(strat);
+#endif
+  /* complete reduction of the standard basis--------- */
+  if (TEST_OPT_SB_1)
+  {
+    int k=1;
+    int j;
+    while(k<=strat->sl)
+    {
+      j=0;
+      loop
+      {
+        if (j>=k) break;
+        clearS(strat->S[j],strat->sevS[j],&k,&j,strat);
+        j++;
+      }
+      k++;
+    }
+  }
+
+  if (TEST_OPT_REDSB)
+  {
+    completeReduce(strat);
+//#ifdef HAVE_TAIL_RING
+//    if (strat->completeReduce_retry)
+//    {
+//      // completeReduce needed larger exponents, retry
+//      // to reduce with S (instead of T)
+//      // and in currRing (instead of strat->tailRing)
+//      cleanT(strat);strat->tailRing=currRing;
+//      int i;
+//      for(i=strat->sl;i>=0;i--) strat->S_2_R[i]=-1;
+//      completeReduce(strat);
+//    }
+//#endif
+  }
+  else if (TEST_OPT_PROT) PrintLn();
+
+  /* release temp data-------------------------------- */
+  exitBuchMora(strat);
+  if (TEST_OPT_WEIGHTM)
+  {
+    pRestoreDegProcs(pFDegOld, pLDegOld);
+    if (ecartWeights)
+    {
+      omFreeSize((ADDRESS)ecartWeights,(pVariables+1)*sizeof(short));
+      ecartWeights=NULL;
+    }
+  }
+  if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
+  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
+  return (strat->Shdl);
+}
+#endif
 poly kNF2 (ideal F,ideal Q,poly q,kStrategy strat, int lazyReduce)
 {