Changeset 7245240 in git for kernel/kutil.cc

Timestamp:

Jul 9, 2008, 10:26:30 AM (16 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7739c953f47596b385dcf31bc6786a1e3ac94590

Parents:

c9c60f894de6f136a5e83377562698e0806b77c5

Message:

stratChangeTailRing für gcd/strong polys


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

File:

• kernel/kutil.cc (modified) (9 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.99 2008-07-08 13:29:46 Singular Exp $ */
+/* $Id: kutil.cc,v 1.100 2008-07-09 08:26:30 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1266 +1266 @@
   number d, s, t;
   assume(i<=strat->sl);
-  LObject  Lp;
-  poly m1, m2, erg, gcd;
+  assume(atR >= 0);
+  poly m1, m2, gcd;
 
   d = nExtGcd(pGetCoeff(p), pGetCoeff(strat->S[i]), &s, &t);
@@ -1280 +1280 @@
 
   k_GetStrongLeadTerms(p, strat->S[i], currRing, m1, m2, gcd, strat->tailRing);
-
+  while (! kCheckStrongCreation(atR, m1, i, m2, strat) )
+  {
+    memset(&(strat->P), 0, sizeof(strat->P));
+    kStratChangeTailRing(strat);
+    strat->P = *(strat->R[atR]);
+    p_LmFree(m1, strat->tailRing);
+    p_LmFree(m2, strat->tailRing);
+    p_LmFree(gcd, currRing);
+    k_GetStrongLeadTerms(p, strat->S[i], currRing, m1, m2, gcd, strat->tailRing);
+  }
   pSetCoeff0(m1, s);
   pSetCoeff0(m2, t);
   pSetCoeff0(gcd, d);
-
 
 #ifdef KDEBUG
@@ -1305 +1313 @@
 #endif
 
-  erg = p_Add_q(pp_Mult_mm(pNext(p), m1, strat->tailRing), pp_Mult_mm(pNext(strat->S[i]), m2, strat->tailRing), strat->tailRing);
-  pNext(gcd) = erg;
-  pLmDelete(m1);
-  pLmDelete(m2);
+  pNext(gcd) = p_Add_q(pp_Mult_mm(pNext(p), m1, strat->tailRing), pp_Mult_mm(pNext(strat->S[i]), m2, strat->tailRing), strat->tailRing);
+  p_LmDelete(m1, strat->tailRing);
+  p_LmDelete(m2, strat->tailRing);
 
 #ifdef KDEBUG
@@ -1322 +1329 @@
   h.tailRing = strat->tailRing;
   int posx;
-  if (h.p!=NULL)
-  {
-    if (TEST_OPT_INTSTRATEGY)
-    {
-      h.pCleardenom(); // also does a pContent
-    }
-    else
-    {
-      h.pNorm();
-    }
+  h.pCleardenom();
     strat->initEcart(&h);
     if (strat->Ll==-1)
@@ -1339 +1337 @@
     h.sev = pGetShortExpVector(h.p);
     h.t_p = k_LmInit_currRing_2_tailRing(h.p, strat->tailRing);
-    if (pNext(p) != NULL)
-    {
-      // What does this? (Oliver)
-      // pShallowCopyDeleteProc p_shallow_copy_delete
-      //      = pGetShallowCopyDeleteProc(strat->tailRing, new_tailRing);
-      // pNext(p) = p_shallow_copy_delete(pNext(p),
-      //              currRing, strat->tailRing, strat->tailRing->PolyBin);
-    }
     enterL(&strat->L,&strat->Ll,&strat->Lmax,h,posx);
-  }
   return TRUE;
 }
@@ -2633 +2622 @@
       }
     }
-
-#ifdef HAVE_VANGB
-    // initenterzeropairsRing(h, ecart, strat, atR);
-#endif
 
     if (new_pair) chainCritRing(h,ecart,strat);
@@ -5772 +5757 @@
 }
 
+#ifdef HAVE_RINGS
+/***************************************************************
+ *
+ * Checks, if we can compute the gcd poly / strong pair
+ * gcd-poly = m1 * R[atR] + m2 * S[atS]
+ *
+ ***************************************************************/
+BOOLEAN kCheckStrongCreation(int atR, poly m1, int atS, poly m2, kStrategy strat)
+{
+  assume(strat->S_2_R[atS] >= -1 && strat->S_2_R[atS] <= strat->tl);
+  assume(strat->tailRing != currRing);
+
+  poly p1_max = (strat->R[atR])->max;
+  poly p2_max = (strat->R[strat->S_2_R[atS]])->max;
+
+  if ((p1_max != NULL && !p_LmExpVectorAddIsOk(m1, p1_max, strat->tailRing)) ||
+      (p2_max != NULL && !p_LmExpVectorAddIsOk(m2, p2_max, strat->tailRing)))
+  {
+    return FALSE;
+  }
+  return TRUE;
+}
+#endif
+
 BOOLEAN kStratChangeTailRing(kStrategy strat, LObject *L, TObject* T, unsigned long expbound)
 {
@@ -5890 +5899 @@
   if (rField_is_Ring(currRing))
   {
-    l += 20; // TEMP, TODO OLI
     l *= 2;
   }