===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -p -r1.11 -r1.15
--- OpenXM_contrib2/asir2000/builtin/dp.c	2000/12/08 08:26:08	1.11
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2001/01/11 08:43:21	1.15
@@ -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.10 2000/12/08 06:43:09 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.14 2000/12/14 08:43:47 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -77,9 +77,13 @@ void Pdp_mbase(),Pdp_lnf_mod(),Pdp_nf_tab_mod(),Pdp_md
 void Pdp_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), Pdp_sep();
 void Pdp_cont();
 
-void Pdp_weyl_red(),Pdp_weyl_sp(),Pdp_weyl_nf();
+void Pdp_weyl_red();
+void Pdp_weyl_sp();
+void Pdp_weyl_nf(),Pdp_weyl_nf_mod();
 void Pdp_weyl_gr_main(),Pdp_weyl_gr_mod_main();
 void Pdp_weyl_f4_main(),Pdp_weyl_f4_mod_main();
+void Pdp_weyl_mul(),Pdp_weyl_mul_mod();
+void Pdp_weyl_set_weight();
 
 struct ftab dp_tab[] = {
 	/* content reduction */
@@ -115,6 +119,10 @@ struct ftab dp_tab[] = {
 	{"dp_f4_mod_main",Pdp_f4_mod_main,4},
 
 /* weyl algebra */
+	/* multiplication */
+	{"dp_weyl_mul",Pdp_weyl_mul,2},
+	{"dp_weyl_mul_mod",Pdp_weyl_mul_mod,3},
+
 	/* s-poly */
 	{"dp_weyl_sp",Pdp_weyl_sp,2},
 
@@ -123,6 +131,7 @@ struct ftab dp_tab[] = {
 
 	/* normal form */
 	{"dp_weyl_nf",Pdp_weyl_nf,4},
+	{"dp_weyl_nf_mod",Pdp_weyl_nf_mod,5},
 
 	/* Buchberger algorithm */
 	{"dp_weyl_gr_main",Pdp_weyl_gr_main,5},
@@ -132,6 +141,8 @@ struct ftab dp_tab[] = {
 	{"dp_weyl_f4_main",Pdp_weyl_f4_main,3},
 	{"dp_weyl_f4_mod_main",Pdp_weyl_f4_mod_main,4},
 
+	/* misc */
+	{"dp_weyl_set_weight",Pdp_weyl_set_weight,-1},
 	{0,0,0},
 };
 
@@ -491,7 +502,6 @@ DP *rp;
 	DP g;
 	int full;
 
-	do_weyl = 1;
 	asir_assert(ARG0(arg),O_LIST,"dp_weyl_nf");
 	asir_assert(ARG1(arg),O_DP,"dp_weyl_nf");
 	asir_assert(ARG2(arg),O_VECT,"dp_weyl_nf");
@@ -501,9 +511,42 @@ DP *rp;
 	}
 	b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg));
 	full = (Q)ARG3(arg) ? 1 : 0;
+	do_weyl = 1;
 	dp_nf_ptozp(b,g,ps,full,DP_Multiple,rp);
+	do_weyl = 0;
 }
 
+void Pdp_nf_mod(arg,rp)
+NODE arg;
+DP *rp;
+{
+	NODE b;
+	DP g;
+	DP *ps;
+	int mod,full,ac;
+	NODE n,n0;
+
+	do_weyl = 0;
+	ac = argc(arg);
+	asir_assert(ARG0(arg),O_LIST,"dp_nf_mod");
+	asir_assert(ARG1(arg),O_DP,"dp_nf_mod");
+	asir_assert(ARG2(arg),O_VECT,"dp_nf_mod");
+	asir_assert(ARG3(arg),O_N,"dp_nf_mod");
+	asir_assert(ARG4(arg),O_N,"dp_nf_mod");
+	if ( !(g = (DP)ARG1(arg)) ) {
+		*rp = 0; return;
+	}
+	b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg));
+	full = QTOS((Q)ARG3(arg)); mod = QTOS((Q)ARG4(arg));
+	for ( n0 = n = 0; b; b = NEXT(b) ) {
+		NEXTNODE(n0,n);
+		BDY(n) = (pointer)QTOS((Q)BDY(b));
+	}
+	if ( n0 )
+		NEXT(n) = 0;
+	dp_nf_mod(n0,g,ps,mod,full,rp);
+}
+
 void Pdp_true_nf(arg,rp)
 NODE arg;
 LIST *rp;
