Changeset 6094f4 in git

Timestamp:

Oct 9, 2009, 2:21:25 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

aa742138e4cde2d55a4f1744cc4b0e6446fb67d4

Parents:

d8db707919fa01c928aa53fa8778bf431ce018ef

Message:

*hannes: removed napInit


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

File:

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

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.56 2009-10-08 17:02:33 Singular Exp $ */
+/* $Id: longalg.cc,v 1.57 2009-10-09 12:21:25 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -164 +164 @@
 #endif
 
-#define napInit(i)       (napoly)p_ISet(i,nacRing)
 #define napSetCoeff(p,n) {n_Delete(&pGetCoeff(p),nacRing);pGetCoeff(p)=n;}
 #define napDelete1(p)    p_LmDelete((poly *)p, nacRing)
@@ -326 +325 @@
   {
     q = p_Mult_q(q, qa,nacRing);
-    q = napAdd(q, napInit(1));
+    q = napAdd(q, p_ISet(1,nacRing));
     nacNormalize(pGetCoeff(r));
     t = nacInvers(pGetCoeff(r));
@@ -339 +338 @@
   }
   q = p_Mult_q(q, napCopy(qa),nacRing);
-  q = napAdd(q, napInit(1));
+  q = napAdd(q, p_ISet(1,nacRing));
   qa = napNeg(qa);
   loop
@@ -670 +669 @@
   number x, y;
   if (!naIsChar0)
-    return napInit(1);
+    return p_ISet(1,nacRing);
   x = nacCopy(pGetCoeff(a));
   if (nacIsOne(x))
@@ -709 +708 @@
     || ((pNext(b)==NULL)&&(nacIsZero(pGetCoeff(b)))))
     {
-      return napInit(1);
+      return p_ISet(1,nacRing);
     }
     return napCopy(b);
@@ -731 +730 @@
       y = a;
     }
-    if (!naIsChar0) g = napInit(1);
+    if (!naIsChar0) g = p_ISet(1,nacRing);
     else            g = napGcd0(x, y);
     if (pNext(y)==NULL)
@@ -767 +766 @@
   g=a;
   h=b;
-  if (!naIsChar0) x = napInit(1);
+  if (!naIsChar0) x = p_ISet(1,nacRing);
   else            x = napGcd0(g,h);
   for (i=(naNumbOfPar-1); i>=0; i--)
@@ -913 +912 @@
   lnumber l = (lnumber)omAllocBin(rnumber_bin);
   l->s = 2;
-  l->z = napInit(1);
+  l->z = p_ISet(1,nacRing);
   napSetExp(l->z,i,1);
   p_Setm(l->z,nacRing);
@@ -1339 +1338 @@
     lo->z = napCopy(b->n);
   else
-    lo->z = napInit(1);
+    lo->z = p_ISet(1,nacRing);
   x = b->z;
   if ((!napIsConstant(x)) || !nacIsOne(pGetCoeff(x)))
@@ -1598 +1597 @@
   p_Delete(&a->z,nacRing);
   p_Delete(&a->n,nacRing);
-  a->z = napInit(1);
+  a->z = p_ISet(1,nacRing);
   a->n = NULL;
   a->s = 2;
@@ -2003 +2002 @@
   //if (((naMinimalPoly==NULL) && (naI==NULL)) || !naIsChar0)
   //{
-  //  result->z = napInit(1);
+  //  result->z = p_ISet(1,nacRing);
   //  return (number)result;
   //}