Changeset 17c315 in git

Timestamp:

Mar 13, 2017, 4:42:06 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

af6ec6b981b52226441c782e44735843c61cfb5b

Parents:

a0707f8848846bae0b35b9436d54d36e5f3ccd43

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-03-13 16:42:06+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-03-13 16:44:45+01:00

Message:

p_Lcm -> p_polys.cc

Files:

• kernel/GBEngine/kutil.cc (modified) (11 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (2 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)
• libpolys/polys/nc/nc.h (modified) (2 diffs)
• libpolys/polys/nc/old.gring.cc (modified) (2 diffs)
• libpolys/polys/nc/sca.cc (modified) (1 diff)

kernel/GBEngine/kutil.cc

@@ -1322 +1322 @@
 #endif
   /*- computes the lcm(s[i],p) -*/
-  h.lcm = pInit();
+  h.lcm = p_Lcm(p,strat->S[i],currRing);
   pSetCoeff0(h.lcm, n_Lcm(pGetCoeff(p), pGetCoeff(strat->S[i]), currRing->cf));
   if (nIsZero(pGetCoeff(h.lcm)))
@@ -1331 +1331 @@
   }
   // basic chain criterion
-  pLcm(p,strat->S[i],h.lcm);
-  pSetm(h.lcm);
-    /*
+  /*
   *the set B collects the pairs of type (S[j],p)
   *suppose (r,p) is in B and (s,p) is the new pair and lcm(s,p) != lcm(r,p)
@@ -1970 +1968 @@
 #elif defined(HAVE_RATGRING)
   if (rIsRatGRing(currRing))
-  pLcmRat(p,strat->S[i],Lp.lcm, currRing->real_var_start); // int rat_shift
+    pLcmRat(p,strat->S[i],Lp.lcm, currRing->real_var_start); // int rat_shift
   else
-  pLcm(p,strat->S[i],Lp.lcm);
+    pLcm(p,strat->S[i],Lp.lcm);
 #endif
   pSetm(Lp.lcm);
@@ -2238 +2236 @@
   assume(i<=strat->sl);
 
+  if ((strat->S[i]==NULL) || (p==NULL))
+    return;
+
   int      l,j,compare;
   LObject  Lp;
@@ -2246 +2247 @@
 #endif
   /*- computes the lcm(s[i],p) -*/
-  Lp.lcm = pInit();
-
-  pLcm(p,strat->S[i],Lp.lcm);
-  pSetm(Lp.lcm);
+  Lp.lcm = p_Lcm(p,strat->S[i],currRing);
 
   if (strat->sugarCrit)
@@ -2377 +2375 @@
     pNorm(p);
 
-  if ((strat->S[i]==NULL) || (p==NULL))
-    return;
-
   if ((strat->fromQ!=NULL) && (isFromQ!=0) && (strat->fromQ[i]!=0))
     Lp.p=NULL;
@@ -2466 +2461 @@
   pLcm(p,strat->S[i],Lp.lcm);
 #elif defined(HAVE_RATGRING)
-  //  if (rIsRatGRing(currRing))
-  pLcmRat(p,strat->S[i],Lp.lcm, currRing->real_var_start); // int rat_shift
+  if (rIsRatGRing(currRing))
+    pLcmRat(p,strat->S[i],Lp.lcm, currRing->real_var_start); // int rat_shift
+  else
+    pLcm(p,strat->S[i],Lp.lcm);
 #endif
   pSetm(Lp.lcm);
@@ -2742 +2739 @@
   pLcm(p,strat->S[i],Lp.lcm);
 #elif defined(HAVE_RATGRING)
-  //  if (rIsRatGRing(currRing))
-  pLcmRat(p,strat->S[i],Lp.lcm, currRing->real_var_start); // int rat_shift
+  if (rIsRatGRing(currRing))
+    pLcmRat(p,strat->S[i],Lp.lcm, currRing->real_var_start); // int rat_shift
+  else
+    pLcm(p,strat->S[i],Lp.lcm);
 #endif
   pSetm(Lp.lcm);
@@ -3156 +3155 @@
   Lp.i_r = -1;
 
-  Lp.lcm = pInit();
-  pLcm(p,strat->S[i],Lp.lcm);
-  pSetm(Lp.lcm);
+  Lp.lcm = p_Lcm(p,strat->S[i],currRing);
   /*-  compute the short s-polynomial -*/
 
@@ -4239 +4236 @@
 #endif
   /*- computes the lcm(s[i],p) -*/
-  Lp.lcm = pInit();
-
-  pLcm(p,f,Lp.lcm);
-  pSetm(Lp.lcm);
+  Lp.lcm = p_Lcm(p,f,Lp.lcm,currRing);
   pSetCoeff(Lp.lcm, nLcm(pGetCoeff(p), pGetCoeff(f), currRing));
   assume(!strat->sugarCrit);