@@ -532,7 +575,7 @@ LIST *rp;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
 }
 
-void Pdp_nf_mod(arg,rp)
+void Pdp_weyl_nf_mod(arg,rp)
 NODE arg;
 DP *rp;
 {
@@ -542,13 +585,12 @@ DP *rp;
 	int mod,full,ac;
 	NODE n,n0;
 
-	do_weyl = 0;
 	ac = argc(arg);
-	asir_assert(ARG0(arg),O_LIST,"dp_nf_mod");
-	asir_assert(ARG1(arg),O_DP,"dp_nf_mod");
-	asir_assert(ARG2(arg),O_VECT,"dp_nf_mod");
-	asir_assert(ARG3(arg),O_N,"dp_nf_mod");
-	asir_assert(ARG4(arg),O_N,"dp_nf_mod");
+	asir_assert(ARG0(arg),O_LIST,"dp_weyl_nf_mod");
+	asir_assert(ARG1(arg),O_DP,"dp_weyl_nf_mod");
+	asir_assert(ARG2(arg),O_VECT,"dp_weyl_nf_mod");
+	asir_assert(ARG3(arg),O_N,"dp_weyl_nf_mod");
+	asir_assert(ARG4(arg),O_N,"dp_weyl_nf_mod");
 	if ( !(g = (DP)ARG1(arg)) ) {
 		*rp = 0; return;
 	}
@@ -560,7 +602,9 @@ DP *rp;
 	}
 	if ( n0 )
 		NEXT(n) = 0;
-	dp_nf_mod(n,g,ps,mod,full,rp);
+	do_weyl = 1;
+	dp_nf_mod(n0,g,ps,mod,full,rp);
+	do_weyl = 0;
 }
 
 void Pdp_true_nf_mod(arg,rp)
@@ -680,6 +724,7 @@ LIST *rp;
 	NEWNODE(NEXT(n)); BDY(NEXT(n)) = (pointer)r;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
 }
+
 void Pdp_subd(arg,rp)
 NODE arg;
 DP *rp;
@@ -692,6 +737,35 @@ DP *rp;
 	dp_subd(p1,p2,rp);
 }
 
+void Pdp_weyl_mul(arg,rp)
+NODE arg;
+DP *rp;
+{
+	DP p1,p2;
+
+	p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg);
+	asir_assert(p1,O_DP,"dp_weyl_mul"); asir_assert(p2,O_DP,"dp_mul");
+	do_weyl = 1;
+	muld(CO,p1,p2,rp);
+	do_weyl = 0;
+}
+
+void Pdp_weyl_mul_mod(arg,rp)
+NODE arg;
+DP *rp;
+{
+	DP p1,p2;
+	Q m;
+
+	p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); m = (Q)ARG2(arg);
+	asir_assert(p1,O_DP,"dp_weyl_mul_mod");
+	asir_assert(p2,O_DP,"dp_mul_mod");
+	asir_assert(m,O_N,"dp_mul_mod");
+	do_weyl = 1;
+	mulmd(CO,QTOS(m),p1,p2,rp);
+	do_weyl = 0;
+}
+
 void Pdp_red(arg,rp)
 NODE arg;
 LIST *rp;
@@ -718,11 +792,12 @@ LIST *rp;
 	DP head,rest,dmy1;
 	P dmy;
 
-	do_weyl = 1;
 	asir_assert(ARG0(arg),O_DP,"dp_weyl_red");
 	asir_assert(ARG1(arg),O_DP,"dp_weyl_red");
 	asir_assert(ARG2(arg),O_DP,"dp_weyl_red");
+	do_weyl = 1;
 	dp_red((DP)ARG0(arg),(DP)ARG1(arg),(DP)ARG2(arg),&head,&rest,&dmy,&dmy1);
+	do_weyl = 0;
 	NEWNODE(n); BDY(n) = (pointer)head;
 	NEWNODE(NEXT(n)); BDY(NEXT(n)) = (pointer)rest;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
