===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.35
retrieving revision 1.43
diff -u -p -r1.35 -r1.43
--- OpenXM_contrib2/asir2000/builtin/dp.c	2003/08/01 08:38:05	1.35
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2003/11/27 02:20:51	1.43
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.34 2003/07/31 02:56:13 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.42 2003/10/17 05:16:49 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -89,7 +89,9 @@ void Pdp_weyl_set_weight();
 void Pdp_set_weight();
 void Pdp_nf_f(),Pdp_weyl_nf_f();
 void Pdp_lnf_f();
-void Pnd_gr();
+void Pnd_gr(),Pnd_gr_trace(),Pnd_f4();
+void Pnd_weyl_gr(),Pnd_weyl_gr_trace();
+void Pnd_nf();
 
 LIST remove_zero_from_list(LIST);
 
@@ -130,7 +132,12 @@ struct ftab dp_tab[] = {
 	{"dp_gr_mod_main",Pdp_gr_mod_main,5},
 	{"dp_gr_f_main",Pdp_gr_f_main,4},
 	{"dp_gr_checklist",Pdp_gr_checklist,2},
+	{"nd_f4",Pnd_f4,4},
 	{"nd_gr",Pnd_gr,4},
+	{"nd_gr_trace",Pnd_gr_trace,5},
+	{"nd_weyl_gr",Pnd_weyl_gr,4},
+	{"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5},
+	{"nd_nf",Pnd_nf,5},
 
 	/* F4 algorithm */
 	{"dp_f4_main",Pdp_f4_main,3},
@@ -1300,9 +1307,12 @@ Q *rp;
 			case 1:
 				DP_Print = 1;
 				break;
-			case 2: default:
+			case 2:
 				DP_Print = 0; DP_PrintShort = 1;
 				break;
+			default:
+				DP_Print = s; DP_PrintShort = 0;
+				break;
 		}
 	} else {
 		if ( DP_Print )	{
@@ -1480,18 +1490,40 @@ LIST *rp;
 	dp_gr_mod_main(f,v,homo,m,&ord,rp);
 }
 
+void Pnd_f4(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	LIST f,v;
+	int m,homo;
+	struct order_spec ord;
+
+	do_weyl = 0;
+	asir_assert(ARG0(arg),O_LIST,"nd_gr");
+	asir_assert(ARG1(arg),O_LIST,"nd_gr");
+	asir_assert(ARG2(arg),O_N,"nd_gr");
+	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
+	m = QTOS((Q)ARG2(arg));
+	create_order_spec(ARG3(arg),&ord);
+	nd_gr(f,v,m,1,&ord,rp);
+}
+
 void Pnd_gr(arg,rp)
 NODE arg;
 LIST *rp;
 {
 	LIST f,v;
-	int m;
+	int m,homo;
 	struct order_spec ord;
 
 	do_weyl = 0;
 	asir_assert(ARG0(arg),O_LIST,"nd_gr");
 	asir_assert(ARG1(arg),O_LIST,"nd_gr");
-	asir_assert(ARG3(arg),O_N,"nd_gr");
+	asir_assert(ARG2(arg),O_N,"nd_gr");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
 	f = remove_zero_from_list(f);
 	if ( !BDY(f) ) {
@@ -1499,10 +1531,100 @@ LIST *rp;
 	}
 	m = QTOS((Q)ARG2(arg));
 	create_order_spec(ARG3(arg),&ord);
-	if ( m >= 0 )
-		nd_gr(f,v,m,&ord,rp);
-	else
-		nd_gr_trace(f,v,-m,&ord,rp);
+	nd_gr(f,v,m,0,&ord,rp);
+}
+
+void Pnd_gr_trace(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	LIST f,v;
+	int m,homo;
+	struct order_spec ord;
+
+	do_weyl = 0;
+	asir_assert(ARG0(arg),O_LIST,"nd_gr_trace");
+	asir_assert(ARG1(arg),O_LIST,"nd_gr_trace");
+	asir_assert(ARG2(arg),O_N,"nd_gr_trace");
+	asir_assert(ARG3(arg),O_N,"nd_gr_trace");
+	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
+	homo = QTOS((Q)ARG2(arg));
+	m = QTOS((Q)ARG3(arg));
+	create_order_spec(ARG4(arg),&ord);
+	nd_gr_trace(f,v,m,homo,&ord,rp);
+}
+
+void Pnd_weyl_gr(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	LIST f,v;
+	int m,homo;
+	struct order_spec ord;
+
+	do_weyl = 1;
+	asir_assert(ARG0(arg),O_LIST,"nd_weyl_gr");
+	asir_assert(ARG1(arg),O_LIST,"nd_weyl_gr");
+	asir_assert(ARG2(arg),O_N,"nd_weyl_gr");
+	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
+	m = QTOS((Q)ARG2(arg));
+	create_order_spec(ARG3(arg),&ord);
+	nd_gr(f,v,m,0,&ord,rp);
+}
+
+void Pnd_weyl_gr_trace(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	LIST f,v;
+	int m,homo;
+	struct order_spec ord;
+
+	do_weyl = 1;
+	asir_assert(ARG0(arg),O_LIST,"nd_weyl_gr_trace");
+	asir_assert(ARG1(arg),O_LIST,"nd_weyl_gr_trace");
+	asir_assert(ARG2(arg),O_N,"nd_weyl_gr_trace");
+	asir_assert(ARG3(arg),O_N,"nd_weyl_gr_trace");
+	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
+	homo = QTOS((Q)ARG2(arg));
+	m = QTOS((Q)ARG3(arg));
+	create_order_spec(ARG4(arg),&ord);
+	nd_gr_trace(f,v,m,homo,&ord,rp);
+}
+
+void Pnd_nf(arg,rp)
+NODE arg;
+P *rp;
+{
+	P f;
+	LIST g,v;
+	struct order_spec ord;
+
+	do_weyl = 0;
+	asir_assert(ARG0(arg),O_P,"nd_nf");
+	asir_assert(ARG1(arg),O_LIST,"nd_nf");
+	asir_assert(ARG2(arg),O_LIST,"nd_nf");
+	asir_assert(ARG4(arg),O_N,"nd_nf");
+	f = (P)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(ARG3(arg),&ord);
+	nd_nf_p(f,g,v,QTOS((Q)ARG4(arg)),&ord,rp);
 }
 
 /* for Weyl algebra */