Changeset a6a239 in git for Singular/structs.h

Timestamp:

Sep 12, 2000, 6:01:23 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

fe7bd4983d0c4322efb17bf36dbf3b28109b9608

Parents:

47e83c37a0601dd5b7dadba83e9c5b04d7efeaf1

Message:

* new implementation of polys


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

File:

• Singular/structs.h (modified) (4 diffs)

Singular/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.35 2000-08-24 14:42:46 obachman Exp $ */
+/* $Id: structs.h,v 1.36 2000-09-12 16:01:17 obachman Exp $ */
 /*
 * ABSTRACT
@@ -22 +22 @@
    but configure dislikes it */
 
-#ifdef HAVE_SHIFTED_EXPONENTS
-/* Define the type of the exponents to be used in monomials */
-#undef EXPONENT_TYPE
-#define EXPONENT_TYPE long
-/* Define the size of exponent */
-#undef SIZEOF_EXPONENT
-#define SIZEOF_EXPONENT SIZEOF_LONG
-#endif
-
-typedef EXPONENT_TYPE Exponent_t;
+
+typedef long Exponent_t;
+typedef unsigned long Order_t;
 
 enum tHomog
@@ -259 +252 @@
   ideal      qideal; /* extension to the ring structure: qring */
 
-#ifdef HAVE_SHIFTED_EXPONENTS
   unsigned long bitmask;
-#endif
 
   int      *VarOffset;
-  /* mapping exp. of var(i) -> p->exp.l */
+  /* mapping exp. of var(i) -> p->exp */
 #ifdef HAVE_SHIFTED_EXPONENTS
   /* mapping exp. of var(i) ->
-  p->exp.l[(VarOffset[i] & 0xffffff)] >> (VarOffset[i] >> 24) & bitmask */
+  p->exp[(VarOffset[i] & 0xffffff)] >> (VarOffset[i] >> 24) & bitmask */
 #else
   /* mapping exp. of var(i) -> p->exp.e[VarOffset[i]] */
@@ -286 +277 @@
   // contains component, but no weight fields in E */
   // better: pVarLowIndexE / pVarLowIndexL
-  #ifdef LONG_MONOMS
-  short      pDivLow;
-  short      pDivHigh; /* the same as pVarLow..pVarHigh, */
-                       /* but as index in the 'long' field */
-  #endif
-  #ifndef HAVE_SHIFTED_EXPONENTS
-  short      pCompLowIndex; // better: use pCompareLowIndexL
-  #endif
-  short      pCompHighIndex; /* use p->exp.l[pCompLowIndex..ppCompHighIndex] */
+  short      pCompHighIndex; /* use p->exp[pCompLowIndex..ppCompHighIndex] */
                              /* for comparing monomials */
   short      pCompLSize; // pCompHighIndex - pCompLowIndex + 1
 
   short      pCompIndex; /* p->exp.e[pCompIndex] is the component */
-  short      pOrdIndex; /* p->exp.l[pOrdIndex] is pGetOrd(p) */
+  short      pOrdIndex; /* p->exp[pOrdIndex] is pGetOrd(p) */
 
   short      ExpESize; /* size of exponent vector in Exponent_t */