@@ -746,10 +821,11 @@ DP *rp;
 {
 	DP p1,p2;
 
-	do_weyl = 1;
 	p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg);
 	asir_assert(p1,O_DP,"dp_weyl_sp"); asir_assert(p2,O_DP,"dp_sp");
+	do_weyl = 1;
 	dp_sp(p1,p2,rp);
+	do_weyl = 0;
 }
 
 void Pdp_sp_mod(arg,rp)
@@ -1172,7 +1248,6 @@ LIST *rp;
 	int modular;
 	struct order_spec ord;
 
-	do_weyl = 1;
 	asir_assert(ARG0(arg),O_LIST,"dp_weyl_gr_main");
 	asir_assert(ARG1(arg),O_LIST,"dp_weyl_gr_main");
 	asir_assert(ARG2(arg),O_N,"dp_weyl_gr_main");
@@ -1187,7 +1262,9 @@ LIST *rp;
 	else
 		modular = QTOS(m);
 	create_order_spec(ARG4(arg),&ord);
+	do_weyl = 1;
 	dp_gr_main(f,v,homo,modular,&ord,rp);
+	do_weyl = 0;
 }
 
 void Pdp_weyl_f4_main(arg,rp)
@@ -1197,12 +1274,13 @@ LIST *rp;
 	LIST f,v;
 	struct order_spec ord;
 
-	do_weyl = 1;
 	asir_assert(ARG0(arg),O_LIST,"dp_weyl_f4_main");
 	asir_assert(ARG1(arg),O_LIST,"dp_weyl_f4_main");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
 	create_order_spec(ARG2(arg),&ord);
+	do_weyl = 1;
 	dp_f4_main(f,v,&ord,rp);
+	do_weyl = 0;
 }
 
 void Pdp_weyl_f4_mod_main(arg,rp)
@@ -1213,13 +1291,14 @@ LIST *rp;
 	int m;
 	struct order_spec ord;
 
-	do_weyl = 1;
 	asir_assert(ARG0(arg),O_LIST,"dp_weyl_f4_main");
 	asir_assert(ARG1(arg),O_LIST,"dp_weyl_f4_main");
 	asir_assert(ARG2(arg),O_N,"dp_f4_main");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); m = QTOS((Q)ARG2(arg));
 	create_order_spec(ARG3(arg),&ord);
+	do_weyl = 1;
 	dp_f4_mod_main(f,v,m,&ord,rp);
+	do_weyl = 0;
 }
 
 void Pdp_weyl_gr_mod_main(arg,rp)
@@ -1231,7 +1310,6 @@ LIST *rp;
 	int m;
 	struct order_spec ord;
 
-	do_weyl = 1;
 	asir_assert(ARG0(arg),O_LIST,"dp_weyl_gr_mod_main");
 	asir_assert(ARG1(arg),O_LIST,"dp_weyl_gr_mod_main");
 	asir_assert(ARG2(arg),O_N,"dp_weyl_gr_mod_main");
@@ -1239,6 +1317,31 @@ LIST *rp;
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
 	homo = (Num)ARG2(arg); m = QTOS((Q)ARG3(arg));
 	create_order_spec(ARG4(arg),&ord);
+	do_weyl = 1;
 	dp_gr_mod_main(f,v,homo,m,&ord,rp);
+	do_weyl = 0;
 }
 
+static VECT current_weight_vector_obj;
+int *current_weight_vector;
+
+void Pdp_weyl_set_weight(arg,rp)
+NODE arg;
+VECT *rp;
+{
+	VECT v;
+	int i,n;
+
+	if ( !arg )
+		*rp = current_weight_vector_obj;
+	else {
+		asir_assert(ARG0(arg),O_VECT,"dp_weyl_set_weight");
+		v = (VECT)ARG0(arg);
+		current_weight_vector_obj = v;
+		n = v->len;
+		current_weight_vector = (int *)CALLOC(n,sizeof(int));
+		for ( i = 0; i < n; i++ )
+			current_weight_vector[i] = QTOS((Q)v->body[i]);
+		*rp = v;
+	}
+}