[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.15 and 1.16

version 1.15, 2019/09/19 06:29:47 version 1.16, 2019/10/11 03:45:56
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.14 2019/09/13 09:02:49 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp.c,v 1.15 2019/09/19 06:29:47 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "base.h"  #include "base.h"
Line 79  void Pdp_nf_mod(),Pdp_true_nf_mod();
Line 79  void Pdp_nf_mod(),Pdp_true_nf_mod();
 void Pdp_criB(),Pdp_nelim();  void Pdp_criB(),Pdp_nelim();
 void Pdp_minp(),Pdp_sp_mod();  void Pdp_minp(),Pdp_sp_mod();
 void Pdp_homo(),Pdp_dehomo();  void Pdp_homo(),Pdp_dehomo();
   void Pdpm_homo(),Pdpm_dehomo();
 void Pdp_gr_mod_main(),Pdp_gr_f_main();  void Pdp_gr_mod_main(),Pdp_gr_f_main();
 void Pdp_gr_main(),Pdp_gr_hm_main(),Pdp_gr_d_main(),Pdp_gr_flags();  void Pdp_gr_main(),Pdp_gr_hm_main(),Pdp_gr_d_main(),Pdp_gr_flags();
 void Pdp_interreduce();  void Pdp_interreduce();
Line 278  struct ftab dp_supp_tab[] = {
Line 279  struct ftab dp_supp_tab[] = {
   {"dpm_ltod",Pdpm_ltod,2},    {"dpm_ltod",Pdpm_ltod,2},
   {"dpm_dptodpm",Pdpm_dptodpm,2},    {"dpm_dptodpm",Pdpm_dptodpm,2},
   {"dpm_dtol",Pdpm_dtol,2},    {"dpm_dtol",Pdpm_dtol,2},
     {"dpm_homo",Pdpm_homo,1},
     {"dpm_dehomo",Pdpm_dehomo,1},
   
   /* criteria */    /* criteria */
   {"dp_cri1",Pdp_cri1,2},    {"dp_cri1",Pdp_cri1,2},
Line 1095  void Pdpm_dptodpm(NODE arg,DPM *rp)
Line 1098  void Pdpm_dptodpm(NODE arg,DPM *rp)
 {  {
   DP p;    DP p;
   MP mp;    MP mp;
   int pos;    int pos,shift;
   DMM m0,m;    DMM m0,m;
   
   p = (DP)ARG0(arg);    p = (DP)ARG0(arg);
Line 1107  void Pdpm_dptodpm(NODE arg,DPM *rp)
Line 1110  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;
     }      }
     MKDPM(p->nv,m0,*rp); (*rp)->sugar = p->sugar;      if ( dp_current_spec->module_rank ) {
         if ( pos > dp_current_spec->module_rank )
           error("dpm_dptodpm : inconsistent order spec");
         shift = dp_current_spec->module_top_weight[pos-1];
         m->dl->td += shift;
       } else
         shift = 0;
   
       MKDPM(p->nv,m0,*rp); (*rp)->sugar = p->sugar+shift;
   }    }
 }  }
   
Line 1885  void Pdpm_schreyer_base(NODE arg,LIST *rp)
Line 1896  void Pdpm_schreyer_base(NODE arg,LIST *rp)
   dpm_schreyer_base((LIST)ARG0(arg),rp);    dpm_schreyer_base((LIST)ARG0(arg),rp);
 }  }
   
 void dpm_simplify_syz(LIST m,LIST s,LIST *m1,LIST *s1);  void dpm_simplify_syz(LIST m,LIST s,LIST *m1,LIST *s1,LIST *w1);
   
 void Pdpm_simplify_syz(NODE arg,LIST *rp)  void Pdpm_simplify_syz(NODE arg,LIST *rp)
 {  {
   LIST s1,m1;    LIST s1,m1,w1;
   NODE t;    NODE t;
   
   asir_assert(ARG0(arg),O_LIST,"dpm_simplify_syz");    asir_assert(ARG0(arg),O_LIST,"dpm_simplify_syz");
   asir_assert(ARG1(arg),O_LIST,"dpm_simplify_syz");    asir_assert(ARG1(arg),O_LIST,"dpm_simplify_syz");
   dpm_simplify_syz((LIST)ARG0(arg),(LIST)ARG1(arg),&s1,&m1);    dpm_simplify_syz((LIST)ARG0(arg),(LIST)ARG1(arg),&s1,&m1,&w1);
   t = mknode(2,s1,m1);    t = mknode(3,s1,m1,w1);
   MKLIST(*rp,t);    MKLIST(*rp,t);
 }  }
   
Line 2433  void Pdp_dehomo(NODE arg,DP *rp)
Line 2444  void Pdp_dehomo(NODE arg,DP *rp)
   asir_assert(ARG0(arg),O_DP,"dp_dehomo");    asir_assert(ARG0(arg),O_DP,"dp_dehomo");
   dp_dehomo((DP)ARG0(arg),rp);    dp_dehomo((DP)ARG0(arg),rp);
 }  }
   
   void dpm_homo(DPM a,DPM *b);
   void dpm_dehomo(DPM a,DPM *b);
   
   void Pdpm_homo(NODE arg,DPM *rp)
   {
     asir_assert(ARG0(arg),O_DPM,"dpm_homo");
     dpm_homo((DPM)ARG0(arg),rp);
   }
   
   void Pdpm_dehomo(NODE arg,DPM *rp)
   {
     asir_assert(ARG0(arg),O_DPM,"dpm_dehomo");
     dpm_dehomo((DPM)ARG0(arg),rp);
   }
   
   
 void Pdp_gr_flags(NODE arg,LIST *rp)  void Pdp_gr_flags(NODE arg,LIST *rp)
 {  {
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>