[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.11 and 1.14

version 1.11, 2019/09/19 06:29:48 version 1.14, 2019/11/19 10:50:31
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.10 2019/08/28 23:27:34 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.13 2019/11/12 22:27:04 noro Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 538  typedef struct oDMM {
Line 538  typedef struct oDMM {
 typedef struct oDMMstack {  typedef struct oDMMstack {
   int rank,ordtype;    int rank,ordtype;
   DMM *in;    DMM *in;
     DMM *sum;
   LIST obj;    LIST obj;
   struct oDMMstack *next;    struct oDMMstack *next;
 } *DMMstack;  } *DMMstack;
   
   typedef struct oDMMstack_array {
     int len;
     DMMstack *body;
   } *DMMstack_array;
   
 typedef struct oDL {  typedef struct oDL {
   int td;    int td;
   int d[1];    int d[1];
Line 605  typedef struct oNODE {
Line 611  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 906  bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
Line 917  bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #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 NEWDMMstack(m) ((m)=(DMMstack)MALLOC(sizeof(struct oDMMstack)))
   #define NEWDMMstack_array(m) ((m)=(DMMstack_array)MALLOC(sizeof(struct oDMMstack_array)))
 #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 942  DEG(DC(p))=ONE,COEF(DC(p))=(P)ONE,NEXT(DC(p))=0)
Line 954  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)))
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.14
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>