[BACK]Return to dp.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2018 / builtin

Diff for /OpenXM_contrib2/asir2018/builtin/dp.c between version 1.20 and 1.24

version 1.20, 2019/12/12 04:44:59 version 1.24, 2020/06/19 10:18:13
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/asir2018/builtin/dp.c,v 1.19 2019/11/21 04:03:16 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp.c,v 1.23 2020/02/11 01:43:57 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "base.h"  #include "base.h"
Line 59  extern struct order_spec *dp_current_spec;
Line 59  extern struct order_spec *dp_current_spec;
 extern struct modorder_spec *dp_current_modspec;  extern struct modorder_spec *dp_current_modspec;
 extern int nd_rref2;  extern int nd_rref2;
   
 int do_weyl;  extern int do_weyl;
   
 void Pdp_monomial_hilbert_poincare();  void Pdp_monomial_hilbert_poincare();
 void Pdp_sort();  void Pdp_sort();
Line 93  void Pdp_ltod(),Pdpv_ord(),Pdpv_ht(),Pdpv_hm(),Pdpv_hc
Line 93  void Pdp_ltod(),Pdpv_ord(),Pdpv_ht(),Pdpv_hm(),Pdpv_hc
 void Pdpm_ltod(),Pdpm_dtol(),Pdpm_set_schreyer(),Pdpm_nf(),Pdpm_weyl_nf(),Pdpm_sp(),Pdpm_weyl_sp(),Pdpm_nf_and_quotient(),Pdpm_nf_and_quotient2();  void Pdpm_ltod(),Pdpm_dtol(),Pdpm_set_schreyer(),Pdpm_nf(),Pdpm_weyl_nf(),Pdpm_sp(),Pdpm_weyl_sp(),Pdpm_nf_and_quotient(),Pdpm_nf_and_quotient2();
 void Pdpm_schreyer_frame(),Pdpm_set_schreyer_level();  void Pdpm_schreyer_frame(),Pdpm_set_schreyer_level();
 void Pdpm_list_to_array(),Pdpm_sp_nf(),Pdpm_insert_to_zlist();  void Pdpm_list_to_array(),Pdpm_sp_nf(),Pdpm_insert_to_zlist();
 void Pdpm_hm(),Pdpm_ht(),Pdpm_hc(),Pdpm_hp(),Pdpm_rest(),Pdpm_shift(),Pdpm_split(),Pdpm_sort(),Pdpm_dptodpm(),Pdpm_redble();  void Pdpm_hm(),Pdpm_ht(),Pdpm_hc(),Pdpm_hp(),Pdpm_rest(),Pdpm_shift(),Pdpm_split(),Pdpm_extract(),Pdpm_sort(),Pdpm_dptodpm(),Pdpm_redble();
 void Pdpm_schreyer_base(),Pdpm_simplify_syz(),Pdpm_td();  void Pdpm_schreyer_base(),Pdpm_simplify_syz(),Pdpm_td();
   void Pdpm_remove_cont();
   
 void Pdp_weyl_red();  void Pdp_weyl_red();
 void Pdp_weyl_sp();  void Pdp_weyl_sp();
Line 112  void Pdp_nf_f(),Pdp_weyl_nf_f();
Line 113  void Pdp_nf_f(),Pdp_weyl_nf_f();
 void Pdpm_nf_f(),Pdpm_weyl_nf_f();  void Pdpm_nf_f(),Pdpm_weyl_nf_f();
 void Pdp_lnf_f();  void Pdp_lnf_f();
 void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(),Pnd_f4_trace();  void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(),Pnd_f4_trace();
   void Pnd_sba();
 void Pnd_gr_postproc(), Pnd_weyl_gr_postproc();  void Pnd_gr_postproc(), Pnd_weyl_gr_postproc();
 void Pnd_gr_recompute_trace(), Pnd_btog();  void Pnd_gr_recompute_trace(), Pnd_btog();
 void Pnd_weyl_gr(),Pnd_weyl_gr_trace();  void Pnd_weyl_gr(),Pnd_weyl_gr_trace();
