Changeset 7b4ca1f in git

Timestamp:

Jan 30, 2017, 7:18:36 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

347543e34be451b4f7f8394141a8c49ecfc42c17ab9451896d9e00fb71ed53755c19641f7eb4b68e

Parents:

ee8cdb02450fdfa9053b378628d72181b97f0d85

Message:

p_GcdMon and p_Div_mm in singclap_gcd_and_divide

Location:

libpolys/polys

Files:

• clapsing.cc (modified) (1 diff)
• monomials/p_polys.cc (modified) (2 diffs)
• monomials/p_polys.h (modified) (1 diff)

libpolys/polys/clapsing.cc

@@ -119 +119 @@
     return res;
   }
-  if (p_IsConstant(g, r))
-  {
-    coeffs cf=r->cf;
-    number G=pGetCoeff(g);
-    G=n_Copy(G,cf);
-    if(n_IsOne(G,cf)) return p_NSet(G,r);;
-    poly ff=f;
-    do
-    {
-      number n=n_SubringGcd(G,pGetCoeff(ff),cf);
-      n_Delete(&G,cf);
-      G=n;
-      if (n_IsOne(G,cf)) break;
-      pIter(ff);
-    } while(ff!=NULL);
-    if(n_IsOne(G,cf)) return p_NSet(G,r);
-    f=p_Div_nn(f,G,r); p_Normalize(f,r);
-    g=p_Div_nn(g,G,r); p_Normalize(g,r);
-    return p_NSet(G,r);
-  }
-  else if (p_IsConstant(f, r))
-  {
-    coeffs cf=r->cf;
-    number G=pGetCoeff(f);
-    G=n_Copy(G,cf);
-    if(n_IsOne(G,cf)) return p_NSet(G,r);;
-    poly ff=g;
-    do
-    {
-      number n=n_SubringGcd(G,pGetCoeff(ff),cf);
-      n_Delete(&G,cf);
-      G=n;
-      if (n_IsOne(G,cf)) break;
-      pIter(ff);
-    } while(ff!=NULL);
-    if(n_IsOne(G,cf)) return p_NSet(G,r);
-    f=p_Div_nn(f,G,r);
-    g=p_Div_nn(g,G,r);
-    return p_NSet(G,r);
+  if (pNext(g)==NULL)
+  {
+    poly G=p_GcdMon(g,f,r);
+    if (!n_IsOne(pGetCoeff(G),r->cf)
+    || (!p_IsConstant(G,r)))
+    {
+      f=p_Div_mm(f,G,r);
+      g=p_Div_mm(g,G,r);
+    }
+    return G;
+  }
+  else if (pNext(f)==NULL)
+  {
+    poly G=p_GcdMon(f,g,r);
+    if (!n_IsOne(pGetCoeff(G),r->cf)
+    || (!p_IsConstant(G,r)))
+    {
+      f=p_Div_mm(f,G,r);
+      g=p_Div_mm(g,G,r);
+    }
+    return G;
   }
 

libpolys/polys/monomials/p_polys.cc

@@ -1485 +1485 @@
       p_SetCoeff(p,nc,r);
       prev=p;
+      pIter(p);
+    }
+    else
+    {
+      if (prev==NULL)
+      {
+        p_LmDelete(&result,r);
+        p=result;
+      }
+      else
+      {
+        p_LmDelete(&pNext(prev),r);
+        p=pNext(prev);
+      }
+    }
+  }
+  p_Test(result,r);
+  return(result);
+}
+
+poly p_Div_mm(poly p, const poly m, const ring r)
+{
+  p_Test(p, r);
+  p_Test(m, r);
+  poly result = p;
+  poly prev = NULL;
+  number n=pGetCoeff(m);
+  while (p!=NULL)
+  {
+    number nc = n_Div(pGetCoeff(p),n,r->cf);
+    n_Normalize(nc,r->cf);
+    if (!n_IsZero(nc,r->cf))
+    {
+      p_SetCoeff(p,nc,r);
+      prev=p;
+      p_ExpVectorSub(p,m,r);
       pIter(p);
     }
@@ -4763 +4799 @@
   {
     if (h==NULL) break;
-    one_coeff=TRUE;
     if(!one_coeff)
     {

libpolys/polys/monomials/p_polys.h

@@ -2027 +2027 @@
 /// polynomial gcd for f=mon
 poly p_GcdMon(poly f, poly g, const ring r);
+
+/// divide polynomial by monomial
+poly p_Div_mm(poly p, const poly m, const ring r);
 #endif // P_POLYS_H