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

Diff for /OpenXM_contrib2/asir2018/include/ca.h between version 1.7 and 1.13

version 1.7, 2018/10/02 09:06:15 version 1.13, 2019/11/12 22:27:04
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/asir2018/include/ca.h,v 1.6 2018/10/01 05:54:09 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.12 2019/11/12 07:47:45 noro Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 535  typedef struct oDMM {
Line 535  typedef struct oDMM {
   struct oDMM *next;    struct oDMM *next;
 } *DMM;  } *DMM;
   
   typedef struct oDMMstack {
     int rank,ordtype;
     DMM *in;
     DMM *sum;
     LIST obj;
     struct oDMMstack *next;
   } *DMMstack;
   
 typedef struct oDL {  typedef struct oDL {
   int td;    int td;
   int d[1];    int d[1];
Line 598  typedef struct oNODE {
Line 606  typedef struct oNODE {
   struct oNODE *next;    struct oNODE *next;
 } *NODE;  } *NODE;
   
   typedef struct oNODE2 {
     pointer body1,body2;
     struct oNODE2 *next;
   } *NODE2;
   
 /* univariate poly over small finite field; dense */  /* univariate poly over small finite field; dense */
 typedef struct oUM {  typedef struct oUM {
   int d;    int d;
Line 672  struct order_spec {
Line 685  struct order_spec {
   int id;    int id;
   Obj obj;    Obj obj;
   int nv;    int nv;
   int ispot; /* 1 means Position over Term (Pos then Term) */    int module_ordtype; /* 0=TOP, 1=POT, 2=wPOT, 3=Schreyer */
   int pot_nelim; /* size of positions for pot-elimination order */    int pot_nelim; /* size of positions for pot-elimination order */
   int *top_weight;    int *top_weight;
   int module_rank;    int module_rank;
   int *module_top_weight;    int *module_top_weight;
     struct order_spec *base; /* for schreyer order */
     DMMstack dmmstack;
   union {    union {
     int simple;      int simple;
     struct {      struct {
Line 896  bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
Line 911  bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWVL(vl) ((vl)=(VL)MALLOC(sizeof(struct oVL)))  #define NEWVL(vl) ((vl)=(VL)MALLOC(sizeof(struct oVL)))
 #define NEWMP(m) ((m)=(MP)MALLOC(sizeof(struct oMP)))  #define NEWMP(m) ((m)=(MP)MALLOC(sizeof(struct oMP)))
 #define NEWDMM(m) ((m)=(DMM)MALLOC(sizeof(struct oDMM)))  #define NEWDMM(m) ((m)=(DMM)MALLOC(sizeof(struct oDMM)))
   #define NEWDMMstack(m) ((m)=(DMMstack)MALLOC(sizeof(struct oDMMstack)))
 #define NEWDLBUCKET(a) ((a)=(DLBUCKET)MALLOC(sizeof(struct oDLBUCKET)))  #define NEWDLBUCKET(a) ((a)=(DLBUCKET)MALLOC(sizeof(struct oDLBUCKET)))
 #define NEWDPP(a) ((a)=(DP_pairs)MALLOC(sizeof(struct dp_pairs)))  #define NEWDPP(a) ((a)=(DP_pairs)MALLOC(sizeof(struct dp_pairs)))
   
Line 932  DEG(DC(p))=ONE,COEF(DC(p))=(P)ONE,NEXT(DC(p))=0)
Line 948  DEG(DC(p))=ONE,COEF(DC(p))=(P)ONE,NEXT(DC(p))=0)
 DEG(DC(p))=ONE,COEF(DC(p))=(P)ONEM,NEXT(DC(p))=0)  DEG(DC(p))=ONE,COEF(DC(p))=(P)ONEM,NEXT(DC(p))=0)
 #define MKNODE(a,b,c) \  #define MKNODE(a,b,c) \
 (NEWNODE(a),(a)->body=(pointer)b,NEXT(a)=(NODE)(c))  (NEWNODE(a),(a)->body=(pointer)b,NEXT(a)=(NODE)(c))
   #define NEWNODE2(a) ((a)=(NODE2)MALLOC(sizeof(struct oNODE2)))
   #define MKNODE2(a,b,c,d) \
   (NEWNODE2(a),(a)->body1=(pointer)b,(a)->body2=(pointer)c,NEXT(a)=(NODE2)(d))
   #define BDY1(a) ((a)->body1)
   #define BDY2(a) ((a)->body2)
 #define MKLIST(a,b) (NEWLIST(a),(a)->body=(NODE)(b))  #define MKLIST(a,b) (NEWLIST(a),(a)->body=(NODE)(b))
 #define MKVECT(m,l) \  #define MKVECT(m,l) \
 (NEWVECT(m),(m)->len=(l),(m)->body=(pointer *)CALLOC((l),sizeof(pointer)))  (NEWVECT(m),(m)->len=(l),(m)->body=(pointer *)CALLOC((l),sizeof(pointer)))
Line 978  if(!(r)){NEWDMM(r);(c)=(r);}else{NEWDMM(NEXT(c));(c)=N
Line 999  if(!(r)){NEWDMM(r);(c)=(r);}else{NEWDMM(NEXT(c));(c)=N
 #define DUPZ(p,q) (NEWZ(q),BDY(q)=BDY(p))  #define DUPZ(p,q) (NEWZ(q),BDY(q)=BDY(p))
 #define DUPQ(p,q) (NEWQ(q),BDY(q)=BDY(p))  #define DUPQ(p,q) (NEWQ(q),BDY(q)=BDY(p))
   
 #define STOZ(n,q) ((!(n))?((q)=0):(NEWZ(q),mpz_set_si(BDY(q),n)))  #define STOZ(n,q) ((!(n))?(void)((q)=0):(NEWZ(q),mpz_set_si(BDY(q),n)))
 #define UTOZ(n,q) ((!(n))?((q)=0):(NEWZ(q),mpz_set_ui(BDY(q),n)))  #define UTOZ(n,q) ((!(n))?(void)((q)=0):(NEWZ(q),mpz_set_ui(BDY(q),n)))
   
 /* for initializing static object */  /* for initializing static object */
 #define STOZ0(n,q) (OID(q)=O_N,NID(q)=N_Q,(q)->z=1,mpz_init(BDY(q)),mpz_set_si(BDY(q),n))  #define STOZ0(n,q) (OID(q)=O_N,NID(q)=N_Q,(q)->z=1,mpz_init(BDY(q)),mpz_set_si(BDY(q),n))
Line 1776  void vntovl(VN,int,VL *);
Line 1797  void vntovl(VN,int,VL *);
 void saveerror(FILE *,ERR);  void saveerror(FILE *,ERR);
 void saveui(FILE *,USINT);  void saveui(FILE *,USINT);
 void savedp(FILE *,DP);  void savedp(FILE *,DP);
   void savedpm(FILE *,DPM);
 void savestring(FILE *,STRING);  void savestring(FILE *,STRING);
 void savemat(FILE *,MAT);  void savemat(FILE *,MAT);
 void savevect(FILE *,VECT);  void savevect(FILE *,VECT);
Line 1801  void savegfsn(FILE *,GFSN);
Line 1823  void savegfsn(FILE *,GFSN);
 void loaderror(FILE *,ERR *);  void loaderror(FILE *,ERR *);
 void loadui(FILE *,USINT *);  void loadui(FILE *,USINT *);
 void loaddp(FILE *,DP *);  void loaddp(FILE *,DP *);
   void loaddpm(FILE *,DPM *);
 void loadstring(FILE *,STRING *);  void loadstring(FILE *,STRING *);
 void loadmat(FILE *,MAT *);  void loadmat(FILE *,MAT *);
 void loadvect(FILE *,VECT *);  void loadvect(FILE *,VECT *);
Line 2621  void nd_det(int mod,MAT f,P *rp);
Line 2644  void nd_det(int mod,MAT f,P *rp);
 void nd_gr(LIST f,LIST v,int m,int homo,int retdp,int f4,struct order_spec *ord,LIST *rp);  void nd_gr(LIST f,LIST v,int m,int homo,int retdp,int f4,struct order_spec *ord,LIST *rp);
 void nd_gr_postproc(LIST f,LIST v,int m,struct order_spec *ord,int do_check,LIST *rp);  void nd_gr_postproc(LIST f,LIST v,int m,struct order_spec *ord,int do_check,LIST *rp);
 void nd_gr_recompute_trace(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist,LIST *rp);  void nd_gr_recompute_trace(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist,LIST *rp);
 void nd_gr_trace(LIST f,LIST v,int trace,int homo,int f4,struct order_spec *ord,LIST *rp);  void nd_gr_trace(LIST f,LIST v,int trace,int homo,int retdp,int f4,struct order_spec *ord,LIST *rp);
 void nd_nf_p(Obj f,LIST g,LIST v,int m,struct order_spec *ord,Obj *rp);  void nd_nf_p(Obj f,LIST g,LIST v,int m,struct order_spec *ord,Obj *rp);
 void obj_algtodalg(Obj obj,Obj *r);  void obj_algtodalg(Obj obj,Obj *r);
 void obj_dalgtoalg(Obj obj,Obj *r);  void obj_dalgtoalg(Obj obj,Obj *r);
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.13
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>