Changeset 47bc1c in git for Singular/structs.h

Timestamp:

Oct 23, 2000, 2:02:23 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

e6ad3ebfbb2c2611080bdaeb70701b50c2ef9444

Parents:

cebf9e609bfa59b57202a95a5f952cdf6c85e7fa

Message:

* almost get rid off p_SetGlobals
* pFDeg, pLDeg ring dependent


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

File:

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

Singular/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.39 2000-10-19 15:00:22 obachman Exp $ */
+/* $Id: structs.h,v 1.40 2000-10-23 12:02:20 obachman Exp $ */
 /*
 * ABSTRACT
@@ -153 +153 @@
 typedef struct _scmdnames cmdnames;
 
+/* the function pointer types */
+typedef number (*numberfunc)(number a,number b);
+
+extern ring      currRing;
+typedef int     (*pLDegProc)(poly p, int *length, ring r= currRing);
+typedef int     (*pFDegProc)(poly p, ring r = currRing);
+
 typedef enum
 {
@@ -248 +255 @@
 
   // is NULL for lp or N == 1, otherwise non-NULL (with OrdSize > 0 entries) */
-  sro_ord *  typ;   /* array of orderings + sizes, OrdSize entries */
+  sro_ord*   typ;   /* array of orderings + sizes, OrdSize entries */
 
   ideal      qideal; /* extension to the ring structure: qring */
@@ -254 +261 @@
 
   int      *VarOffset;
-  /* mapping exp. of var(i) -> p->exp */
-  /* mapping exp. of var(i) ->
-  p->exp[(VarOffset[i] & 0xffffff)] >> (VarOffset[i] >> 24) & bitmask */
+  int*     firstwv;
 
   struct omBin_s*   PolyBin; /* Bin from where monoms are allocated */
@@ -267 +272 @@
   short      OrdSgn; /* 1 for polynomial rings, -1 otherwise */
 
+  short     firstBlockEnds;
+  
+
   BOOLEAN   VectorOut;
   BOOLEAN   ShortOut;
   BOOLEAN   CanShortOut;
+  BOOLEAN   LexOrder;
+  // TRUE if the monomial ordering has polynomial and power series blocks 
+  BOOLEAN   MixedOrder;
+  // 1 for lex ordering (except ls), -1 otherwise
+  BOOLEAN   ComponentOrder;
+  
   
   // what follows below here should be set by rComplete, _only_
@@ -298 +312 @@
      if <  0, long vars in exp vector are not consecutive */
   short     VarL_LowIndex;
+  
+  /* if this is > 0, then NegWeightL_Offset[0..size_1] is index of longs in
+   ExpVector whose values need an offset due to negative weights */
+  short     NegWeightL_Size;
+  /* array of NegWeigtL_Size indicies */
+  int*      NegWeightL_Offset;
+  
   /* array of size VarL_Size, 
      VarL_Offset[i] gets i-th long var in exp vector */
@@ -307 +328 @@
   unsigned long divmask;
 
-  p_Procs_s* p_Procs;
+  p_Procs_s*    p_Procs;
+  pFDegProc     pFDeg;
+  pLDegProc     pLDeg;
 };
 
@@ -329 +352 @@
 #endif /* __cplusplus */
 
-/* the function pointer types */
-typedef number (*numberfunc)(number a,number b);
-
-typedef void    (*pSetmProc)(poly p);
-typedef int     (*pLDegProc)(poly p, int *length);
-typedef int     (*pFDegProc)(poly p);
-typedef int     (*pCompProc)(poly p1, poly p2);
-
-extern ring      currRing;
+
 
 /*
@@ -344 +359 @@
 
 /* 7.1 C-routines : */
+
 
 #ifdef __cplusplus