Line 143  struct ftab dp_tab[] = {
Line 145  struct ftab dp_tab[] = {
   {"dp_prim",Pdp_prim,1},    {"dp_prim",Pdp_prim,1},
   {"dp_red_coef",Pdp_red_coef,2},    {"dp_red_coef",Pdp_red_coef,2},
   {"dp_cont",Pdp_cont,1},    {"dp_cont",Pdp_cont,1},
     {"dpm_remove_cont",Pdpm_remove_cont,1},
   
 /* polynomial ring */  /* polynomial ring */
   /* special operations */    /* special operations */
Line 192  struct ftab dp_tab[] = {
Line 195  struct ftab dp_tab[] = {
   {"dp_gr_checklist",Pdp_gr_checklist,2},    {"dp_gr_checklist",Pdp_gr_checklist,2},
   {"nd_f4",Pnd_f4,-4},    {"nd_f4",Pnd_f4,-4},
   {"nd_gr",Pnd_gr,-4},    {"nd_gr",Pnd_gr,-4},
     {"nd_sba",Pnd_sba,-4},
   {"nd_gr_trace",Pnd_gr_trace,-5},    {"nd_gr_trace",Pnd_gr_trace,-5},
   {"nd_f4_trace",Pnd_f4_trace,-5},    {"nd_f4_trace",Pnd_f4_trace,-5},
   {"nd_gr_postproc",Pnd_gr_postproc,5},    {"nd_gr_postproc",Pnd_gr_postproc,5},
Line 308  struct ftab dp_supp_tab[] = {
Line 312  struct ftab dp_supp_tab[] = {
   {"dpm_rest",Pdpm_rest,1},    {"dpm_rest",Pdpm_rest,1},
   {"dpm_shift",Pdpm_shift,2},    {"dpm_shift",Pdpm_shift,2},
   {"dpm_split",Pdpm_split,2},    {"dpm_split",Pdpm_split,2},
     {"dpm_extract",Pdpm_extract,2},
   {"dpm_sort",Pdpm_sort,1},    {"dpm_sort",Pdpm_sort,1},
   {"dp_rest",Pdp_rest,1},    {"dp_rest",Pdp_rest,1},
   {"dp_initial_term",Pdp_initial_term,1},    {"dp_initial_term",Pdp_initial_term,1},
Line 821  void Pdp_cont(NODE arg,Z *rp)
Line 826  void Pdp_cont(NODE arg,Z *rp)
   dp_cont((DP)ARG0(arg),rp);    dp_cont((DP)ARG0(arg),rp);
 }  }
   
   void dpm_ptozp(DPM p,Z *cont,DPM *r);
   
   void Pdpm_remove_cont(NODE arg,LIST *rp)
   {
     NODE nd;
     Z cont;
     DPM p;
   
     dpm_ptozp((DPM)ARG0(arg),&cont,&p);
     nd = mknode(2,cont,p);
     MKLIST(*rp,nd);
   }
   
 void Pdp_dtov(NODE arg,VECT *rp)  void Pdp_dtov(NODE arg,VECT *rp)
 {  {
   dp_dtov((DP)ARG0(arg),rp);    dp_dtov((DP)ARG0(arg),rp);
Line 1118  void Pdpm_dptodpm(NODE arg,DPM *rp)
Line 1136  void Pdpm_dptodpm(NODE arg,DPM *rp)
     for ( m0 = 0, mp = BDY(p); mp; mp = NEXT(mp) ) {      for ( m0 = 0, mp = BDY(p); mp; mp = NEXT(mp) ) {
       NEXTDMM(m0,m); m->dl = mp->dl; m->c = mp->c; m->pos = pos;        NEXTDMM(m0,m); m->dl = mp->dl; m->c = mp->c; m->pos = pos;
     }      }
     if ( dp_current_spec->module_rank ) {      if ( dp_current_spec->module_top_weight ) {
       if ( pos > dp_current_spec->module_rank )        if ( pos > dp_current_spec->module_rank )
         error("dpm_dptodpm : inconsistent order spec");          error("dpm_dptodpm : inconsistent order spec");
       shift = dp_current_spec->module_top_weight[pos-1];        shift = dp_current_spec->module_top_weight[pos-1];
Line 1949  void Pdpm_list_to_array(NODE arg,LIST *rp)
Line 1967  void Pdpm_list_to_array(NODE arg,LIST *rp)
   MKLIST(*rp,nd);    MKLIST(*rp,nd);
 }  }
   
 /* [quo,nf] = dpm_sp_nf(psv,psiv,i,j) */  /* [quo,nf] = dpm_sp_nf(psv,psiv,i,j,top) */
 DPM dpm_sp_nf_zlist(VECT psv,VECT psiv,int i,int j,DPM *nf);  DPM dpm_sp_nf_zlist(VECT psv,VECT psiv,int i,int j,int top,DPM *nf);
   
 void Pdpm_sp_nf(NODE arg,LIST *rp)  void Pdpm_sp_nf(NODE arg,LIST *rp)
 {  {
   VECT psv,psiv;    VECT psv,psiv;
   DPM quo,nf;    DPM quo,nf;
   int i,j;    Obj val;
     int i,j,top;
   NODE nd;    NODE nd;
   
   asir_assert(ARG0(arg),O_VECT,"dpm_sp_nf"); psv = (VECT)ARG0(arg);    asir_assert(ARG0(arg),O_VECT,"dpm_sp_nf"); psv = (VECT)ARG0(arg);
   asir_assert(ARG1(arg),O_VECT,"dpm_sp_nf"); psiv = (VECT)ARG1(arg);    asir_assert(ARG1(arg),O_VECT,"dpm_sp_nf"); psiv = (VECT)ARG1(arg);
   asir_assert(ARG2(arg),O_N,"dpm_sp_nf"); i = ZTOS((Q)ARG2(arg));    asir_assert(ARG2(arg),O_N,"dpm_sp_nf"); i = ZTOS((Q)ARG2(arg));
   asir_assert(ARG3(arg),O_N,"dpm_sp_nf"); j = ZTOS((Q)ARG3(arg));    asir_assert(ARG3(arg),O_N,"dpm_sp_nf"); j = ZTOS((Q)ARG3(arg));
   quo = dpm_sp_nf_zlist(psv,psiv,i,j,&nf);    if ( get_opt("top",&val) && val )
       top = 1;
     else
       top = 0;
     quo = dpm_sp_nf_zlist(psv,psiv,i,j,top,&nf);
   nd = mknode(2,quo,nf);    nd = mknode(2,quo,nf);
   MKLIST(*rp,nd);    MKLIST(*rp,nd);
 }  }
Line 2987  void Pnd_gr(NODE arg,LIST *rp)
Line 3010  void Pnd_gr(NODE arg,LIST *rp)
   nd_gr(f,v,m,homo,retdp,0,ord,rp);    nd_gr(f,v,m,homo,retdp,0,ord,rp);
 }  }
   
   void nd_sba(LIST f,LIST v,int m,int homo,int retdp,struct order_spec *ord,LIST *rp);
   
   void Pnd_sba(NODE arg,LIST *rp)
   {
     LIST f,v;
     int m,homo,retdp,ac;
     Obj val;
     Z mq,z;
     Num nhomo;
     NODE node;
     struct order_spec *ord;
   
     do_weyl = 0;
     retdp = 0;
     if ( (ac=argc(arg)) == 4 ) {
       asir_assert(ARG0(arg),O_LIST,"nd_sba");
       asir_assert(ARG1(arg),O_LIST,"nd_sba");
       asir_assert(ARG2(arg),O_N,"nd_sba");
       f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
       f = remove_zero_from_list(f);
       if ( !BDY(f) ) {
         *rp = f; return;
       }
         mq = (Z)ARG2(arg);
         STOZ(0x40000000,z);
         if ( cmpz(mq,z) >= 0 ) {
           node = mknode(1,mq);
           Psetmod_ff(node,&val);
           m = -2;
         } else
           m = ZTOS(mq);
       create_order_spec(0,ARG3(arg),&ord);
       homo = 0;
       if ( get_opt("homo",&val) && val ) homo = 1;
       if ( get_opt("dp",&val) && val ) retdp = 1;
     } else if ( ac == 1 ) {
       f = (LIST)ARG0(arg);
       parse_gr_option(f,current_option,&v,&nhomo,&m,&ord);
       homo = ZTOS((Q)nhomo);
       if ( get_opt("dp",&val) && val ) retdp = 1;
     } else
       error("nd_gr : invalid argument");
     nd_sba(f,v,m,homo,retdp,ord,rp);
   }
   
 void Pnd_gr_postproc(NODE arg,LIST *rp)  void Pnd_gr_postproc(NODE arg,LIST *rp)
 {  {
   LIST f,v;    LIST f,v;
Line 4063  void Pdpm_set_schreyer(NODE arg,LIST *rp)
Line 4131  void Pdpm_set_schreyer(NODE arg,LIST *rp)
 }  }
   
 DMMstack_array Schreyer_Frame;  DMMstack_array Schreyer_Frame;
 DMMstack_array dpm_schreyer_frame(NODE n);  DMMstack_array dpm_schreyer_frame(NODE n,int lex);
 void set_schreyer_level(DMMstack_array array,int level);  void set_schreyer_level(DMMstack_array array,int level);
   
 void Pdpm_set_schreyer_level(NODE arg,Q *rp)  void Pdpm_set_schreyer_level(NODE arg,Q *rp)
Line 4072  void Pdpm_set_schreyer_level(NODE arg,Q *rp)
Line 4140  void Pdpm_set_schreyer_level(NODE arg,Q *rp)
   *rp = (Q)ARG0(arg);    *rp = (Q)ARG0(arg);
 }  }
   
 DPM dmmtodpm(DMM d)  
 {  
 }  
   
 void Pdpm_schreyer_frame(NODE arg,LIST *rp)  void Pdpm_schreyer_frame(NODE arg,LIST *rp)
 {  {
   DMMstack_array a;    DMMstack_array a;
Line 4086  void Pdpm_schreyer_frame(NODE arg,LIST *rp)
Line 4150  void Pdpm_schreyer_frame(NODE arg,LIST *rp)
   LIST l;    LIST l;
   VECT v;    VECT v;
   Z lev,deg,ind;    Z lev,deg,ind;
   int len,i,nv,rank,j;    int len,i,nv,rank,j,lex;
     NODE tt,p;
     char *key;
     Obj value;
   
   Schreyer_Frame = a = dpm_schreyer_frame(BDY((LIST)ARG0(arg)));    lex = 0;
     if ( current_option ) {
       for ( tt = current_option; tt; tt = NEXT(tt) ) {
         p = BDY((LIST)BDY(tt));
         key = BDY((STRING)BDY(p));
         value = (Obj)BDY(NEXT(p));
         if ( !strcmp(key,"lex") )
           lex = value!=0?1:0;
         else {
           error("dpm_schreyer_frame: unknown option.");
         }
       }
     }
     Schreyer_Frame = a = dpm_schreyer_frame(BDY((LIST)ARG0(arg)),lex);
   len = a->len;    len = a->len;
   body = a->body;    body = a->body;
   /* XXX */    /* XXX */
Line 4175  void Pdpm_sort(NODE arg,DPM *rp)
Line 4255  void Pdpm_sort(NODE arg,DPM *rp)
   
   p = (DPM)ARG0(arg);    p = (DPM)ARG0(arg);
   if ( !p ) *rp = 0;    if ( !p ) *rp = 0;
   dpm_sort(p,rp);    else dpm_sort(p,rp);
 }  }
   
 void dpm_split(DPM p,int s,DPM *up,DPM *lo);  void dpm_split(DPM p,int s,DPM *up,DPM *lo);
   void dpm_extract(DPM p,int s,DP *r);
   
 void Pdpm_split(NODE arg,LIST *rp)  void Pdpm_split(NODE arg,LIST *rp)
 {  {
Line 4191  void Pdpm_split(NODE arg,LIST *rp)
Line 4272  void Pdpm_split(NODE arg,LIST *rp)
   dpm_split(p,s,&up,&lo);    dpm_split(p,s,&up,&lo);
   nd = mknode(2,up,lo);    nd = mknode(2,up,lo);
   MKLIST(*rp,nd);    MKLIST(*rp,nd);
   }
   
   void Pdpm_extract(NODE arg,DP *rp)
   {
     DPM p;
     int s;
   
     p = (DPM)ARG0(arg);
     s = ZTOS((Z)ARG1(arg));
     dpm_extract(p,s,rp);
 }  }
   
   
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.24
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>