[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.14 and 1.20

version 1.14, 2006/04/17 04:35:20 version 1.20, 2009/01/05 02:08:18
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.13 2005/08/03 06:10:48 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.19 2009/01/04 05:44:51 noro Exp $ */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
 #include "ox.h"  #include "ox.h"
Line 48  typedef union oNDC {
Line 48  typedef union oNDC {
         int m;          int m;
         Q z;          Q z;
         P p;          P p;
           R r;
         DAlg a;          DAlg a;
 } *NDC;  } *NDC;
   
Line 127  extern char *Demand;
Line 128  extern char *Demand;
 extern VL CO;  extern VL CO;
 extern int Top,Reverse,DP_Print,dp_nelim,do_weyl,NoSugar;  extern int Top,Reverse,DP_Print,dp_nelim,do_weyl,NoSugar;
 extern int *current_weyl_weight_vector;  extern int *current_weyl_weight_vector;
   extern int *current_module_weight_vector;
   
 /* fundamental macros */  /* fundamental macros */
 #define TD(d) (d[0])  #define TD(d) (d[0])
Line 151  extern int *current_weyl_weight_vector;
Line 153  extern int *current_weyl_weight_vector;
   
 #define GET_EXP_OLD(d,a) (((d)[oepos[a].i]>>oepos[a].s)&omask0)  #define GET_EXP_OLD(d,a) (((d)[oepos[a].i]>>oepos[a].s)&omask0)
 #define PUT_EXP_OLD(r,a,e) ((r)[oepos[a].i] |= ((e)<<oepos[a].s))  #define PUT_EXP_OLD(r,a,e) ((r)[oepos[a].i] |= ((e)<<oepos[a].s))
   #define MPOS(d) (d[nd_mpos])
   
 #define ROUND_FOR_ALIGN(s) ((((s)+sizeof(void *)-1)/sizeof(void *))*sizeof(void *))  #define ROUND_FOR_ALIGN(s) ((((s)+sizeof(void *)-1)/sizeof(void *))*sizeof(void *))
   
Line 218  NODE append_one(NODE,int);
Line 221  NODE append_one(NODE,int);
 /* manipulation of coefficients */  /* manipulation of coefficients */
 void nd_removecont(int mod,ND p);  void nd_removecont(int mod,ND p);
 void nd_removecont2(ND p1,ND p2);  void nd_removecont2(ND p1,ND p2);
 void removecont_array(Q *c,int n);  void removecont_array(P *c,int n,int full);
   void removecont_array_q(Q *c,int n);
   
 /* GeoBucket functions */  /* GeoBucket functions */
 ND normalize_pbucket(int mod,PGeoBucket g);  ND normalize_pbucket(int mod,PGeoBucket g);
Line 247  int ndv_newps(int m,NDV a,NDV aq);
Line 251  int ndv_newps(int m,NDV a,NDV aq);
   
 /* top level functions */  /* top level functions */
 void nd_gr(LIST f,LIST v,int m,int f4,struct order_spec *ord,LIST *rp);  void nd_gr(LIST f,LIST v,int m,int f4,struct order_spec *ord,LIST *rp);
 void nd_gr_trace(LIST f,LIST v,int trace,int homo,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);  NODE nd_f4(int m);
 NODE nd_gb(int m,int ishomo,int checkonly);  NODE nd_gb(int m,int ishomo,int checkonly);
 NODE nd_gb_trace(int m,int ishomo);  NODE nd_gb_trace(int m,int ishomo);
   NODE nd_f4_trace(int m);
   
 /* ndl functions */  /* ndl functions */
 int ndl_weight(UINT *d);  int ndl_weight(UINT *d);
Line 274  INLINE int ndl_hash_value(UINT *d);
Line 279  INLINE int ndl_hash_value(UINT *d);
 /* normal forms */  /* normal forms */
 INLINE int ndl_find_reducer(UINT *g);  INLINE int ndl_find_reducer(UINT *g);
 int nd_sp(int mod,int trace,ND_pairs p,ND *nf);  int nd_sp(int mod,int trace,ND_pairs p,ND *nf);
 int nd_nf(int mod,ND g,NDV *ps,int full,NDC dn,ND *nf);  int nd_nf(int mod,ND d,ND g,NDV *ps,int full,NDC dn,ND *nf);
 int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *nf);  int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *nf);
   
 /* finalizers */  /* finalizers */
