Changeset b2c236 in git for kernel/kstd2.cc

Timestamp:

Nov 27, 2006, 5:11:23 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9e9ec3df945106169f8daf8b55033fea8579fa1b

Parents:

9550253271625a21c0e4629145949aa74007ac56

Message:

*hannes: length in redHoney


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

File:

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

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.26 2006-11-17 14:47:37 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.27 2006-11-27 16:09:46 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -93 +93 @@
 #else
   int ende=strat->sl;
-#endif  
+#endif
   (*max_ind)=ende;
   loop
@@ -601 +601 @@
   d = reddeg = h->GetpFDeg() + h->ecart;
   h->SetShortExpVector();
+  int li;
   h_p = h->GetLmTailRing();
   not_sev = ~ h->sev;
@@ -609 +610 @@
 
     ei = strat->T[j].ecart;
+    li = strat->T[j].pLength;
     ii = j;
     /*
@@ -621 +623 @@
       if (i > strat->tl)
         break;
-      if (ei <= h->ecart)
+      if (ei < h->ecart)
         break;
-      if ((strat->T[i].ecart < ei) &&
+      if (li==1)
+        break;
+      if (((strat->T[i].ecart < ei)
+         || ((strat->T[i].ecart <= h->ecart) && (strat->T[i].pLength < li)))
+         &&
           p_LmShortDivisibleBy(strat->T[i].GetLmTailRing(), strat->sevT[i],
                                h_p, not_sev, strat->tailRing))
@@ -631 +637 @@
          */
         ei = strat->T[i].ecart;
+        li = strat->T[i].pLength;
         ii = i;
       }
@@ -672 +679 @@
     assume(strat->fromT == FALSE);
 
+#if 0 // test poly exchange
+    if (strat->inStdFac==0)
+    {
+      int ll;
+      poly t_p;
+      if (strat->tailRing==currRing)
+        t_p=strat->T[ii].p;
+      else
+        t_p=strat->T[ii].t_p;
+      if ((p_LmCmp(h_p,t_p,strat->tailRing)==0)
+      && ((ll=h->GuessLength()) < strat->T[ii].pLength))
+      {
+        h->GetP();
+        if ((h->pLength=h->GetpLength()) < strat->T[ii].pLength)
+        {
+          if (TEST_OPT_PROT)  PrintS("e");
+          h->GetP();
+          if (h->p!=NULL)
+          {
+            if (strat->T[ii].p!=NULL)
+            {
+              poly swap;
+              omTypeAlloc0Bin(poly,swap,currRing->PolyBin);
+              memcpy(swap,h->p,currRing->PolyBin->sizeW*sizeof(long));
+              memcpy(h->p,strat->T[ii].p,currRing->PolyBin->sizeW*sizeof(long));
+              memcpy(strat->T[ii].p,swap,currRing->PolyBin->sizeW*sizeof(long));
+              omFreeBinAddr(swap);
+            }
+            else
+            {
+              strat->T[ii].p=h->p;
+              h->p=NULL;
+            }
+          }
+          else
+          {
+            if (strat->T[ii].p!=NULL)
+            {
+              h->p=strat->T[ii].p;
+              strat->T[ii].p=NULL;
+            }
+            // else: all NULL
+          }
+          if (h->t_p!=NULL)
+          {
+            if (strat->T[ii].t_p!=NULL)
+            {
+              poly swap;
+              omTypeAlloc0Bin(poly,swap,strat->tailRing->PolyBin);
+              memcpy(swap,h->t_p,strat->tailRing->PolyBin->sizeW*sizeof(long));
+              memcpy(h->t_p,strat->T[ii].t_p,strat->tailRing->PolyBin->sizeW*sizeof(long));
+              memcpy(strat->T[ii].t_p,swap,strat->tailRing->PolyBin->sizeW*sizeof(long));
+              omFreeBinAddr(swap);
+            }
+            else
+            {
+              strat->T[ii].t_p=h->t_p;
+              h->t_p=NULL;
+            }
+          }
+          else
+          {
+            if (strat->T[ii].t_p!=NULL)
+            {
+              h->t_p=strat->T[ii].t_p;
+              strat->T[ii].t_p=NULL;
+            }
+            // else: all NULL
+          }
+          if (strat->tailRing != currRing && (strat->T[ii].p != NULL)
+          && pNext(strat->T[ii].p) != NULL)
+             strat->T[ii].max =p_GetMaxExpP(pNext(strat->T[ii].p), strat->tailRing);
+          else
+             strat->T[ii].max = NULL;
+          h->pLength=0;h->pLength=h->GetpLength();
+          strat->T[ii].pLength=0;strat->T[ii].pLength=strat->T[ii].GetpLength();
+          if (strat->T[ii].is_normalized)
+          {
+            strat->T[ii].is_normalized=0;
+            strat->T[ii].pNorm();
+          }
+          else
+          {
+            if (TEST_OPT_INTSTRATEGY)
+              strat->T[ii].pCleardenom();
+          }
+          h->PrepareRed(strat->use_buckets);
+        }
+      }
+    }
+#endif // test poly exchange
     ksReducePoly(h, &(strat->T[ii]), NULL, NULL, strat);
 
@@ -923 +1021 @@
     }
 
-#ifdef HAVE_RING2TOM
     if (strat->P.p == NULL && strat->P.t_p == NULL)
     {
@@ -929 +1026 @@
     }
     else
-#endif
     {
       if (TEST_OPT_PROT)
@@ -1009 +1105 @@
       strat->enterS(strat->P, pos, strat, strat->tl);
 #endif
+      int pl=pLength(strat->P.p);
+      if (pl==1)
+      {
+        //if (TEST_OPT_PROT)
+        //PrintS("<1>");
+      }
+      else if (pl==2)
+      {
+        //if (TEST_OPT_PROT)
+        //PrintS("<2>");
+      }
       if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
 //      Print("[%d]",hilbeledeg);