Changeset aaeb98 in git

Timestamp:

Oct 8, 2009, 10:38:31 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

967a9d48cc1d702f106bf47d327d87adbaf6833c

Parents:

bedecea1bbe3e8a1d0e5a820d4d446733ede75b9

Message:

*hannes: code simplification


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

File:

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

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.54 2009-10-08 08:30:14 Singular Exp $ */
+/* $Id: longalg.cc,v 1.55 2009-10-08 08:38:31 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -31 +31 @@
 napoly naMinimalPoly;
 #define naParNames (currRing->parameter)
-#define napNormalize(p) p_Normalize(p,nacRing)
 static int naIsChar0;
 static ring naMapRing;
@@ -219 +218 @@
   qq = (napoly)p_Init(nacRing);
   pNext(qq) = NULL;
-  napNormalize(g);
-  napNormalize(f);
+  p_Normalize(g, nacRing);
+  p_Normalize(f, nacRing);
   a = f;
   do
@@ -231 +230 @@
     h = napCopy(g);
     napMultT(h, qq);
-    napNormalize(h);
+    p_Normalize(h,nacRing);
     nacDelete(&pGetCoeff(qq),nacRing);
     a = napAdd(a, h);
@@ -249 +248 @@
   qq = (napoly)p_Init(nacRing);
   pNext(qq) = b = NULL;
-  napNormalize(g);
-  napNormalize(f);
+  p_Normalize(g,nacRing);
+  p_Normalize(f,nacRing);
   a = f;
   do
@@ -262 +261 @@
     h = napCopy(g);
     napMultT(h, qq);
-    napNormalize(h);
+    p_Normalize(h,nacRing);
     nacDelete(&pGetCoeff(qq),nacRing);
     a = napAdd(a, h);
@@ -312 +311 @@
     napMultN(qa, t);
     nacDelete(&t,nacRing);
-    napNormalize(qa);
+    p_Normalize(qa,nacRing);
     p_Delete(&x,nacRing);
     p_Delete(&r,nacRing);
@@ -331 +330 @@
     t = nacInvers(pGetCoeff(r));
     napMultN(q, t);
-    napNormalize(q);
+    p_Normalize(q,nacRing);
     nacDelete(&t,nacRing);
     p_Delete(&x,nacRing);
@@ -360 +359 @@
       //nacNormalize(t);
       napMultN(q, t);
-      napNormalize(q);
+      p_Normalize(q,nacRing);
       nacDelete(&t,nacRing);
       p_Delete(&x,nacRing);
@@ -1662 +1661 @@
   {
     if (pNext(x->z)!=NULL)
-      result->z = napCopy(x->z);
+      result->z = p_Copy(x->z, r->algring);
     else
       result->z = napGcd0(x->z, y->z);
@@ -1677 +1676 @@
     napoly rz=napGcd(x->z, y->z);
     CanonicalForm F, G, R;
-    R=convSingPFactoryP(rz,nacRing); 
-    napNormalize(x->z);
-    F=convSingPFactoryP(x->z,nacRing)/R; 
-    napNormalize(y->z);
-    G=convSingPFactoryP(y->z,nacRing)/R; 
+    R=convSingPFactoryP(rz,r->algring); 
+    p_Normalize(x->z,nacRing);
+    F=convSingPFactoryP(x->z,r->algring)/R; 
+    p_Normalize(y->z,nacRing);
+    G=convSingPFactoryP(y->z,r->algring)/R; 
     F = gcd( F, G );
     if (F.isOne()) 
@@ -1687 +1686 @@
     else
     {
-      p_Delete(&rz,nacRing);
-      result->z=convFactoryPSingP( F*R,nacRing );
-      napNormalize(result->z);
+      p_Delete(&rz,r->algring);
+      result->z=convFactoryPSingP( F*R,r->algring );
+      p_Normalize(result->z,nacRing);
     }
   }
@@ -1979 +1978 @@
   naTest(la);
   naTest(lb);
-  napoly x = napCopy(a->z);
+  napoly x = p_Copy(a->z, r->algring);
   number t = napLcm(b->z); // get all denom of b->z
   if (!nacIsOne(t))
   {
-    number bt, r;
+    number bt, rr;
     napoly xx=x;
     while (xx!=NULL)
     {
-      bt = nacGcd(t, pGetCoeff(xx), nacRing);
-      r = nacMult(t, pGetCoeff(xx));
-      nacDelete(&pGetCoeff(xx),nacRing);
-      pGetCoeff(xx) = nacDiv(r, bt);
+      bt = nacGcd(t, pGetCoeff(xx), r->algring);
+      rr = nacMult(t, pGetCoeff(xx));
+      nacDelete(&pGetCoeff(xx),r->algring);
+      pGetCoeff(xx) = nacDiv(rr, bt);
       nacNormalize(pGetCoeff(xx));
-      nacDelete(&bt,nacRing);
-      nacDelete(&r,nacRing);
+      nacDelete(&bt,r->algring);
+      nacDelete(&rr,r->algring);
       pIter(xx);
     }
   }
-  nacDelete(&t,nacRing);
+  nacDelete(&t,r->algring);
   result->z = x;
 #ifdef HAVE_FACTORY
@@ -2003 +2002 @@
   {
     result->z=singclap_alglcm(result->z,b->n);
-    p_Delete(&x,nacRing);
+    p_Delete(&x,r->algring);
   }
 #endif