[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.41 and 1.48

version 1.41, 2003/12/23 10:39:57 version 1.48, 2004/03/10 02:41:08
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.40 2003/12/23 06:30:14 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.47 2004/03/09 08:02:01 noro Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 119  typedef void * pointer;
Line 119  typedef void * pointer;
 #define O_BYTEARRAY 16  #define O_BYTEARRAY 16
 #define O_QUOTE 17  #define O_QUOTE 17
 #define O_OPTLIST 18  #define O_OPTLIST 18
   #define O_SYMBOL 19
   #define O_RANGE 20
   #define O_TB 21
 #define O_VOID -1  #define O_VOID -1
   
 #define N_Q 0  #define N_Q 0
Line 361  typedef struct oOPTLIST {
Line 364  typedef struct oOPTLIST {
         struct oNODE *body;          struct oNODE *body;
 } *OPTLIST;  } *OPTLIST;
   
   typedef struct oSYMBOL {
           short id;
           short pad;
           char *name;
           int value;
   } *SYMBOL;
   
   typedef struct oRANGE {
           short id;
           short pad;
           struct oObj *start,*end;
   } *RANGE;
   
   typedef struct oTB {
           short id;
           short pad;
           int size,next;
           char **body;
   } *TB;
   
 typedef struct oObj {  typedef struct oObj {
         short id;          short id;
         short pad;          short pad;
Line 491  struct order_pair {
Line 514  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 505  struct order_spec {
Line 548  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 669  bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
Line 716  bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #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 NEWOPTLIST(l) ((l)=(OPTLIST)MALLOC(sizeof(struct oOPTLIST)),OID(l)=O_OPTLIST)
   #define NEWSYMBOL(l) ((l)=(SYMBOL)MALLOC(sizeof(struct oSYMBOL)),OID(l)=O_SYMBOL)
   #define NEWRANGE(l) ((l)=(RANGE)MALLOC(sizeof(struct oRANGE)),OID(l)=O_RANGE)
   #define NEWTB(l) ((l)=(TB)MALLOC(sizeof(struct oTB)),OID(l)=O_TB,(l)->size=256,(l)->next=0,(l)->body=(char **)MALLOC((l)->size*sizeof(char *)))
   
 #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 989  void square_rem_tab_up_gf2n(UP,UP *,UP *);
Line 1039  void square_rem_tab_up_gf2n(UP,UP *,UP *);
 void powertabup_gf2n(UP,UP,UP *);  void powertabup_gf2n(UP,UP,UP *);
 void find_root_gf2n(UP,GF2N *);  void find_root_gf2n(UP,GF2N *);
   
   int cmpdl_composite(int,DL,DL);
 int cmpdl_matrix(int,DL,DL);  int cmpdl_matrix(int,DL,DL);
 int cmpdl_order_pair(int,DL,DL);  int cmpdl_order_pair(int,DL,DL);
 int cmpdl_elim(int,DL,DL);  int cmpdl_elim(int,DL,DL);
Legend:
Removed from v.1.41  
changed lines
  Added in v.1.48
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>