Line 298  void ndp_print(ND_pairs d);
Line 303  void ndp_print(ND_pairs d);
 /* setup, reconstruct */  /* setup, reconstruct */
 void nd_init_ord(struct order_spec *spec);  void nd_init_ord(struct order_spec *spec);
 ND_pairs nd_reconstruct(int trace,ND_pairs ndp);  ND_pairs nd_reconstruct(int trace,ND_pairs ndp);
 void ndv_setup(int mod,int trace,NODE f,int dont_sort);  void ndv_setup(int mod,int trace,NODE f,int dont_sort,int dont_removecont);
 void nd_setup_parameters(int nvar,int max);  void nd_setup_parameters(int nvar,int max);
 BlockMask nd_create_blockmask(struct order_spec *ord);  BlockMask nd_create_blockmask(struct order_spec *ord);
 EPOS nd_create_epos(struct order_spec *ord);  EPOS nd_create_epos(struct order_spec *ord);
Line 310  ND nd_dup(ND p);
Line 315  ND nd_dup(ND p);
 /* ND functions */  /* ND functions */
 int ndv_check_candidate(NODE input,int obpe,int oadv,EPOS oepos,NODE cand);  int ndv_check_candidate(NODE input,int obpe,int oadv,EPOS oepos,NODE cand);
 void nd_mul_c(int mod,ND p,int mul);  void nd_mul_c(int mod,ND p,int mul);
 void nd_mul_c_q(ND p,Q mul);  void nd_mul_c_q(ND p,P mul);
 void nd_mul_c_p(VL vl,ND p,P mul);  void nd_mul_c_p(VL vl,ND p,P mul);
 ND nd_remove_head(ND p);  ND nd_remove_head(ND p);
 ND nd_separate_head(ND p,ND *head);  ND nd_separate_head(ND p,ND *head);
Line 325  ND nd_add_q(ND p1,ND p2);
Line 330  ND nd_add_q(ND p1,ND p2);
 ND nd_add_sf(ND p1,ND p2);  ND nd_add_sf(ND p1,ND p2);
 ND nd_quo(int mod,PGeoBucket p,NDV d);  ND nd_quo(int mod,PGeoBucket p,NDV d);
 INLINE int nd_length(ND p);  INLINE int nd_length(ND p);
 NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0);  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);  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_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);
 NODE nd_f4_red_q_main(ND_pairs sp0,int nsp,UINT *s0vect,int col,  
         NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred);  
   
 /* NDV functions */  /* NDV functions */
 ND weyl_ndv_mul_nm(int mod,NM m0,NDV p);  ND weyl_ndv_mul_nm(int mod,NM m0,NDV p);
Line 364  int nd_to_vect_q(UINT *s0,int n,ND d,Q *r);
Line 369  int nd_to_vect_q(UINT *s0,int n,ND d,Q *r);
 NDV vect_to_ndv_q(Q *vect,int spcol,int col,int *rhead,UINT *s0vect);  NDV vect_to_ndv_q(Q *vect,int spcol,int col,int *rhead,UINT *s0vect);
   
 /* elimination */  /* elimination */
 int nd_gauss_elim_mod(int **mat0,int *sugar,int row,int col,int md,int *colstat);  int nd_gauss_elim_mod(int **mat0,int *sugar,ND_pairs *spactive,int row,int col,int md,int *colstat);
 int nd_gauss_elim_sf(int **mat0,int *sugar,int row,int col,int md,int *colstat);  int nd_gauss_elim_sf(int **mat0,int *sugar,int row,int col,int md,int *colstat);
 int nd_gauss_elim_q(Q **mat0,int *sugar,int row,int col,int *colstat);  int nd_gauss_elim_q(Q **mat0,int *sugar,int row,int col,int *colstat);
   
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.20
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>