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

Diff for /OpenXM_contrib2/asir2000/engine/nd.h between version 1.32 and 1.37

version 1.32, 2015/08/06 10:01:52 version 1.37, 2017/09/14 01:34:54
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.31 2013/12/20 02:02:24 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.36 2017/02/21 09:20:23 noro Exp $ */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
 #include "ox.h"  #include "ox.h"
Line 8 
Line 8 
   
 #if defined(__GNUC__)  #if defined(__GNUC__)
 #define INLINE static inline  #define INLINE static inline
 #elif defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)  #elif defined(VISUAL) || defined(__MINGW32__)
 #define INLINE __inline  #define INLINE __inline
 #else  #else
 #define INLINE  #define INLINE
Line 47  typedef struct oNDV {
Line 47  typedef struct oNDV {
 typedef union oNDC {  typedef union oNDC {
         int m;          int m;
         Q z;          Q z;
           LM lm;
         GZ gz;          GZ gz;
         P p;          P p;
         R r;          R r;
Line 79  typedef struct oND_pairs {
Line 80  typedef struct oND_pairs {
         struct oND_pairs *next;          struct oND_pairs *next;
         int i1,i2;          int i1,i2;
         int sugar;          int sugar;
           int sugar2;
         UINT lcm[1];          UINT lcm[1];
 } *ND_pairs;  } *ND_pairs;
   
Line 142  extern int *current_module_weight_vector;
Line 144  extern int *current_module_weight_vector;
 #define HTD(d) (TD(HDL(d)))  #define HTD(d) (TD(HDL(d)))
 #define HCU(d) ((d)->body->c)  #define HCU(d) ((d)->body->c)
 #define HCM(d) ((d)->body->c.m)  #define HCM(d) ((d)->body->c.m)
   #define HCLM(d) ((d)->body->c.lm)
 #define HCQ(d) ((d)->body->c.z)  #define HCQ(d) ((d)->body->c.z)
 #define HCZ(d) ((d)->body->c.gz)  #define HCZ(d) ((d)->body->c.gz)
 #define HCP(d) ((d)->body->c.p)  #define HCP(d) ((d)->body->c.p)
 #define HCA(d) ((d)->body->c.a)  #define HCA(d) ((d)->body->c.a)
 #define CM(x) ((x)->c.m)  #define CM(x) ((x)->c.m)
   #define CLM(x) ((x)->c.lm)
 #define CQ(x) ((x)->c.z)  #define CQ(x) ((x)->c.z)
 #define CZ(x) ((x)->c.gz)  #define CZ(x) ((x)->c.gz)
 #define CP(x) ((x)->c.p)  #define CP(x) ((x)->c.p)
Line 261  int ndv_newps(int m,NDV a,NDV aq,int f4);
Line 265  int ndv_newps(int m,NDV a,NDV aq,int f4);
 /* top level functions */  /* top level functions */
 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_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 f4,struct order_spec *ord,LIST *rp);
 NODE nd_f4(int m,int **indp);  NODE nd_f4(int m,int checkonly,int **indp);
 NODE nd_gb(int m,int ishomo,int checkonly,int gensyz,int **indp);  NODE nd_gb(int m,int ishomo,int checkonly,int gensyz,int **indp);
 NODE nd_gb_trace(int m,int ishomo,int **indp);  NODE nd_gb_trace(int m,int ishomo,int **indp);
 NODE nd_f4_trace(int m,int **indp);  NODE nd_f4_trace(int m,int **indp);
Line 343  INLINE int nd_length(ND p);
Line 347  INLINE int nd_length(ND p);
 NODE nd_f4_red(int m,ND_pairs sp0,int trace,UINT *s0vect,int col,NODE rp0,ND_pairs *nz);  NODE nd_f4_red(int m,ND_pairs sp0,int trace,UINT *s0vect,int col,NODE rp0,ND_pairs *nz);
 NODE nd_f4_red_dist(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0, ND_pairs *nz);  NODE nd_f4_red_dist(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0, ND_pairs *nz);
 NODE nd_f4_red_main(int m,ND_pairs sp0,int nsp,UINT *s0vect,int col,  NODE nd_f4_red_main(int m,ND_pairs sp0,int nsp,UINT *s0vect,int col,
           NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred,ND_pairs *nz);
   NODE nd_f4_red_mod_main(int m,ND_pairs sp0,int nsp,UINT *s0vect,int col,
           NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred,ND_pairs *nz);
   NODE nd_f4_red_sf_main(int m,ND_pairs sp0,int nsp,UINT *s0vect,int col,
         NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred,ND_pairs *nz);          NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred,ND_pairs *nz);
 NODE nd_f4_red_q_main(ND_pairs sp0,int nsp,int trace,UINT *s0vect,int col,  NODE nd_f4_red_q_main(ND_pairs sp0,int nsp,int trace,UINT *s0vect,int col,
         NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred);          NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred);
Legend:
Removed from v.1.32  
changed lines
  Added in v.1.37
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>