Changeset b085fba in git

Timestamp:

Nov 25, 2013, 9:15:32 AM (9 years ago)

Author:

Christian Eder

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')

Children:

576f5bba463748c5f51eebf368f6184847882508

Parents:

f59aaade492b9527e048de83ffcb97228e48208b

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-11-25 09:15:32+01:00

git-committer:

Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:51:25+01:00

Message:

adds experimental sba tailred (disabled by default)

Location:

kernel

Files:

• kInline.h (modified) (1 diff)
• kstd2.cc (modified) (5 diffs)
• kutil.cc (modified) (1 diff)
• kutil.h (modified) (1 diff)

kernel/kInline.h

@@ -1074 +1074 @@
 }
 
+KINLINE int ksReducePolyTailSig(LObject* PR, TObject* PW, LObject* Red)
+{
+  BOOLEAN ret;
+  number coef;
+
+  assume(PR->GetLmCurrRing() != PW->GetLmCurrRing());
+  Red->HeadNormalize();
+  printf("------------------------\n");
+  pWrite(Red->GetLmCurrRing());
+  ret = ksReducePolySig(Red, PW, 1, NULL, &coef);
+  if (ret == 3) {
+    pWrite(Red->GetLmCurrRing());
+    printf("not sig-safe\n");
+    printf("------------------------\n");
+  }
+  if (!ret)
+  {
+    if (! n_IsOne(coef, currRing->cf))
+    {
+      PR->Mult_nn(coef);
+      // HANNES: mark for Normalize
+    }
+    n_Delete(&coef, currRing->cf);
+  }
+  return ret;
+}
+
 /***************************************************************
  *

kernel/kstd2.cc

@@ -53 +53 @@
 #endif
 
+#define SBA_TAIL_RED                        0
 #define SBA_PRODUCT_CRITERION               0
 #define SBA_PRINT_ZERO_REDUCTIONS           1
@@ -1818 +1819 @@
       // in the ring case we cannot expect LC(f) = 1,
       // therefore we call pContent instead of pNorm
-      /*
+#if SBA_TAIL_RED
+      pWrite(strat->P.p);
       if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
       {
@@ -1824 +1826 @@
         if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
         {
-          strat->P.p = redtailBba(&(strat->P),pos-1,strat, withT);
+          strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
           strat->P.pCleardenom();
         }
@@ -1832 +1834 @@
         strat->P.pNorm();
         if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
-          strat->P.p = redtailBba(&(strat->P),pos-1,strat, withT);
-      }
-      */
+          strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
+      }
+      pWrite(strat->P.p);
+      printf("-\n");
+#endif
 #ifdef KDEBUG
       if (TEST_OPT_DEBUG){PrintS("new s:");strat->P.wrp();PrintLn();}
@@ -1934 +1938 @@
       // posInS only depends on the leading term
       strat->enterS(strat->P, pos, strat, strat->tl);
-//#if 1
-#if DEBUGF50
+#if 1
+//#if DEBUGF50
     printf("---------------------------\n");
     Print(" %d. ELEMENT ADDED TO GCURR:\n",strat->sl+1);

kernel/kutil.cc

@@ -5469 +5469 @@
       strat->redTailChange=TRUE;
       if (ksReducePolyTail(L, With, &Ln))
+      {
+        // reducing the tail would violate the exp bound
+        //  set a flag and hope for a retry (in bba)
+        strat->completeReduce_retry=TRUE;
+        if ((Ln.p != NULL) && (Ln.t_p != NULL)) Ln.p=NULL;
+        do
+        {
+          pNext(h) = Ln.LmExtractAndIter();
+          pIter(h);
+          L->pLength++;
+        } while (!Ln.IsNull());
+        goto all_done;
+      }
+      if (Ln.IsNull()) goto all_done;
+      if (! withT) With_s.Init(currRing);
+    }
+    pNext(h) = Ln.LmExtractAndIter();
+    pIter(h);
+    pNormalize(h);
+    L->pLength++;
+  }
+
+  all_done:
+  Ln.Delete();
+  if (L->p != NULL) pNext(L->p) = pNext(p);
+
+  if (strat->redTailChange)
+  {
+    L->length = 0;
+  }
+
+  //if (TEST_OPT_PROT) { PrintS("N"); mflush(); }
+  //L->Normalize(); // HANNES: should have a test
+  assume(kTest_L(L));
+  return L->GetLmCurrRing();
+}
+
+// tail reduction for SBA
+poly redtailSba (LObject* L, int pos, kStrategy strat, BOOLEAN withT, BOOLEAN normalize)
+{
+#define REDTAIL_CANONICALIZE 100
+  strat->redTailChange=FALSE;
+  if (strat->noTailReduction) return L->GetLmCurrRing();
+  poly h, p;
+  p = h = L->GetLmTailRing();
+  if ((h==NULL) || (pNext(h)==NULL))
+    return L->GetLmCurrRing();
+
+  TObject* With;
+  // placeholder in case strat->tl < 0
+  TObject  With_s(strat->tailRing);
+
+  LObject Ln(pNext(h), strat->tailRing);
+  Ln.sig      = L->sig;
+  Ln.sevSig   = L->sevSig;
+  Ln.pLength  = L->GetpLength() - 1;
+
+  pNext(h) = NULL;
+  if (L->p != NULL) pNext(L->p) = NULL;
+  L->pLength = 1;
+
+  Ln.PrepareRed(strat->use_buckets);
+
+  int cnt=REDTAIL_CANONICALIZE;
+  while(!Ln.IsNull())
+  {
+    loop
+    {
+      Ln.SetShortExpVector();
+      if (withT)
+      {
+        int j;
+        j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, &Ln);
+        if (j < 0) break;
+        With = &(strat->T[j]);
+      }
+      else
+      {
+        With = kFindDivisibleByInS(strat, pos, &Ln, &With_s);
+        if (With == NULL) break;
+      }
+      cnt--;
+      if (cnt==0)
+      {
+        cnt=REDTAIL_CANONICALIZE;
+        /*poly tmp=*/Ln.CanonicalizeP();
+        if (normalize)
+        {
+          Ln.Normalize();
+          //pNormalize(tmp);
+          //if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
+        }
+      }
+      if (normalize && (!TEST_OPT_INTSTRATEGY) && (!nIsOne(pGetCoeff(With->p))))
+      {
+        With->pNorm();
+      }
+      strat->redTailChange=TRUE;
+      if (ksReducePolyTailSig(L, With, &Ln))
       {
         // reducing the tail would violate the exp bound

kernel/kutil.h

@@ -467 +467 @@
 poly redtailBba (LObject *L, int pos,kStrategy strat,
                  BOOLEAN withT = FALSE,BOOLEAN normalize=FALSE);
+poly redtailSba (LObject *L, int pos,kStrategy strat,
+                 BOOLEAN withT = FALSE,BOOLEAN normalize=FALSE);
 poly redtailBba (TObject *T, int pos,kStrategy strat);
 poly redtail (poly p,int pos,kStrategy strat);