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

Diff for /OpenXM_contrib2/asir2000/builtin/dp.c between version 1.87 and 1.90

version 1.87, 2012/08/27 05:38:00 version 1.90, 2013/09/09 09:47:09
Line 44 
Line 44 
  * 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/asir2000/builtin/dp.c,v 1.86 2012/04/10 07:15:07 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.89 2013/09/09 07:29:25 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "base.h"  #include "base.h"
Line 96  void Pdp_nf_f(),Pdp_weyl_nf_f();
Line 96  void Pdp_nf_f(),Pdp_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_gr_postproc(), Pnd_weyl_gr_postproc();  void Pnd_gr_postproc(), Pnd_weyl_gr_postproc();
 void Pnd_gr_recompute_trace();  void Pnd_gr_recompute_trace(), Pnd_btog();
 void Pnd_weyl_gr(),Pnd_weyl_gr_trace();  void Pnd_weyl_gr(),Pnd_weyl_gr_trace();
 void Pnd_nf(),Pnd_weyl_nf();  void Pnd_nf(),Pnd_weyl_nf();
 void Pdp_initial_term();  void Pdp_initial_term();
Line 114  LIST dp_initial_term();
Line 114  LIST dp_initial_term();
 LIST dp_order();  LIST dp_order();
 void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo,  void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo,
         int *modular,struct order_spec **ord);          int *modular,struct order_spec **ord);
   NODE dp_inv_or_split(NODE gb,DP f,struct order_spec *spec, DP *inv);
   
 LIST remove_zero_from_list(LIST);  LIST remove_zero_from_list(LIST);
   
Line 164  struct ftab dp_tab[] = {
Line 165  struct ftab dp_tab[] = {
         {"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},
   #if  0
         {"nd_gr_recompute_trace",Pnd_gr_recompute_trace,5},          {"nd_gr_recompute_trace",Pnd_gr_recompute_trace,5},
   #endif
           {"nd_btog",Pnd_btog,-6},
         {"nd_weyl_gr_postproc",Pnd_weyl_gr_postproc,5},          {"nd_weyl_gr_postproc",Pnd_weyl_gr_postproc,5},
         {"nd_weyl_gr",Pnd_weyl_gr,4},          {"nd_weyl_gr",Pnd_weyl_gr,4},
         {"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5},          {"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5},
Line 2207  LIST *rp;
Line 2211  LIST *rp;
         nd_gr_postproc(f,v,m,ord,do_check,rp);          nd_gr_postproc(f,v,m,ord,do_check,rp);
 }  }
   
   #if 0
 void Pnd_gr_recompute_trace(arg,rp)  void Pnd_gr_recompute_trace(arg,rp)
 NODE arg;  NODE arg;
 LIST *rp;  LIST *rp;
Line 2224  LIST *rp;
Line 2229  LIST *rp;
         create_order_spec(0,ARG3(arg),&ord);          create_order_spec(0,ARG3(arg),&ord);
         tlist = (LIST)ARG4(arg);          tlist = (LIST)ARG4(arg);
         nd_gr_recompute_trace(f,v,m,ord,tlist,rp);          nd_gr_recompute_trace(f,v,m,ord,tlist,rp);
   }
   #endif
   
   Obj nd_btog_one(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist,int pos);
   Obj nd_btog(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist);
   
   void Pnd_btog(arg,rp)
   NODE arg;
   Obj *rp;
   {
           LIST f,v,tlist;
           int m,ac,pos;
           struct order_spec *ord;
   
           do_weyl = 0;
           asir_assert(ARG0(arg),O_LIST,"nd_btog");
           asir_assert(ARG1(arg),O_LIST,"nd_btog");
           asir_assert(ARG2(arg),O_N,"nd_btog");
           f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
           m = QTOS((Q)ARG2(arg));
           create_order_spec(0,ARG3(arg),&ord);
           tlist = (LIST)ARG4(arg);
           if ( (ac = argc(arg)) == 6 ) {
                   asir_assert(ARG5(arg),O_N,"nd_btog");
                   pos = QTOS((Q)ARG5(arg));
                   *rp = nd_btog_one(f,v,m,ord,tlist,pos);
           } else if ( ac == 5 )
                   *rp = nd_btog(f,v,m,ord,tlist);
           else
                   error("nd_btog : argument mismatch");
 }  }
   
 void Pnd_weyl_gr_postproc(arg,rp)  void Pnd_weyl_gr_postproc(arg,rp)

Legend:
Removed from v.1.87  
changed lines
  Added in v.1.90

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