Changeset 85e36d in git for Singular/mpsr_GetPoly.cc

Timestamp:

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

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

4d688465cef2d21563e211d3a815944e412b94db

Parents:

a4f307a99ef35df8d18781c23cf3f7ad97cb4d4b

Message:

*hannes: nap-stuff


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

File:

• Singular/mpsr_GetPoly.cc (modified) (6 diffs)

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