[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.34 and 1.36

version 1.34, 2016/12/05 10:29:15 version 1.36, 2017/02/21 09:20:23
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.33 2015/08/14 13:51:54 fujimoto Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.35 2017/01/08 03:05:40 noro 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;
           LM lm;
         GZ gz;          GZ gz;
         P p;          P p;
         R r;          R r;
Line 143  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 262  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);

Legend:
Removed from v.1.34  
changed lines
  Added in v.1.36

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>