Changeset 493225 in git for kernel/longalg.cc

Timestamp:

Dec 8, 2009, 7:11:06 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

32c11ff616c40bb7c3d5c756479b0507e505f330

Parents:

42660f97810c6af10af57af395d99b9a04bb8dad

Message:

nWrite indep. from currRing

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

File:

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

kernel/longalg.cc

@@ -54 +54 @@
        void     (*nacNormalize)(number &a);
 static number   (*nacNeg)(number a);
-static void     (*nacWrite)(number &a);
+#define nacWrite(A) n_Write(A,nacRing)
        number   (*nacCopy)(number a);
 static number   (*nacInvers)(number a);
@@ -135 +135 @@
   nacIsZero      = nacRing->cf->nIsZero;
   nacRead        = nacRing->cf->nRead;
-  nacWrite       = nacRing->cf->nWrite;
   nacGreaterZero = nacRing->cf->nGreaterZero;
   nacIsOne       = nacRing->cf->nIsOne;
@@ -413 +412 @@
 *writes a polynomial number
 */
-void napWrite(napoly p,const BOOLEAN has_denom)
-{
+void napWrite(napoly p,const BOOLEAN has_denom, const ring r)
+{
+  ring nacring=r->algring;
   if (p==NULL)
     StringAppendS("0");
-  else if (p_LmIsConstant(p,nacRing))
+  else if (p_LmIsConstant(p,nacring))
   {
     BOOLEAN kl=FALSE;
     if (has_denom)
     {
-      number den=nacRing->cf->cfGetDenom(pGetCoeff(p), nacRing);
-      kl=!n_IsOne(den,nacRing);
-      n_Delete(&den, nacRing);
+      number den=nacring->cf->cfGetDenom(pGetCoeff(p),nacring );
+      kl=!n_IsOne(den,nacring);
+      n_Delete(&den, nacring);
     }
     if (kl) StringAppendS("(");
     //StringAppendS("-1");
-    nacWrite(pGetCoeff(p));
+    n_Write(pGetCoeff(p),nacring);
     if (kl) StringAppendS(")");
   }
@@ -437 +437 @@
     {
       BOOLEAN wroteCoeff=FALSE;
-      if ((p_LmIsConstant(p,nacRing))
-      || ((!nacIsOne(pGetCoeff(p)))
-        && (!nacIsMOne(pGetCoeff(p)))))
+      if ((p_LmIsConstant(p,nacring))
+      || ((!n_IsOne(pGetCoeff(p),nacring))
+        && (!n_IsMOne(pGetCoeff(p),nacring))))
       {
-        nacWrite(pGetCoeff(p));
-        wroteCoeff=(currRing->ShortOut==0);
+        n_Write(pGetCoeff(p),nacring);
+        wroteCoeff=(r->ShortOut==0);
       }
-      else if (nacIsMOne(pGetCoeff(p)))
+      else if (n_IsMOne(pGetCoeff(p),nacring))
       {
         StringAppendS("-");
       }
       int  i;
-      for (i = 0; i < naNumbOfPar; i++)
+      for (i = 0; i < r->P; i++)
       {
-        int e=p_GetExp(p,i+1,nacRing);
+        int e=p_GetExp(p,i+1,nacring);
         if (e > 0)
         {
@@ -457 +457 @@
             StringAppendS("*");
           else
-            wroteCoeff=(currRing->ShortOut==0);
-          StringAppendS(naParNames[i]);
+            wroteCoeff=(r->ShortOut==0);
+          StringAppendS(r->parameter[i]);
           if (e > 1)
           {
-            if (currRing->ShortOut == 0)
+            if (r->ShortOut == 0)
               StringAppendS("^");
             StringAppend("%d", e);
@@ -470 +470 @@
       if (p==NULL)
         break;
-      if (nacGreaterZero(pGetCoeff(p)))
+      if (n_GreaterZero(pGetCoeff(p),nacring))
         StringAppendS("+");
     }
@@ -1510 +1510 @@
 *  writes a number
 */
-void naWrite(number &phn)
+void naWrite(number &phn, const ring r)
 {
   lnumber ph = (lnumber)phn;
@@ -1519 +1519 @@
     phn->s = 0;
     BOOLEAN has_denom=(ph->n!=NULL);
-    napWrite(ph->z,has_denom/*(ph->n!=NULL)*/);
+    napWrite(ph->z,has_denom/*(ph->n!=NULL)*/,r);
     if (has_denom/*(ph->n!=NULL)*/)
     {
       StringAppendS("/");
-      napWrite(ph->n,TRUE);
+      napWrite(ph->n,TRUE,r);
     }
   }