[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.82 and 1.83

version 1.82, 2010/05/01 02:17:49 version 1.83, 2010/09/27 05:05:58
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.81 2010/04/16 07:13:42 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.82 2010/05/01 02:17:49 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "base.h"  #include "base.h"
Line 97  void Pdp_lnf_f();
Line 97  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_weyl_gr(),Pnd_weyl_gr_trace();  void Pnd_weyl_gr(),Pnd_weyl_gr_trace();
 void Pnd_nf();  void Pnd_nf(),Pnd_weyl_nf();
 void Pdp_initial_term();  void Pdp_initial_term();
 void Pdp_order();  void Pdp_order();
 void Pdp_inv_or_split();  void Pdp_inv_or_split();
Line 166  struct ftab dp_tab[] = {
Line 166  struct ftab dp_tab[] = {
         {"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},
         {"nd_nf",Pnd_nf,5},          {"nd_nf",Pnd_nf,5},
           {"nd_weyl_nf",Pnd_weyl_nf,5},
   
         /* F4 algorithm */          /* F4 algorithm */
         {"dp_f4_main",Pdp_f4_main,3},          {"dp_f4_main",Pdp_f4_main,3},
Line 2320  LIST *rp;
Line 2321  LIST *rp;
         do_weyl = 0;          do_weyl = 0;
 }  }
   
 void Pnd_nf(arg,rp)  void Pnd_nf(NODE arg,Obj *rp)
 NODE arg;  
 P *rp;  
 {  {
         P f;          Obj f;
         LIST g,v;          LIST g,v;
         struct order_spec *ord;          struct order_spec *ord;
   
         do_weyl = 0;          do_weyl = 0;
         asir_assert(ARG0(arg),O_P,"nd_nf");  
         asir_assert(ARG1(arg),O_LIST,"nd_nf");          asir_assert(ARG1(arg),O_LIST,"nd_nf");
         asir_assert(ARG2(arg),O_LIST,"nd_nf");          asir_assert(ARG2(arg),O_LIST,"nd_nf");
         asir_assert(ARG4(arg),O_N,"nd_nf");          asir_assert(ARG4(arg),O_N,"nd_nf");
         f = (P)ARG0(arg);          f = (Obj)ARG0(arg);
           g = (LIST)ARG1(arg); g = remove_zero_from_list(g);
           if ( !BDY(g) ) {
                   *rp = f; return;
           }
           v = (LIST)ARG2(arg);
           create_order_spec(0,ARG3(arg),&ord);
           nd_nf_p(f,g,v,QTOS((Q)ARG4(arg)),ord,rp);
   }
   
   void Pnd_weyl_nf(NODE arg,Obj *rp)
   {
           Obj f;
           LIST g,v;
           struct order_spec *ord;
   
           do_weyl = 1;
           asir_assert(ARG1(arg),O_LIST,"nd_weyl_nf");
           asir_assert(ARG2(arg),O_LIST,"nd_weyl_nf");
           asir_assert(ARG4(arg),O_N,"nd_weyl_nf");
           f = (Obj)ARG0(arg);
         g = (LIST)ARG1(arg); g = remove_zero_from_list(g);          g = (LIST)ARG1(arg); g = remove_zero_from_list(g);
         if ( !BDY(g) ) {          if ( !BDY(g) ) {
                 *rp = f; return;                  *rp = f; return;
Legend:
Removed from v.1.82  
changed lines
  Added in v.1.83
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>