Changeset 17c315 in git for kernel

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

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

File:

• kernel/GBEngine/kutil.cc (modified) (11 diffs)

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 */