Changeset a7ee69 in git

Timestamp:

Nov 8, 2010, 5:55:06 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ac0bd60e1d213f4d9b7e9b2c6e9dd526c82bac2d

Parents:

fb4075bf0613cccede0552d05c1b4ee37a7f6530

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-11-08 17:55:06+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:36+01:00

Message:

moved pLcm to p_poly: p_Lcm

Location:

polys

Files:

• monomials/p_polys.cc (modified) (1 diff)
• monomials/p_polys.h (modified) (1 diff)
• polys.cc (modified) (1 diff)
• polys.h (modified) (1 diff)

polys/monomials/p_polys.cc

@@ -1352 +1352 @@
 }
 
+/*2
+* returns the LCM of the head terms of a and b in *m
+*/
+void p_Lcm(poly a, poly b, poly m, const ring r)
+{
+  int i;
+  for (i=rVar(r); i; i--)
+  {
+    p_SetExp(m,i, si_max( p_GetExp(a,i,r), p_GetExp(b,i,r)),r);
+  }
+  p_SetComp(m, si_max(p_GetComp(a,r), p_GetComp(b,r)),r);
+  /* Don't do a pSetm here, otherwise hres/lres chockes */
+}
+
 /***************************************************************
  *

polys/monomials/p_polys.h

@@ -1757 +1757 @@
 poly      p_Divide(poly a, poly b, const ring r);
 poly      p_DivideM(poly a, poly b, const ring r);
+void      p_Lcm(poly a, poly b, poly m, const ring r);
 #endif // P_POLYS_H
 

polys/polys.cc

@@ -126 +126 @@
 #endif
 
-/*2
-* returns the LCM of the head terms of a and b in *m
-*/
-void pLcm(poly a, poly b, poly m)
-{
-  int i;
-  for (i=pVariables; i; i--)
-  {
-    pSetExp(m,i, si_max( pGetExp(a,i), pGetExp(b,i)));
-  }
-  pSetComp(m, si_max(pGetComp(a), pGetComp(b)));
-  /* Don't do a pSetm here, otherwise hres/lres chockes */
-}
-
 BOOLEAN _p_Test(poly p, ring r, int level);
 

polys/polys.h

@@ -290 +290 @@
 
 #define pDivide(a,b) p_Divide(a,b,currRing)
-
-void      pLcm(poly a, poly b, poly m);
+#define pLcm(a,b,m) p_Lcm(a,b,m,currRing)
+
 poly      pDiff(poly a, int k);
 poly      pDiffOp(poly a, poly b,BOOLEAN multiply);