Changeset 459609 in git for libpolys/polys

Timestamp:

May 13, 2016, 2:41:25 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

6402b559828c96b40e77a0755dbd3ba17ba2909a

Parents:

ff38ee02732552e78a143ebf4f9aadccee454071

Message:

fix pDivideM and p_Div_nn

File:

• libpolys/polys/monomials/p_polys.cc (modified) (2 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -1483 +1483 @@
   pAssume(!n_IsZero(n,r->cf));
   p_Test(p, r);
-
-  poly q = p;
-  while (p != NULL)
-  {
-    number nc = pGetCoeff(p);
-    printf("\n1,q=%p,p=%p\n",q,p);p_Write(p,r);p_Write(q,r);
-    pSetCoeff0(p, n_Div(nc, n, r->cf));
-    n_Delete(&nc, r->cf);
-    printf("\n2,q=%p,p=%p\n",q,p);p_Write(p,r);p_Write(q,r);
-    if(n_IsZero(p_GetCoeff(p,r),r->cf))
-      p_LmDelete(&p,r);
+  poly result = p;
+  poly prev = NULL;
+  while (p!=NULL)
+  {
+    number nc = n_Div(pGetCoeff(p),n,r->cf);
+    if (!n_IsZero(nc,r->cf))
+    {
+      p_SetCoeff(p,nc,r);
+      prev=p;
+      pIter(p);
+    }
     else
-      pIter(p);
-    printf("\n3,q=%p,p=%p\n",q,p);p_Write(p,r);p_Write(q,r);
-  }
-  p_Test(q, r);
-  return q;
+    {
+      if (prev==NULL)
+      {
+        p_LmDelete(&result,r);
+        p=result;
+      }
+      else
+      {
+        p_LmDelete(&pNext(prev),r);
+        p=pNext(prev);
+      }
+    }
+  }
+  p_Test(result,r);
+  return(result);
 }
 
@@ -1552 +1562 @@
   else
   {
-    p_Write(result,r);
-    p_Div_nn(result,inv,r);
-    p_Write(result,r);
+    result = p_Div_nn(result,inv,r);
   }
 #else
-  p_Mult_nn(result,inv,r);
+  result = p_Mult_nn(result,inv,r);
   n_Delete(&inv, r->cf);
 #endif