[BACK]Return to ca.h CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / include

Diff for /OpenXM_contrib2/asir2000/include/ca.h between version 1.33 and 1.42

version 1.33, 2002/01/28 00:54:43 version 1.42, 2004/02/03 23:31:58
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.32 2001/12/25 02:39:03 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.41 2003/12/23 10:39:57 ohara Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
   #include <stdlib.h>
   
 #if defined(hpux)  #if defined(hpux)
 #include <netinet/in.h>  #include <netinet/in.h>
 # define setbuffer(FP,buf,siz) setvbuf(FP,buf,_IOFBF,siz)  # define setbuffer(FP,buf,siz) setvbuf(FP,buf,_IOFBF,siz)
 #endif  #endif
   
 #if defined(VISUAL)  #if !defined(VISUAL)
 #include <stdlib.h>  #include <unistd.h>
 #endif  #endif
   
 #if !defined(VISUAL)  #if !defined(VISUAL)
Line 81  typedef caddr_t pointer;
Line 82  typedef caddr_t pointer;
   
 typedef void * pointer;  typedef void * pointer;
   
 #if defined(VISUAL)  #if defined(sun)
   #include <strings.h>
   #else
 #include <string.h>  #include <string.h>
   #if defined(VISUAL)
 #define index(s,c) strchr(s,c)  #define index(s,c) strchr(s,c)
 #define bzero(s,len) memset(s,0,len)  #define bzero(s,len) memset(s,0,len)
 #define bcopy(x,y,len) memcpy(y,x,len)  #define bcopy(x,y,len) memcpy(y,x,len)
 #endif  #endif
   #endif
   
 #define COPY(a,b) ((b)=(a))  #define COPY(a,b) ((b)=(a))
 #define FREEN(p)  #define FREEN(p)
Line 113  typedef void * pointer;
Line 118  typedef void * pointer;
 #define O_GFMMAT 15  #define O_GFMMAT 15
 #define O_BYTEARRAY 16  #define O_BYTEARRAY 16
 #define O_QUOTE 17  #define O_QUOTE 17
   #define O_OPTLIST 18
 #define O_VOID -1  #define O_VOID -1
   
 #define N_Q 0  #define N_Q 0
Line 131  typedef void * pointer;
Line 137  typedef void * pointer;
 #define ORD_GRADLEX 1  #define ORD_GRADLEX 1
 #define ORD_LEX 2  #define ORD_LEX 2
   
 #if LONG_IS_32BIT  #if defined(LONG_IS_32BIT)
 #if defined(VISUAL)  #if defined(VISUAL)
 typedef _int64 L;  typedef _int64 L;
 typedef unsigned _int64 UL;  typedef unsigned _int64 UL;