@@ -12350 +12344 @@
 #endif
   /*- computes the lcm(s[i],p) -*/
-  Lp.lcm = pInit();
-
-  pLcm(p,q, Lp.lcm); // q is what was strat->S[i], so a poly in LM/TR presentation
-  pSetm(Lp.lcm);
+  Lp.lcm = p_Lcm(p,q, currRing); // q is what was strat->S[i], so a poly in LM/TR presentation
 
   /* apply the V criterion */

libpolys/polys/monomials/p_polys.cc

@@ -1614 +1614 @@
 void p_Lcm(const poly a, const poly b, poly m, const ring r)
 {
-  for (int i=rVar(r); i; --i)
+  for (int i=r->N; i; --i)
     p_SetExp(m,i, si_max( p_GetExp(a,i,r), p_GetExp(b,i,r)),r);
 
@@ -1621 +1621 @@
 }
 
-
+poly p_Lcm(const poly a, const poly b, const ring r)
+{
+  poly m=p_Init(r);
+  p_Lcm(a, b, m, r);
+  p_Setm(m,r);
+  return(m);
+}
 
 #ifdef HAVE_RATGRING

libpolys/polys/monomials/p_polys.h

@@ -1936 +1936 @@
 poly      p_Div_nn(poly p, const number n, const ring r);
 
-// returns the LCM of the head terms of a and b in *m
+// returns the LCM of the head terms of a and b in *m, does not p_Setm
 void p_Lcm(const poly a, const poly b, poly m, const ring r);
+// returns the LCM of the head terms of a and b, does p_Setm
+poly p_Lcm(const poly a, const poly b, const ring r);
 
 #ifdef HAVE_RATGRING

libpolys/polys/nc/nc.h

@@ -324 +324 @@
                       ring curr,
                       bool dummy_ring = false
-                      /* allow to create a nc-ring with 1 variable*/);
+                      /* allow to create a nc-ring with 1 variable*/);
 
 
@@ -337 +337 @@
 poly pOppose(ring Rop_src, poly p, const ring Rop_dst);
 ideal idOppose(ring Rop_src, ideal I, const ring Rop_dst);
-
-
-
-// returns the LCM of the head terms of a and b with the given component
-// NOTE: coeff will be created but remains undefined(zero?)
-poly p_Lcm(const poly a, const poly b, const long lCompM, const ring r);
-
-// returns the LCM of the head terms of a and b with component = max comp. of a & b
-// NOTE: coeff will be created but remains undefined(zero?)
-poly p_Lcm(const poly a, const poly b, const ring r);
-
-
-
-
 
 const int GENERICMASK = 0x000; // gnc... must do its dirty job first!

libpolys/polys/nc/old.gring.cc

@@ -150 +150 @@
 //  poly nc_p_Plus_mm_Mult_qq (poly p, const poly m, const poly q, int &lp, int lq, const ring r);
 #endif
-
-
-
-/*2
-* returns the LCM of the head terms of a and b
-* without coefficient!!!
-*/
-poly p_Lcm(const poly a, const poly b, const long lCompM, const ring r)
-{
-  poly m = // p_One( r);
-          p_Init(r);
-
-  const int pVariables = r->N;
-
-  for (int i = pVariables; i!=0; i--)
-  {
-    const int lExpA = p_GetExp (a, i, r);
-    const int lExpB = p_GetExp (b, i, r);
-
-    p_SetExp (m, i, si_max(lExpA, lExpB), r);
-  }
-
-  p_SetComp (m, lCompM, r);
-
-  p_Setm(m,r);
-
-#ifdef PDEBUG
-//  p_Test(m,r);
-#endif
-
-  n_New(&(p_GetCoeff(m, r)), r);
-
-  return(m);
-}
-
-poly p_Lcm(const poly a, const poly b, const ring r)
-{
-#ifdef PDEBUG
-  p_Test(a, r);
-  p_Test(b, r);
-#endif
-
-  const long lCompP1 = p_GetComp(a, r);
-  const long lCompP2 = p_GetComp(b, r);
-
-  const poly m = p_Lcm(a, b, si_max(lCompP1, lCompP2), r);
-
-#ifdef PDEBUG
-//  p_Test(m,r);
-#endif
-  return(m);
-}
-
 
 
@@ -1964 +1911 @@
 #endif
   {
-    m = p_Lcm(p1, p2, si_max(lCompP1, lCompP2), r);
+    m = p_Lcm(p1, p2, r);
   }
 

libpolys/polys/nc/sca.cc

@@ -766 +766 @@
   }
 
-  poly pL = p_Lcm(p1, p2, si_max(lCompP1, lCompP2), r);       // pL = lcm( lm(p1), lm(p2) )
+  poly pL = p_Lcm(p1, p2, r);       // pL = lcm( lm(p1), lm(p2) )
 
   poly m1 = p_One( r);