Changeset 8391d8 in git for kernel/longalg.cc

Timestamp:

Sep 24, 2009, 6:37:42 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

785e89b7306ebdeea35396a79b96dada09124098

Parents:

493699ee1754bff0d1b7c8f580f0b29c26002e60

Message:

*hannes: n_Init is now ring indep.


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

File:

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

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.51 2009-09-16 12:26:26 Singular Exp $ */
+/* $Id: longalg.cc,v 1.52 2009-09-24 16:37:41 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -33 +33 @@
 #define napNormalize(p) p_Normalize(p,nacRing)
 static int naIsChar0;
-static int naPrimeM;
+static ring naMapRing;
 
 #ifdef LDEBUG
@@ -49 +49 @@
 static number   (*nacLcm)(number a, number b, const ring r);
 static void     (*nacDelete)(number *a, const ring r);
-       number   (*nacInit)(int i);
+static number   (*nacInit)(int i, const ring r);
 static int      (*nacInt)(number &n, const ring r);
        void     (*nacNormalize)(number &a);
@@ -69 +69 @@
 #define napCopy(p)       (napoly)p_Copy((poly)p,nacRing)
 
-static number nadGcd( number a, number b, const ring r) { return nacInit(1); }
+static number nadGcd( number a, number b, const ring r) { return nacInit(1,r); }
 /*2
 *  sets the appropriate operators
@@ -123 +123 @@
 #endif
   nacRing        = r->algring;
-  nacInit        = nacRing->cf->nInit;
+  nacInit        = nacRing->cf->cfInit;
   nacInt         = nacRing->cf->n_Int;
   nacCopy        = nacRing->cf->nCopy;
@@ -524 +524 @@
   }
   else
-    pGetCoeff(a) = nacInit(1);
+    pGetCoeff(a) = nacInit(1,nacRing);
   i = 0;
   const char  *olds=s;
@@ -643 +643 @@
     return;
   p = ph;
-  h = nacInit(1);
+  h = nacInit(1,nacRing);
   while (p!=NULL)
   {
@@ -781 +781 @@
 number napLcm(napoly a)
 {
-  number h = nacInit(1);
+  number h = nacInit(1,nacRing);
 
   if (naIsChar0)
@@ -890 +890 @@
 *  z:= i
 */
-number naInit(int i)
+number naInit(int i, const ring r)
 {
   if (i!=0)
   {
-    napoly z=napInit(i);
-    if (z!=NULL)
-    {
+    number c=n_Init(i,r->algring);
+    if (!n_IsZero(c,r->algring))
+    {
+      poly z=p_Init(r->algring);
+      pSetCoeff0(z,c);
       lnumber l = (lnumber)omAllocBin(rnumber_bin);
       l->z = z;
@@ -1636 +1638 @@
 {
   number x;
-  *rc = naInit(1);
+  *rc = naInit(1,nacRing);
   for (; i > 0; i--)
   {
@@ -2065 +2067 @@
   l->z=(napoly)p_Init(nacRing);
   int i=(int)((long)c);
-  if (i>(naPrimeM>>2)) i-=naPrimeM;
-  pGetCoeff(l->z)=nlInit(i);
+  if (i>((long)naMapRing->ch>>2)) i-=(long)naMapRing->ch;
+  pGetCoeff(l->z)=nlInit(i, nacRing);
   l->n=NULL;
   return (number)l;
@@ -2106 +2108 @@
   if (npIsZero(c)) return NULL;
   int i=(int)((long)c);
-  if (i>naPrimeM) i-=naPrimeM;
-  number n=npInit(i);
+  if (i>(long)naMapRing->ch) i-=(long)naMapRing->ch;
+  number n=npInit(i,naMapRing);
   if (npIsZero(n)) return NULL;
   lnumber l=(lnumber)omAllocBin(rnumber_bin);
@@ -2123 +2125 @@
 {
   if (nlIsZero(c)) return NULL;
-  number n=npInit(nlModP(c,npPrimeM));
+  number n=npInit(nlModP(c,npPrimeM),nacRing);
   if (npIsZero(n)) return NULL;
   npTest(n);
@@ -2136 +2138 @@
 static number (*nacMap)(number);
 static int naParsToCopy;
-static ring napMapRing;
 static napoly napMap(napoly p)
 {
@@ -2145 +2146 @@
   int i;
   for(i=1;i<=naParsToCopy;i++)
-    napSetExp(a,i,napGetExpFrom(p,i,napMapRing));
+    napSetExp(a,i,napGetExpFrom(p,i,naMapRing));
   p_Setm(a,nacRing);
   pGetCoeff(w) = nacMap(pGetCoeff(p));
@@ -2155 +2156 @@
     pIter(a);
     for(i=1;i<=naParsToCopy;i++)
-      napSetExp(a,i,napGetExpFrom(p,i,napMapRing));
+      napSetExp(a,i,napGetExpFrom(p,i,naMapRing));
     p_Setm(a,nacRing);
     pGetCoeff(a) = nacMap(pGetCoeff(p));
@@ -2245 +2246 @@
 nMapFunc naSetMap(ring src, ring dst)
 {
+  naMapRing=src;
   if (rField_is_Q_a(dst)) /* -> Q(a) */
   {
@@ -2253 +2255 @@
     if (rField_is_Zp(src))
     {
-      naPrimeM = rChar(src);
       return naMapP0;  /* Z/p -> Q(a)*/
     }
@@ -2267 +2268 @@
         naParsToCopy++;
       }
-      napMapRing=src;
       nacMap=nacCopy;
       if ((naParsToCopy==rPar(dst))&&(naParsToCopy==rPar(src)))
@@ -2283 +2283 @@
     if (rField_is_Zp(src))
     {
-      int c=rChar(src);
-      if (c==npPrimeM)
+      if (src->ch==dst->ch)
       {
         return naMapPP;  /* Z/p -> Z/p(a)*/
@@ -2290 +2289 @@
       else
       {
-        naPrimeM = c;
         return naMapPP1;  /* Z/p' -> Z/p(a)*/
       }
@@ -2302 +2300 @@
       else
       {
-        npMapPrime=rChar(src);
         nacMap = npMapP;
       }
@@ -2314 +2311 @@
         naParsToCopy++;
       }
-      napMapRing=src;
       if ((naParsToCopy==rPar(dst))&&(naParsToCopy==rPar(src))
       && (nacMap==nacCopy))
@@ -2430 +2426 @@
     return (number)rr;
   }
-  return r->cf->nInit(1);
+  return n_Init(1,r);
 }