Changeset 85e36d in git

Timestamp:

Dec 7, 2000, 5:25:19 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

4d688465cef2d21563e211d3a815944e412b94db

Parents:

a4f307a99ef35df8d18781c23cf3f7ad97cb4d4b

Message:

*hannes: nap-stuff


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

Location:

Singular

Files:

• longalg.h (modified) (3 diffs)
• mpsr_GetPoly.cc (modified) (6 diffs)
• mpsr_PutPoly.cc (modified) (7 diffs)

Singular/longalg.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.h,v 1.18 2000-12-07 15:21:07 Singular Exp $ */
+/* $Id: longalg.h,v 1.19 2000-12-07 16:25:18 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -40 +40 @@
 void naSetChar(int p, BOOLEAN complete, ring r);
 #define napAddExp(p,i,e)  ((p)->e[i-1]+=(e))
+#define napLength(p)      (pLength((poly)p))
 #ifdef LDEBUG
 void    naDBDelete (number *p,char *f, int l);
@@ -90 +91 @@
 #define napVariables naNumbOfPar
 #define napNext(p) (p->ne)
+#define napIter(p) ((p) = (p)->ne)
 #define napGetCoeff(p) (p->ko)
-#define napGetExp(p,i) (p->e[(i)-1])
+#define napGetExp(p,i) ((p)->e[(i)-1])
+#define napSetExp(p,i,ee) ((p)->e[(i)-1]=ee)
 #define napNew() ((alg)omAlloc0(napMonomSize))
 #define nanumber lnumber

Singular/mpsr_GetPoly.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_GetPoly.cc,v 1.30 2000-10-19 15:00:18 obachman Exp $ */
+/* $Id: mpsr_GetPoly.cc,v 1.31 2000-12-07 16:25:19 Singular Exp $ */
 
 /***************************************************************
@@ -252 +252 @@
     *x =  (number) omAlloc0Bin(rnumber_bin);
     y = (number) *x;
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
     y->debug = 123456;
 #endif
@@ -277 +277 @@
       *x =  (number) omAlloc0Bin(rnumber_bin);
       y = (number) *x;
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
       y->debug = 123456;
 #endif
@@ -301 +301 @@
  *
  ***************************************************************/
-static inline mpsr_Status_t GetAlgPoly(MP_Link_pt link, alg *p)
+static inline mpsr_Status_t GetAlgPoly(MP_Link_pt link, napoly *p)
 {
   MP_Uint32_t j, nm;
   int i;
-  alg a;
-#if SIZEOF_INT == SIZEOF_PARAMETER
-  Exponent_t *exp;
-#else
+  napoly a;
   int *exp;
-#endif
 
   IMP_GetUint32(link, &nm);
@@ -322 +318 @@
   *p = a;
 
-  failr(GetAlgNumberNumber(link, &(a->ko)));
-#if SIZEOF_INT == SIZEOF_PARAMETER
-  exp = &(a->e[0]);
-  mp_failr(IMP_GetSint32Vector(link, (MP_Sint32_t **) &exp, naNumbOfPar));
-#else
+  failr(GetAlgNumberNumber(link, &(napGetCoeff(a))));
   mp_failr(IMP_GetSint32Vector(link, (MP_Sint32_t **) &gTa, naNumbOfPar));
   for (i=0; i<naNumbOfPar; i++)
-    a->e[i] = (PARAMETER_TYPE) gTa[i];
-#endif
+    napSetExp(a,i+1,gTa[i]);
 
   for (j=1; j<nm; j++)
   {
-    a->ne = napNew();
-    a = a->ne;
-    failr(GetAlgNumberNumber(link, &(a->ko)));
-#if SIZEOF_INT == SIZEOF_PARAMETER
-    exp = &(a->e[0]);
-    mp_failr(IMP_GetSint32Vector(link, (MP_Sint32_t **) &exp, naNumbOfPar));
-#else
-  mp_failr(IMP_GetSint32Vector(link, (MP_Sint32_t **) &gTa, naNumbOfPar));
-  for (i=0; i<naNumbOfPar; i++)
-    a->e[i] = (PARAMETER_TYPE) gTa[i];
-#endif
-  }
-  a->ne = NULL;
+    napNext(a) = napNew();
+    napIter(a);
+    failr(GetAlgNumberNumber(link, &(napGetCoeff(a))));
+    mp_failr(IMP_GetSint32Vector(link, (MP_Sint32_t **) &gTa, naNumbOfPar));
+    for (i=0; i<naNumbOfPar; i++)
+      napSetExp(a,i+1,gTa[i]);
+  }
+  napNext(a) = NULL;
 
   return mpsr_Success;
