Changeset e4b56d in git

Timestamp:

Aug 6, 2009, 4:36:51 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

89314848080dc671e1de502749b8f7a2b6fc2302

Parents:

424cd646332e11e54c822873f6276ff3ddcb8751

Message:

*hannes: code cleanup


git-svn-id: file:///usr/local/Singular/svn/trunk@12049 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/longalg.cc (modified) (10 diffs)

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.40 2009-08-06 10:18:33 Singular Exp $ */
+/* $Id: longalg.cc,v 1.41 2009-08-06 14:36:51 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -209 +209 @@
 
 /*3
-* returns ph * z
-*/
-static void napMultN(napoly p, number z)
-{
-  number t;
-
-  while (p!=NULL)
-  {
-    t = nacMult(napGetCoeff(p), z);
-    nacNormalize(t);
-    nacDelete(&napGetCoeff(p),nacRing);
-    napGetCoeff(p) = t;
-    napIter(p);
-  }
-}
-
-/*3
 *  division with rest; f = g*q + r, returns r and destroy f
 */
@@ -325 +308 @@
     nacNormalize(t);
     t = nacNeg(t);
-    napMultN(qa, t);
+    qa=p_Mult_nn(qa,t,nacRing);
     nacDelete(&t,nacRing);
     napNormalize(qa);
@@ -345 +328 @@
     nacNormalize(napGetCoeff(r));
     t = nacInvers(napGetCoeff(r));
-    napMultN(q, t);
+    q=p_Mult_nn(q,t,nacRing);
     napNormalize(q);
     nacDelete(&t,nacRing);
@@ -374 +357 @@
       t = nacInvers(napGetCoeff(r));
       //nacNormalize(t);
-      napMultN(q, t);
+      q=p_Mult_nn(q,t,nacRing);
       napNormalize(q);
       nacDelete(&t,nacRing);
@@ -763 +746 @@
         napCleardenom(y);
         if (!nacIsOne(napGetCoeff(g)))
-          napMultN(y, napGetCoeff(g));
+          y=p_Mult_nn(y,napGetCoeff(g),nacRing);
         napDelete1(&g);
         return y;
@@ -1780 +1763 @@
   /* collect all denoms from y and multiply x and y by it */
     number n=napLcm(y);
-    napMultN(x,n);
-    napMultN(y,n);
+    x=p_Mult_nn(x,n,nacRing);
+    y=p_Mult_nn(y,n,nacRing);
     nacDelete(&n,nacRing);
     while(x!=NULL)
@@ -1830 +1813 @@
     number h1 = nacInvers(napGetCoeff(y));
     nacNormalize(h1);
-    napMultN(x, h1);
+    x=p_Mult_nn(x,h1,nacRing);
     nacDelete(&h1,nacRing);
     napDelete1(&y);
@@ -1875 +1858 @@
     {
       number n=napLcm(y);
-      napMultN(x,n);
-      napMultN(y,n);
+      x=p_Mult_nn(x,n,nacRing);
+      y=p_Mult_nn(y,n,nacRing);
       nacDelete(&n,nacRing);
       while(x!=NULL)
@@ -2064 +2047 @@
         number aa=nacInvers(a);
         nacDelete(&a,nacRing);
-        napMultN(x,aa);
+        x=p_Mult_nn(x,aa,nacRing);
         nacDelete(&aa,nacRing);
       }