Line 349  typedef struct oQUOTE {
Line 355  typedef struct oQUOTE {
         pointer body;          pointer body;
 } *QUOTE;  } *QUOTE;
   
   typedef struct oOPTLIST {
           short id;
           short pad;
           struct oNODE *body;
   } *OPTLIST;
   
 typedef struct oObj {  typedef struct oObj {
         short id;          short id;
         short pad;          short pad;
Line 414  typedef struct oDLBUCKET {
Line 426  typedef struct oDLBUCKET {
         struct oDLBUCKET *next;          struct oDLBUCKET *next;
 } *DLBUCKET;  } *DLBUCKET;
   
   typedef struct oGeoBucket {
           int m;
           struct oNODE *body[32];
   } *GeoBucket;
   
 typedef struct oVL {  typedef struct oVL {
         V v;          V v;
         struct oVL *next;          struct oVL *next;
Line 474  struct order_pair {
Line 491  struct order_pair {
         int order, length;          int order, length;
 };  };
   
   struct sparse_weight {
           int pos, value;
   };
   
   #define IS_DENSE_WEIGHT 0
   #define IS_SPARSE_WEIGHT 1
   #define IS_BLOCK 2
   
   struct weight_or_block {
           int type;
           int length;
           union {
                   int *dense_weight;
                   struct sparse_weight *sparse_weight;
                   struct {
                           int order, start;
                   } block;
           } body;
   };
   
 struct order_spec {  struct order_spec {
         int id;          int id;
         Obj obj;          Obj obj;
Line 488  struct order_spec {
Line 525  struct order_spec {
                         int row;                          int row;
                         int **matrix;                          int **matrix;
                 } matrix;                  } matrix;
                   struct {
                           int length;
                           struct weight_or_block *w_or_b;
                   } composite;
         } ord;          } ord;
 };  };
   
Line 512  struct oEGT {
Line 553  struct oEGT {
   
 #define INDEX 100  #define INDEX 100
   
 #if USE_FLOAT  #if defined(USE_FLOAT)
 typedef float ModNum;  typedef float ModNum;
 #define NPrimes 536  #define NPrimes 536
 #else  #else
Line 573  typedef unsigned int ModNum;
Line 614  typedef unsigned int ModNum;
 #endif  #endif
   
 /* for setjmp/longjmp compatibility */  /* for setjmp/longjmp compatibility */
 #if defined(__CYGWIN__)  #if defined(__CYGWIN__) || defined(__x86_64)
 #define JMP_BUF sigjmp_buf  #define JMP_BUF sigjmp_buf
 #define SETJMP(x) sigsetjmp(x,~0)  #define SETJMP(x) sigsetjmp(x,~0)
 #define LONGJMP(x,y) siglongjmp(x,y)  #define LONGJMP(x,y) siglongjmp(x,y)
Line 651  bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
Line 692  bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWMATHCAP(e) ((e)=(MATHCAP)MALLOC(sizeof(struct oMATHCAP)),OID(e)=O_MATHCAP)  #define NEWMATHCAP(e) ((e)=(MATHCAP)MALLOC(sizeof(struct oMATHCAP)),OID(e)=O_MATHCAP)
 #define NEWBYTEARRAY(e) ((e)=(BYTEARRAY)MALLOC(sizeof(struct oBYTEARRAY)),OID(e)=O_BYTEARRAY)  #define NEWBYTEARRAY(e) ((e)=(BYTEARRAY)MALLOC(sizeof(struct oBYTEARRAY)),OID(e)=O_BYTEARRAY)
 #define NEWQUOTE(e) ((e)=(QUOTE)MALLOC(sizeof(struct oQUOTE)),OID(e)=O_QUOTE)  #define NEWQUOTE(e) ((e)=(QUOTE)MALLOC(sizeof(struct oQUOTE)),OID(e)=O_QUOTE)
   #define NEWOPTLIST(l) ((l)=(OPTLIST)MALLOC(sizeof(struct oOPTLIST)),OID(l)=O_OPTLIST)
   
 #define NEWNODE(a) ((a)=(NODE)MALLOC(sizeof(struct oNODE)))  #define NEWNODE(a) ((a)=(NODE)MALLOC(sizeof(struct oNODE)))
 #define NEWDC(dc) ((dc)=(DCP)MALLOC(sizeof(struct oDCP)))  #define NEWDC(dc) ((dc)=(DCP)MALLOC(sizeof(struct oDCP)))
Line 756  PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
Line 798  PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 #define MKAlg(b,r) \  #define MKAlg(b,r) \
 (!(b)?((r)=0):NUM(b)?((r)=(Alg)(b)):(NEWAlg(r),BDY(r)=(Obj)(b),(r)))  (!(b)?((r)=0):NUM(b)?((r)=(Alg)(b)):(NEWAlg(r),BDY(r)=(Obj)(b),(r)))
   
 #if PARI  #if defined(PARI)
 #define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):BIGFLOAT(a)?rtodbl(BDY((BF)a)):0)  #define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):BIGFLOAT(a)?rtodbl(BDY((BF)a)):0)
 #else  #else
 #define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):0.0)  #define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):0.0)
Line 845  extern VL CO,ALG;
Line 887  extern VL CO,ALG;
 extern VL PVL;  extern VL PVL;
 extern R ONER;  extern R ONER;
 extern Q ONE;  extern Q ONE;
   extern Q TWO;
 extern MQ ONEM;  extern MQ ONEM;
 extern LM ONELM;  extern LM ONELM;
 extern N ONEN;  extern N ONEN;
Line 1427  void dtestroot(int,int,P,LUM,struct oDUM *,DCP *);
Line 1470  void dtestroot(int,int,P,LUM,struct oDUM *,DCP *);
 void dtestroot1(int,int,P,LUM,P *);  void dtestroot1(int,int,P,LUM,P *);
 void dtestsq(int,int,P,LUM,P *);  void dtestsq(int,int,P,LUM,P *);
 void dtestsql(P,ML,struct oDUM *,DCP *);  void dtestsql(P,ML,struct oDUM *,DCP *);
   void ediffp(VL,P,V,P *);
 void estimatelc(VL,Q,DCP,VN,P *);  void estimatelc(VL,Q,DCP,VN,P *);
 void eucum(register int,UM,UM,UM,UM);  void eucum(register int,UM,UM,UM,UM);
 void exthp(VL,P,int,P *);  void exthp(VL,P,int,P *);
Line 1867  int berlekampsf(UM p,int df,UM *tab,UM *r);
Line 1911  int berlekampsf(UM p,int df,UM *tab,UM *r);
 void minipolysf(UM f,UM p,UM mp);  void minipolysf(UM f,UM p,UM mp);
 int find_rootsf(UM p,int *root);  int find_rootsf(UM p,int *root);
 void canzassf(UM f,int d,UM *r);  void canzassf(UM f,int d,UM *r);
 void sfhensel(int count,P f,V x,int degbound,GFS *evp,P *sfp,ML *listp);  void sfhensel(int count,P f,V x,V y,int degbound,GFS *evp,P *sfp,ML *listp);
 int sfberle(VL vl,P f,int count,GFS *ev,DCP *dcp);  int sfberle(V x,V y,P f,int count,GFS *ev,DCP *dcp);
 void sfgcdgen(P f,ML blist,ML *clistp);  void sfgcdgen(P f,ML blist,ML *clistp);
 void sfhenmain2(BM f,UM g0,UM h0,int dy,BM *gp);  void sfhenmain2(BM f,UM g0,UM h0,int dy,BM *gp);
 void ptosfbm(int dy,P f,BM fl);  void ptosfbm(int dy,P f,BM fl);

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.42

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>