Changeset 3fe3da0 in git

Timestamp:

Jun 8, 2010, 11:12:47 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

01e7a1d2a92546f79319f8b6368955396525c869

Parents:

e094491d6d4e235085c9dd1be97168a376bb8120

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-06-08 11:12:47+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:02+01:00

Message:

fixed coeff macros

Files:

• coeffs/coeffs.h (modified) (1 diff)
• polys/polys-impl.h (modified) (3 diffs)

coeffs/coeffs.h

@@ -217 +217 @@
 // (should only be used in the context of currRing, i.e. in the interpreter)
 void           nNew(number * a);
-#define nCopy(n)          (currRing->cf)->cfCopy(n,currRing->cf)
-#define nDelete(n)        (currRing->cf)->cfDelete(n,currRing->cf)
-#define nMult(n1, n2)     (currRing->cf)->nMult(n1, n2,currRing->cf)
-#define nAdd(n1, n2)      (currRing->cf)->nAdd(n1, n2,currRing->cf)
-#define nIsZero(n)        (currRing->cf)->nIsZero(n,currRing->cf)
-#define nEqual(n1, n2)    (currRing->cf)->nEqual(n1, n2,currRing->cf)
-#define nNeg(n)           (currRing->cf)->nNeg(n,currRing->cf)
-#define nSub(n1, n2)      (currRing->cf)->nSub(n1, n2,currRing->cf)
+#define nCopy(n)          n_Copy(n, currRing->cf)
+#define nDelete(n)        n_Delete(n, currRing->cf)
+#define nMult(n1, n2)     n_Mult(n1, n2, currRing->cf)
+#define nAdd(n1, n2)      n_Add(n1, n2, currRing->cf)
+#define nIsZero(n)        n_IsZero(m, currRing->cf)
+#define nEqual(n1, n2)    n_Equal(n1, n2, currRing->cf)
+#define nNeg(n)           n_Neg(n, currRing->cf)
+#define nSub(n1, n2)      n_Sub(n1, n2, currRing->cf)
 #define nGetChar()        nInternalChar(currRing->cf)
-#define nInit(i)          (currRing->cf)->cfInit(i,currRing->cf)
-#define nIsOne(n)         (currRing->cf)->nIsOne(n,currRing->cf)
-#define nIsMOne(n)        (currRing->cf)->nIsMOne(n,currRing->cf)
-#define nGreaterZero(n)   (currRing->cf)->nGreaterZero(n,currRing->cf)
-#define nWrite(n)         (currRing->cf)->cfWrite(n,currRing->cf)
-#define nNormalize(n)     (currRing->cf)->nNormalize(n,currRing->cf)
-#define nGcd(a, b)        (currRing->cf)->nGcd(a,b,currRing->cf)
-#define nIntDiv(a, b)     (currRing->cf)->nIntDiv(a,b,currRing->cf)
-#define nDiv(a, b)        (currRing->cf)->nDiv(a,b,currRing->cf)
-#define nInvers(a)        (currRing->cf)->nInvers(a,currRing->cf)
-#define nExactDiv(a, b)   (currRing->cf)->nExactDiv(a,b,currRing->cf)
-#define nTest(a)          (currRing->cf)->nDBTest(a,currRing->cf,__FILE__,__LINE__)
-
-#define nInpMult(a, b)    (currRing->cf)->nInpMult(a,b,currRing->cf)
-#define nPower(a, b, res) (currRing->cf)->nPower(a,b,res,currRing->cf)
-#define nSize(n)          (currRing->cf)->nSize(n,currRing->cf)
-#define nGetDenom(N)      (currRing->cf)->cfGetDenom((N),currRing->cf)
-#define nGetNumerator(N)  (currRing->cf)->cfGetNumerator((N),currRing->cf)
-
-#define nSetMap(R) (currRing->cf->cfSetMap(R,currRing))
-
-#endif
-
+#define nInit(i)          n_Init(i, currRing->cf)
+#define nIsOne(n)         n_IsOne(n, currRing->cf)
+#define nIsMOne(n)        n_IsMOne(n, currRing->cf)
+#define nGreaterZero(n)   n_GreaterZero(n, currRing->cf)
+#define nWrite(n)         n_Write(n,currRing->cf)
+#define nNormalize(n)     n_Normalize(n,currRing->cf)
+#define nGcd(a, b)        n_Gcd(a,b,currRing->cf)
+#define nIntDiv(a, b)     n_IntDiv(a,b,currRing->cf)
+#define nDiv(a, b)        n_Div(a,b,currRing->cf)
+#define nInvers(a)        n_Invers(a,currRing->cf)
+#define nExactDiv(a, b)   n_ExactDiv(a,b,currRing->cf)
+#define nTest(a)          n_Test(a,currRing->cf)
+
+#define nInpMult(a, b)    n_InpMult(a,b,currRing->cf)
+#define nPower(a, b, res) n_Power(a,b,res,currRing->cf)
+#define nSize(n)          n_Size(n,currRing->cf)
+#define nGetDenom(N)      n_GetDenom((N),currRing->cf)
+#define nGetNumerator(N)  n_GetNumerator((N),currRing->cf)
+
+#define nSetMap(R)        n_SetMap(R,currRing->cf)
+
+#endif
+

polys/polys-impl.h

@@ -16 +16 @@
  *
  ***************************************************************/
-#include <kernel/structs.h>
-#include <omalloc/omalloc.h>
+#include <omalloc.h>
 
 /***************************************************************
@@ -24 +23 @@
  *
  ***************************************************************/
-
-#ifndef NDEBUG
-#define VARS (10)   /*max. number of variables as constant*/
-#else
-#ifdef __GNUC__
-#define VARS (0)
-#else
-#define VARS (1)
-#endif
-#endif
 
 struct  spolyrec
@@ -39 +28 @@
   poly      next;           // next needs to be the first field
   number    coef;           // and coef the second --- do not change this !!!
-  unsigned long exp[VARS];  // make sure that exp is aligned
+  unsigned long exp[1];     // make sure that exp is aligned
 };
 #define POLYSIZE (sizeof(poly) + sizeof(number))