Changeset ac4ff44 in git

Timestamp:

Oct 12, 2018, 2:44:21 PM (6 years ago)

Author:

Christian Eder

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

194f79909c91c263131614aafc678fe53c3c3d4a

Parents:

a9ff57e7b34bc7d0865159255fc179055cdfc745

Message:

removes more useless code, fixes parameter handling of replacement function

Location:

kernel/GBEngine

Files:

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

kernel/GBEngine/kstd2.cc

@@ -645 +645 @@
         redtailBbaAlsoLC_Z(&h2, j, strat);
         /* replace h2 for tj in L (already generated pairs with tj), S and T */
-        replaceInLAndSAndT(h2, strat, j);
+        replaceInLAndSAndT(h2, strat);
       }
     } else {

kernel/GBEngine/kutil.cc

@@ -1500 +1500 @@
   enterL(&strat->B,&strat->Bl,&strat->Bmax,h,posx);
   kTest_TS(strat);
-}
-
-
-int replaceOneSPoly (poly psi,poly p,kStrategy strat, int posInL)
-{
-  assume(p!=NULL);
-  int      j,compare,compareCoeff;
-  LObject  h;
-
-#ifdef KDEBUG
-  h.ecart=0; h.length=0;
-#endif
-  /*- computes the lcm(s[i],p) -*/
-  if(pHasNotCF(p, psi))
-  {
-      strat->cp++;
-      return 0;
-  }
-  h.lcm = p_Lcm(p, psi, currRing);
-  pSetCoeff0(h.lcm, n_Lcm(pGetCoeff(p), pGetCoeff(psi), currRing->cf));
-  if (nIsZero(pGetCoeff(h.lcm)))
-  {
-      strat->cp++;
-      pLmDelete(h.lcm);
-      return 0;
-  }
-  number s, t;
-  poly m1, m2, gcd = NULL;
-  s = pGetCoeff(psi);
-  t = pGetCoeff(p);
-  k_GetLeadTerms(p, psi, currRing, m1, m2, currRing);
-  ksCheckCoeff(&s, &t, currRing->cf);
-  pSetCoeff0(m1, s);
-  pSetCoeff0(m2, t);
-  m2 = pNeg(m2);
-  p_Test(m1,strat->tailRing);
-  p_Test(m2,strat->tailRing);
-  poly si = pCopy(psi);
-  poly pm1 = pp_Mult_mm(pNext(p), m1, strat->tailRing);
-  poly sim2 = pp_Mult_mm(pNext(si), m2, strat->tailRing);
-  pDelete(&si);
-  p_LmDelete(m1, currRing);
-  p_LmDelete(m2, currRing);
-  if(sim2 == NULL)
-  {
-    if(pm1 == NULL)
-    {
-      if(h.lcm != NULL)
-      {
-        pLmDelete(h.lcm);
-        h.lcm=NULL;
-      }
-      return 0;
-    }
-    else
-    {
-      gcd = pm1;
-      pm1 = NULL;
-    }
-  }
-  else
-  {
-    if((pGetComp(psi) == 0) && (0 != pGetComp(p)))
-    {
-      p_SetCompP(sim2, pGetComp(p), strat->tailRing);
-      pSetmComp(sim2);
-    }
-    gcd = p_Add_q(pm1, sim2, strat->tailRing);
-  }
-  p_Test(gcd, strat->tailRing);
-#ifdef KDEBUG
-  if (TEST_OPT_DEBUG)
-  {
-    wrp(gcd);
-    PrintLn();
-  }
-#endif
-  h.p = gcd;
-  h.i_r = -1;
-  h.tailRing = strat->tailRing;
-  int posx;
-  strat->initEcart(&h);
-  #if 1
-  h.p1 = psi;
-  h.p2 = p;
-  #endif
-  h.i_r1 = strat->L[posInL].i_r1;
-  h.i_r2 = strat->L[posInL].i_r2;
-  if (currRing!=strat->tailRing)
-    h.t_p = k_LmInit_currRing_2_tailRing(h.p, strat->tailRing);
-  /* delete old and add new pair */
-  if (strat->L[posInL].lcm != NULL)
-  {
-      kDeleteLcm(&(strat->L[posInL]));
-  }
-  if (strat->L[posInL].p!=NULL)
-  {
-    if (pNext(strat->L[posInL].p) == strat->tail)
-    {
-#ifdef HAVE_RINGS
-      if (pGetCoeff(strat->L[posInL].p) != NULL)
-        pLmDelete(strat->L[posInL].p);
-      else
-#endif
-        pLmFree(strat->L[posInL].p);
-      /*- tail belongs to several int spolys -*/
-    }
-    else
-    {
-      // search p in T, if it is there, do not delete it
-      if (rHasGlobalOrdering(currRing) || (kFindInT(strat->L[posInL].p, strat) < 0))
-      {
-        // assure that for global orderings kFindInT fails
-        //assume((rHasLocalOrMixedOrdering(currRing)) && (kFindInT(strat->L[posInL].p, strat) >= 0));
-        strat->L[posInL].Delete();
-      }
-    }
-  }
-  strat->L[posInL]  = h;
-  return 1;
-}
-
-int replaceOneStrongPoly (poly si,poly p,kStrategy strat, int posInL)
-{
-  number d, s, t;
-  poly m1, m2, gcd;
-  //printf("\n--------------------------------\n");
-  //pWrite(p);pWrite(si);
-  d = n_ExtGcd(pGetCoeff(p), pGetCoeff(si), &s, &t, currRing->cf);
-
-  if (nIsZero(s) || nIsZero(t))  // evtl. durch divBy tests ersetzen
-  {
-    nDelete(&d);
-    nDelete(&s);
-    nDelete(&t);
-    /* we can delete the strong spoly, it is no needed due
-     * to the smaller lead coefficient in p.p */
-    deleteInL(strat->L, &strat->Ll, posInL, strat);
-    return 0;
-  }
-
-  k_GetStrongLeadTerms(p, si, currRing, m1, m2, gcd, strat->tailRing);
-
-  if (!rHasMixedOrdering(currRing)) {
-    unsigned long sev = pGetShortExpVector(gcd);
-  }
-
-  pSetCoeff0(m1, s);
-  pSetCoeff0(m2, t);
-  pSetCoeff0(gcd, d);
-  p_Test(m1,strat->tailRing);
-  p_Test(m2,strat->tailRing);
-
-  pNext(gcd) = p_Add_q(pp_Mult_mm(pNext(p), m1, strat->tailRing), pp_Mult_mm(pNext(si), m2, strat->tailRing), strat->tailRing);
-  p_LmDelete(m1, strat->tailRing);
-  p_LmDelete(m2, strat->tailRing);
-#ifdef KDEBUG
-  if (TEST_OPT_DEBUG)
-  {
-    wrp(gcd);
-    PrintLn();
-  }
-#endif
-
-  LObject h;
-  h.p = gcd;
-  h.tailRing = strat->tailRing;
-  int posx;
-  h.pCleardenom();
-  strat->initEcart(&h);
-  h.sev = pGetShortExpVector(h.p);
-  h.i_r1 = -1;h.i_r2 = -1;
-  if (currRing!=strat->tailRing)
-    h.t_p = k_LmInit_currRing_2_tailRing(h.p, strat->tailRing);
-  #if 1
-  h.p1 = si;
-  h.p2 = p;
-  #endif
-  h.i_r1 = strat->L[posInL].i_r1;
-  h.i_r2 = strat->L[posInL].i_r2;
-
-  /* delete old and add new pair */
-  if (strat->L[posInL].lcm != NULL)
-  {
-      kDeleteLcm(&(strat->L[posInL]));
-  }
-  if (strat->L[posInL].p!=NULL)
-  {
-    if (pNext(strat->L[posInL].p) == strat->tail)
-    {
-#ifdef HAVE_RINGS
-      if (pGetCoeff(strat->L[posInL].p) != NULL)
-        pLmDelete(strat->L[posInL].p);
-      else
-#endif
-        pLmFree(strat->L[posInL].p);
-      /*- tail belongs to several int spolys -*/
-    }
-    else
-    {
-      // search p in T, if it is there, do not delete it
-      if (rHasGlobalOrdering(currRing) || (kFindInT(strat->L[posInL].p, strat) < 0))
-      {
-        // assure that for global orderings kFindInT fails
-        //assume((rHasLocalOrMixedOrdering(currRing)) && (kFindInT(strat->L[posInL].p, strat) >= 0));
-        strat->L[posInL].Delete();
-      }
-    }
-  }
-  strat->L[posInL]  = h;
-
-  return 1;
 }
 
@@ -9656 +9444 @@
 * puts p to the set T at position atT
 */
-void replaceInLAndSAndT(LObject &p, kStrategy strat, int pos)
+void replaceInLAndSAndT(LObject &p, kStrategy strat)
 {
   p.GetP(strat->lmBin);

kernel/GBEngine/kutil.h

@@ -556 +556 @@
 void enterSyz (LObject &p,kStrategy strat, int atT);
 void enterT (LObject &p,kStrategy strat, int atT = -1);
-void replaceInLAndSAndT(LObject &p, kStrategy strat, int pos);
-int replaceOneStrongPoly (poly si,poly p,kStrategy strat, int posInL);
-int replaceOneSPoly (poly si,poly p,kStrategy strat, int posInL);
+void replaceInLAndSAndT(LObject &p, kStrategy strat);
 #ifdef HAVE_RINGS
 void enterT_strong (LObject &p,kStrategy strat, int atT = -1);