@@ -1024 +1010 @@
   return mpsr_Success;
 }
-
 #endif

Singular/mpsr_PutPoly.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_PutPoly.cc,v 1.20 2000-09-18 09:19:22 obachman Exp $ */
+/* $Id: mpsr_PutPoly.cc,v 1.21 2000-12-07 16:25:19 Singular Exp $ */
 
 /***************************************************************
@@ -67 +67 @@
 static mpsr_Status_t PutFloatNumber(MP_Link_pt link, number a);
 static mpsr_Status_t PutRationalNumber(MP_Link_pt link, number a);
-static mpsr_Status_t PutAlgPoly(MP_Link_pt link, alg a);
+static mpsr_Status_t PutAlgPoly(MP_Link_pt link, napoly a);
 static mpsr_Status_t PutAlgNumber(MP_Link_pt link, number a);
 
@@ -177 +177 @@
  *
  ***************************************************************/
-inline MP_Uint32_t GetPlength(alg a)
-{
-  MP_Uint32_t i = 0;
-  while (a != NULL)
-  {
-    i++;
-    a = a->ne;
-  }
+inline MP_Uint32_t GetPlength(napoly a)
+{
+  MP_Uint32_t i = napLength(a);
   return i;
 }
@@ -201 +196 @@
     mp_failr(IMP_PutUint32(link, 1));
     mp_failr(IMP_PutUint32(link, GetPlength(b->z)));
-    return PutAlgPoly(link, (alg) (b->z));
+    return PutAlgPoly(link, b->z);
   }
   else
@@ -208 +203 @@
     mp_failr(IMP_PutUint32(link, 2));
     mp_failr(IMP_PutUint32(link, GetPlength(b->z)));
-    failr(PutAlgPoly(link, (alg) (b->z)));
+    failr(PutAlgPoly(link, b->z));
     mp_failr(IMP_PutUint32(link, GetPlength(b->n)));
-    return PutAlgPoly(link, (alg) (b->n));
+    return PutAlgPoly(link, b->n);
   }
 }
 
 // this is very similar to putting a Poly
-static mpsr_Status_t PutAlgPoly(MP_Link_pt link, alg a)
+static mpsr_Status_t PutAlgPoly(MP_Link_pt link, napoly a)
 {
   unsigned int i;
@@ -223 +218 @@
     while (a != NULL)
     {
-      failr(PutAlgAlgNumber(link, a->ko));
-#if (SIZEOF_INT == SIZEOF_PARAMETER)
-      mp_failr(IMP_PutSint32Vector(link, (MP_Sint32_t *) a->e, gNalgvars));
-#else
+      failr(PutAlgAlgNumber(link, napGetCoeff(a)));
       for (i=0; i<gNalgvars; i++)
-        gTa[i] = a->e[i];
+        gTa[i] = napGetExp(a,i+1);
       mp_failr(IMP_PutSint32Vector(link, gTa, gNalgvars));
-#endif
-      a = a->ne;
+      napIter(a);
     }
   else
@@ -237 +228 @@
     while (a != NULL)
     {
-      failr(PutAlgAlgNumber(link, a->ko));
-      IMP_PutSint32(link, (MP_Sint32_t) a->e[0]);
-      a = a->ne;
+      failr(PutAlgAlgNumber(link, napGetCoeff(a)));
+      IMP_PutSint32(link, (MP_Sint32_t) napGetExp(a,1));
+      napIter(a);
     }
   }