Changeset 5162db in git for polys

Timestamp:

Nov 8, 2010, 6:10:18 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

041dfe18affe0cfc2ab3f798958a8e596f6bad6f

Parents:

ac0bd60e1d213f4d9b7e9b2c6e9dd526c82bac2d

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-11-08 18:10:18+01:00

git-committer:

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

Message:

moved pDiffOp to p_polys p_DiffOp

Location:

polys

Files:

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

polys/monomials/p_polys.cc

@@ -1405 +1405 @@
   return res;
 }
+
+static poly pDiffOpM(poly a, poly b,BOOLEAN multiply, const ring r)
+{
+  int i,j,s;
+  number n,h,hh;
+  poly p=p_One(r);
+  n=n_Mult(pGetCoeff(a),pGetCoeff(b),r->cf);
+  for(i=rVar(r);i>0;i--)
+  {
+    s=p_GetExp(b,i,r);
+    if (s<p_GetExp(a,i,r))
+    {
+      n_Delete(&n,r->cf);
+      p_LmDelete(&p,r);
+      return NULL;
+    }
+    if (multiply)
+    {
+      for(j=p_GetExp(a,i,r); j>0;j--)
+      {
+        h = n_Init(s,r->cf);
+        hh=n_Mult(n,h,r->cf);
+        n_Delete(&h,r->cf);
+        n_Delete(&n,r->cf);
+        n=hh;
+        s--;
+      }
+      p_SetExp(p,i,s,r);
+    }
+    else
+    {
+      p_SetExp(p,i,s-p_GetExp(a,i,r),r);
+    }
+  }
+  p_Setm(p,r);
+  /*if (multiply)*/ p_SetCoeff(p,n,r);
+  if (n_IsZero(n,r->cf))  p=p_LmDeleteAndNext(p,r); // return NULL as p is a monomial
+  return p;
+}
+
+poly p_DiffOp(poly a, poly b,BOOLEAN multiply, const ring r)
+{
+  poly result=NULL;
+  poly h;
+  for(;a!=NULL;pIter(a))
+  {
+    for(h=b;h!=NULL;pIter(h))
+    {
+      result=p_Add_q(result,p_DiffOpM(a,h,multiply,r),r);
+    }
+  }
+  return result;
+}
 /***************************************************************
  *

polys/monomials/p_polys.h

@@ -1759 +1759 @@
 void      p_Lcm(poly a, poly b, poly m, const ring r);
 poly      p_Diff(poly a, int k, const ring r);
+poly      p_DiffOp(poly a, poly b,BOOLEAN multiply, const ring r);
 #endif // P_POLYS_H
 

polys/polys.h

@@ -292 +292 @@
 #define pLcm(a,b,m) p_Lcm(a,b,m,currRing)
 #define pDiff(a,b)  p_Diff(a,b,currRing)
-poly      pDiffOp(poly a, poly b,BOOLEAN multiply);
+#define pDiffOp(a,b,m) p_DiffOp(a,b,m,currRing)
 
 #define   pMaxComp(p)   p_MaxComp(p, currRing)

polys/polys1.cc

@@ -352 +352 @@
   }
   return rc;
-}
-
-static poly pDiffOpM(poly a, poly b,BOOLEAN multiply)
-{
-  int i,j,s;
-  number n,h,hh;
-  poly p=pOne();
-  n=nMult(pGetCoeff(a),pGetCoeff(b));
-  for(i=pVariables;i>0;i--)
-  {
-    s=pGetExp(b,i);
-    if (s<pGetExp(a,i))
-    {
-      nDelete(&n);
-      pLmDelete(&p);
-      return NULL;
-    }
-    if (multiply)
-    {
-      for(j=pGetExp(a,i); j>0;j--)
-      {
-        h = nInit(s);
-        hh=nMult(n,h);
-        nDelete(&h);
-        nDelete(&n);
-        n=hh;
-        s--;
-      }
-      pSetExp(p,i,s);
-    }
-    else
-    {
-      pSetExp(p,i,s-pGetExp(a,i));
-    }
-  }
-  pSetm(p);
-  /*if (multiply)*/ pSetCoeff(p,n);
-  if (nIsZero(n))  p=pLmDeleteAndNext(p); // return NULL as p is a monomial
-  return p;
-}
-
-poly pDiffOp(poly a, poly b,BOOLEAN multiply)
-{
-  poly result=NULL;
-  poly h;
-  for(;a!=NULL;pIter(a))
-  {
-    for(h=b;h!=NULL;pIter(h))
-    {
-      result=pAdd(result,pDiffOpM(a,h,multiply));
-    }
-  }
-  return result;
 }