Changeset 893148 in git

Timestamp:

Aug 6, 2009, 6:35:56 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e475e396109e19d042fc2e09fea0ec817a2ef69b

Parents:

e4b56dbdc5ea987694f17044905f9c68071a59eb

Message:

*hannes: fix: n_Normalize


git-svn-id: file:///usr/local/Singular/svn/trunk@12050 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.41 2009-08-06 14:36:51 Singular Exp $ */
+/* $Id: longalg.cc,v 1.42 2009-08-06 16:35:56 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -308 +308 @@
     nacNormalize(t);
     t = nacNeg(t);
-    qa=p_Mult_nn(qa,t,nacRing);
+    qa=p_Mult_nn(qa,t,nacRing); p_Normalize(qa,nacRing);
     nacDelete(&t,nacRing);
     napNormalize(qa);
@@ -328 +328 @@
     nacNormalize(napGetCoeff(r));
     t = nacInvers(napGetCoeff(r));
-    q=p_Mult_nn(q,t,nacRing);
+    q=p_Mult_nn(q,t,nacRing); p_Normalize(q,nacRing);
     napNormalize(q);
     nacDelete(&t,nacRing);
@@ -357 +357 @@
       t = nacInvers(napGetCoeff(r));
       //nacNormalize(t);
-      q=p_Mult_nn(q,t,nacRing);
+      q=p_Mult_nn(q,t,nacRing); p_Normalize(q,nacRing);
       napNormalize(q);
       nacDelete(&t,nacRing);
@@ -651 +651 @@
   {
     p = ph;
-    while (p!=NULL)
-    {
-      d=nacMult(h, napGetCoeff(p));
-      nacDelete(&napGetCoeff(p),nacRing);
-      nacNormalize(d);
-      napGetCoeff(p) = d;
-      napIter(p);
-    }
+    p=p_Mult_nn(p,h,nacRing);p_Normalize(p,nacRing);
     nacDelete(&h,nacRing);
   }
@@ -746 +739 @@
         napCleardenom(y);
         if (!nacIsOne(napGetCoeff(g)))
+        {
           y=p_Mult_nn(y,napGetCoeff(g),nacRing);
+          p_Normalize(y,nacRing);
+        }
         napDelete1(&g);
         return y;
@@ -1763 +1759 @@
   /* collect all denoms from y and multiply x and y by it */
     number n=napLcm(y);
-    x=p_Mult_nn(x,n,nacRing);
-    y=p_Mult_nn(y,n,nacRing);
+    x=p_Mult_nn(x,n,nacRing);p_Normalize(x,nacRing);
+    y=p_Mult_nn(y,n,nacRing);p_Normalize(y,nacRing);
     nacDelete(&n,nacRing);
     while(x!=NULL)
@@ -1813 +1809 @@
     number h1 = nacInvers(napGetCoeff(y));
     nacNormalize(h1);
-    x=p_Mult_nn(x,h1,nacRing);
+    x=p_Mult_nn(x,h1,nacRing);p_Normalize(x,nacRing);
     nacDelete(&h1,nacRing);
     napDelete1(&y);
@@ -1858 +1854 @@
     {
       number n=napLcm(y);
-      x=p_Mult_nn(x,n,nacRing);
-      y=p_Mult_nn(y,n,nacRing);
+      x=p_Mult_nn(x,n,nacRing);p_Normalize(x,nacRing);
+      y=p_Mult_nn(y,n,nacRing);p_Normalize(y,nacRing);
       nacDelete(&n,nacRing);
       while(x!=NULL)
@@ -2047 +2043 @@
         number aa=nacInvers(a);
         nacDelete(&a,nacRing);
-        x=p_Mult_nn(x,aa,nacRing);
+        x=p_Mult_nn(x,aa,nacRing);p_Normalize(x,nacRing);
         nacDelete(&aa,nacRing);
       }