[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.30 and 1.31

version 1.30, 2013/11/05 11:36:58 version 1.31, 2013/12/20 02:02:24
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.29 2013/09/26 00:38:47 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.30 2013/11/05 11:36:58 ohara Exp $ */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
 #include "ox.h"  #include "ox.h"
Line 47  typedef struct oNDV {
Line 47  typedef struct oNDV {
 typedef union oNDC {  typedef union oNDC {
         int m;          int m;
         Q z;          Q z;
           GZ gz;
         P p;          P p;
         R r;          R r;
         DAlg a;          DAlg a;
Line 142  extern int *current_module_weight_vector;
Line 143  extern int *current_module_weight_vector;
 #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 HCQ(d) ((d)->body->c.z)  #define HCQ(d) ((d)->body->c.z)
   #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 CQ(x) ((x)->c.z)  #define CQ(x) ((x)->c.z)
   #define CZ(x) ((x)->c.gz)
 #define CP(x) ((x)->c.p)  #define CP(x) ((x)->c.p)
 #define CA(x) ((x)->c.a)  #define CA(x) ((x)->c.a)
 #define DL(x) ((x)->dl)  #define DL(x) ((x)->dl)
Line 253  ND_pairs crit_B( ND_pairs d, int s );
Line 256  ND_pairs crit_B( ND_pairs d, int s );
 ND_pairs crit_M( ND_pairs d1 );  ND_pairs crit_M( ND_pairs d1 );
 ND_pairs crit_F( ND_pairs d1 );  ND_pairs crit_F( ND_pairs d1 );
 int crit_2( int dp1, int dp2 );  int crit_2( int dp1, int dp2 );
 int ndv_newps(int m,NDV a,NDV aq);  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);
Line 316  EPOS nd_create_epos(struct order_spec *ord);
Line 319  EPOS nd_create_epos(struct order_spec *ord);
 int nd_get_exporigin(struct order_spec *ord);  int nd_get_exporigin(struct order_spec *ord);
 void ndv_mod(int mod,NDV p);  void ndv_mod(int mod,NDV p);
 NDV ndv_dup(int mod,NDV p);  NDV ndv_dup(int mod,NDV p);
   NDV ndv_symbolic(int mod,NDV p);
 ND nd_dup(ND p);  ND nd_dup(ND p);
   
 /* ND functions */  /* ND functions */
Line 341  NODE nd_f4_red_dist(int m,ND_pairs sp0,UINT *s0vect,in
Line 345  NODE nd_f4_red_dist(int m,ND_pairs sp0,UINT *s0vect,in
 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);          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);
   NODE nd_f4_red_gz_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);
   
 /* NDV functions */  /* NDV functions */
Legend:
Removed from v.1.30  
changed lines
  Added in v.1.31
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>