===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/datatype.h,v
retrieving revision 1.7
retrieving revision 1.13
diff -u -p -r1.7 -r1.13
--- OpenXM/src/kan96xx/Kan/datatype.h	2003/07/17 07:33:03	1.7
+++ OpenXM/src/kan96xx/Kan/datatype.h	2010/01/27 15:10:08	1.13
@@ -1,10 +1,11 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/datatype.h,v 1.6 2003/07/10 08:20:04 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/datatype.h,v 1.12 2006/12/21 05:29:49 takayama Exp $ */
 #include "gmp.h"
 
 /* GC */
 void *GC_malloc(size_t size);
 void *GC_realloc(void *p,size_t new);
 void *sGC_malloc(size_t size);
+void *sGC_realloc(void *p,size_t new);
 void *sGC_realloc2(void *p,size_t old,size_t new);
 void sGC_free2(void *p,size_t size);
 void sGC_free(void *p);
@@ -64,6 +65,7 @@ struct ring {
   int cc;
   char **x;
   char **D;
+  char **Dsmall;
   int *order;   /* [i][j] ---> [i*2*N+j] */
   int orderMatrixSize;
   int *from;
@@ -78,6 +80,11 @@ struct ring {
   int degreeShiftSize;
   int degreeShiftN;
   int *degreeShift;
+  int partialEcart;
+  int *partialEcartGlobalVarX;
+
+/* To be used. */
+  void *ringInInputForm;
 };
 
 
@@ -163,6 +170,8 @@ struct polySet {
   int size;           /* size of this set. i.e., g[0], g[1], ..., g[size-1] */
   int lim;
   POLY *gh;           /* gh[i] = homogenize(g[i]) for ecart division */
+  int *gen;           /* gen[i] == 1 --> given generators */
+  POLY *gmod;         /* gmod = g mod p for TraceLift. */
 };
 
 struct pair {
@@ -180,6 +189,8 @@ struct gradedPolySet {
   struct polySet **polys;  /* polys[0]: grade=0, polys[1]:grade=1, ... */
   int maxGrade;            /* maximal grade in this set */
   int lim;
+  int gb;  /* it is gb or not. */
+  int reduced; /* it is reduced gb or not. */
 };
 
 struct gradedPairs {