===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.21
retrieving revision 1.28
diff -u -p -r1.21 -r1.28
--- OpenXM_contrib2/asir2000/builtin/dp.c	2001/10/09 01:36:05	1.21
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2003/01/15 04:53:03	1.28
@@ -45,13 +45,12 @@
  * 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.20 2001/10/05 10:23:06 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.27 2003/01/06 01:16:37 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
 #include "parse.h"
 
-extern int dp_fcoeffs;
 extern int dp_nelim;
 extern int dp_order_pair_length;
 extern struct order_pair *dp_order_pair;
@@ -73,9 +72,10 @@ 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_f4_main(),Pdp_f4_mod_main(),Pdp_f4_f_main();
 void Pdp_gr_print();
-void Pdp_mbase(),Pdp_lnf_mod(),Pdp_nf_tab_mod(),Pdp_mdtod();
+void Pdp_mbase(),Pdp_lnf_mod(),Pdp_nf_tab_mod(),Pdp_mdtod(), Pdp_nf_tab_f();
 void Pdp_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), Pdp_sep();
 void Pdp_cont();
+void Pdp_gr_checklist();
 
 void Pdp_weyl_red();
 void Pdp_weyl_sp();
@@ -84,9 +84,12 @@ void Pdp_weyl_gr_main(),Pdp_weyl_gr_mod_main(),Pdp_wey
 void Pdp_weyl_f4_main(),Pdp_weyl_f4_mod_main(),Pdp_weyl_f4_f_main();
 void Pdp_weyl_mul(),Pdp_weyl_mul_mod();
 void Pdp_weyl_set_weight();
+void Pdp_set_weight();
 void Pdp_nf_f(),Pdp_weyl_nf_f();
 void Pdp_lnf_f();
 
+LIST remove_zero_from_list(LIST);
+
 struct ftab dp_tab[] = {
 	/* content reduction */
 	{"dp_ptozp",Pdp_ptozp,1},
@@ -111,6 +114,7 @@ struct ftab dp_tab[] = {
 	{"dp_nf_mod",Pdp_nf_mod,5},
 	{"dp_true_nf_mod",Pdp_true_nf_mod,5},
 	{"dp_lnf_mod",Pdp_lnf_mod,3},
+	{"dp_nf_tab_f",Pdp_nf_tab_f,2},
 	{"dp_nf_tab_mod",Pdp_nf_tab_mod,3},
 	{"dp_lnf_f",Pdp_lnf_f,2},
 
@@ -118,6 +122,7 @@ struct ftab dp_tab[] = {
 	{"dp_gr_main",Pdp_gr_main,5},
 	{"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},
 
 	/* F4 algorithm */
 	{"dp_f4_main",Pdp_f4_main,3},
@@ -149,6 +154,7 @@ struct ftab dp_tab[] = {
 	{"dp_weyl_f4_mod_main",Pdp_weyl_f4_mod_main,4},
 
 	/* misc */
+	{"dp_set_weight",Pdp_set_weight,-1},
 	{"dp_weyl_set_weight",Pdp_weyl_set_weight,-1},
 	{0,0,0},
 };
@@ -318,7 +324,7 @@ DP *rp;
 	n = v->len;
 	NEWDL(dl,n); d = dl->d;
 	for ( i = 0, td = 0; i < n; i++ ) {
-		d[i] = QTOS((Q)(v->body[i])); td += d[i];
+		d[i] = QTOS((Q)(v->body[i])); td += MUL_WEIGHT(d[i],i);
 	}
 	dl->td = td;
 	NEWMP(m); m->dl = dl; m->c = (P)ONE; NEXT(m) = 0;
@@ -372,6 +378,15 @@ DP *rp;
 		QTOS((Q)ARG2(arg)),rp);
 }
 
+void Pdp_nf_tab_f(arg,rp)
+NODE arg;
+DP *rp;
+{
+	asir_assert(ARG0(arg),O_DP,"dp_nf_tab_f");
+	asir_assert(ARG1(arg),O_VECT,"dp_nf_tab_f");
+	dp_nf_tab_f((DP)ARG0(arg),(LIST *)BDY((VECT)ARG1(arg)),rp);
+}
+
 void Pdp_ord(arg,rp)
 NODE arg;
 Obj *rp;
@@ -927,7 +942,7 @@ DP *rp;
 	n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl;
 	NEWDL(d,n);
 	for ( i = 0, td = 0; i < n; i++ ) {
-		d->d[i] = MAX(d1->d[i],d2->d[i]); td += d->d[i];
+		d->d[i] = MAX(d1->d[i],d2->d[i]); td += MUL_WEIGHT(d->d[i],i);
 	}
 	d->td = td;
 	NEWMP(m); m->dl = d; m->c = (P)ONE; NEXT(m) = 0;
@@ -1242,6 +1257,10 @@ LIST *rp;
 	asir_assert(ARG2(arg),O_N,"dp_gr_main");
 	asir_assert(ARG3(arg),O_N,"dp_gr_main");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
 	homo = (Num)ARG2(arg);
 	m = (Q)ARG3(arg);
 	if ( !m )
@@ -1260,16 +1279,43 @@ LIST *rp;
 {
 	LIST f,v;
 	Num homo;
+	int m,field,t;
 	struct order_spec ord;
+	NODE n;
 
 	do_weyl = 0;
 	asir_assert(ARG0(arg),O_LIST,"dp_gr_f_main");
 	asir_assert(ARG1(arg),O_LIST,"dp_gr_f_main");
 	asir_assert(ARG2(arg),O_N,"dp_gr_f_main");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
 	homo = (Num)ARG2(arg);
+#if 0
+	asir_assert(ARG3(arg),O_N,"dp_gr_f_main");
+	m = QTOS((Q)ARG3(arg));
+	if ( m )
+		error("dp_gr_f_main : trace lifting is not implemented yet");
+	create_order_spec(ARG4(arg),&ord);
+#else
+	m = 0;
 	create_order_spec(ARG3(arg),&ord);
-	dp_gr_main(f,v,homo,0,1,&ord,rp);
+#endif
+	field = 0;
+	for ( n = BDY(f); n; n = NEXT(n) ) {
+		t = get_field_type(BDY(n));
+		if ( !t )
+			continue;
+		if ( t < 0 )
+			error("dp_gr_f_main : incosistent coefficients");
+		if ( !field )
+			field = t;
+		else if ( t != field )
+			error("dp_gr_f_main : incosistent coefficients");
+	}
+	dp_gr_main(f,v,homo,m?1:0,field,&ord,rp);
 }
 
 void Pdp_f4_main(arg,rp)
@@ -1283,10 +1329,34 @@ LIST *rp;
 	asir_assert(ARG0(arg),O_LIST,"dp_f4_main");
 	asir_assert(ARG1(arg),O_LIST,"dp_f4_main");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
 	create_order_spec(ARG2(arg),&ord);
 	dp_f4_main(f,v,&ord,rp);
 }
 
+/* dp_gr_checklist(list of dp) */
+
+void Pdp_gr_checklist(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	VECT g;
+	LIST dp;
+	NODE r;
+	int n;
+
+	do_weyl = 0;
+	asir_assert(ARG0(arg),O_LIST,"dp_gr_checklist");
+	asir_assert(ARG1(arg),O_N,"dp_gr_checklist");
+	n = QTOS((Q)ARG1(arg));
+	gbcheck_list(BDY((LIST)ARG0(arg)),n,&g,&dp);
+	r = mknode(2,g,dp);
+	MKLIST(*rp,r);
+}
+
 void Pdp_f4_mod_main(arg,rp)
 NODE arg;
 LIST *rp;
@@ -1300,6 +1370,10 @@ LIST *rp;
 	asir_assert(ARG1(arg),O_LIST,"dp_f4_mod_main");
 	asir_assert(ARG2(arg),O_N,"dp_f4_mod_main");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); m = QTOS((Q)ARG2(arg));
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
 	if ( !m )
 		error("dp_f4_mod_main : invalid argument");
 	create_order_spec(ARG3(arg),&ord);
@@ -1321,6 +1395,10 @@ LIST *rp;
 	asir_assert(ARG2(arg),O_N,"dp_gr_mod_main");
 	asir_assert(ARG3(arg),O_N,"dp_gr_mod_main");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
 	homo = (Num)ARG2(arg); m = QTOS((Q)ARG3(arg));
 	if ( !m )
 		error("dp_gr_mod_main : invalid argument");
@@ -1345,6 +1423,10 @@ LIST *rp;
 	asir_assert(ARG2(arg),O_N,"dp_weyl_gr_main");
 	asir_assert(ARG3(arg),O_N,"dp_weyl_gr_main");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
 	homo = (Num)ARG2(arg);
 	m = (Q)ARG3(arg);
 	if ( !m )
@@ -1372,6 +1454,10 @@ LIST *rp;
 	asir_assert(ARG2(arg),O_N,"dp_weyl_gr_main");
 	asir_assert(ARG3(arg),O_N,"dp_weyl_gr_main");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
 	homo = (Num)ARG2(arg);
 	create_order_spec(ARG3(arg),&ord);
 	do_weyl = 1;
@@ -1389,6 +1475,10 @@ LIST *rp;
 	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);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
 	create_order_spec(ARG2(arg),&ord);
 	do_weyl = 1;
 	dp_f4_main(f,v,&ord,rp);
@@ -1407,6 +1497,10 @@ LIST *rp;
 	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));
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
 	if ( !m )
 		error("dp_weyl_f4_mod_main : invalid argument");
 	create_order_spec(ARG3(arg),&ord);
@@ -1429,6 +1523,10 @@ LIST *rp;
 	asir_assert(ARG2(arg),O_N,"dp_weyl_gr_mod_main");
 	asir_assert(ARG3(arg),O_N,"dp_weyl_gr_mod_main");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
 	homo = (Num)ARG2(arg); m = QTOS((Q)ARG3(arg));
 	if ( !m )
 		error("dp_weyl_gr_mod_main : invalid argument");
@@ -1438,9 +1536,37 @@ LIST *rp;
 	do_weyl = 0;
 }
 
-static VECT current_weight_vector_obj;
-int *current_weight_vector;
+static VECT current_dl_weight_vector_obj;
+int *current_dl_weight_vector;
 
+void Pdp_set_weight(arg,rp)
+NODE arg;
+VECT *rp;
+{
+	VECT v;
+	int i,n;
+
+	if ( !arg )
+		*rp = current_dl_weight_vector_obj;
+	else if ( !ARG0(arg) ) {
+		current_dl_weight_vector_obj = 0;
+		current_dl_weight_vector = 0;
+		*rp = 0;
+	} else {
+		asir_assert(ARG0(arg),O_VECT,"dp_set_weight");
+		v = (VECT)ARG0(arg);
+		current_dl_weight_vector_obj = v;
+		n = v->len;
+		current_dl_weight_vector = (int *)CALLOC(n,sizeof(int));
+		for ( i = 0; i < n; i++ )
+			current_dl_weight_vector[i] = QTOS((Q)v->body[i]);
+		*rp = v;
+	}
+}
+
+static VECT current_weyl_weight_vector_obj;
+int *current_weyl_weight_vector;
+
 void Pdp_weyl_set_weight(arg,rp)
 NODE arg;
 VECT *rp;
@@ -1449,15 +1575,59 @@ VECT *rp;
 	int i,n;
 
 	if ( !arg )
-		*rp = current_weight_vector_obj;
+		*rp = current_weyl_weight_vector_obj;
 	else {
 		asir_assert(ARG0(arg),O_VECT,"dp_weyl_set_weight");
 		v = (VECT)ARG0(arg);
-		current_weight_vector_obj = v;
+		current_weyl_weight_vector_obj = v;
 		n = v->len;
-		current_weight_vector = (int *)CALLOC(n,sizeof(int));
+		current_weyl_weight_vector = (int *)CALLOC(n,sizeof(int));
 		for ( i = 0; i < n; i++ )
-			current_weight_vector[i] = QTOS((Q)v->body[i]);
+			current_weyl_weight_vector[i] = QTOS((Q)v->body[i]);
 		*rp = v;
+	}
+}
+
+LIST remove_zero_from_list(LIST l)
+{
+	NODE n,r0,r;
+	LIST rl;
+
+	asir_assert(l,O_LIST,"remove_zero_from_list");
+	n = BDY(l);
+	for ( r0 = 0; n; n = NEXT(n) )
+		if ( BDY(n) ) {
+			NEXTNODE(r0,r);
+			BDY(r) = BDY(n);
+		}
+	if ( r0 )
+		NEXT(r) = 0;
+	MKLIST(rl,r0);
+	return rl;
+}
+
+int get_field_type(P p)
+{
+	int type,t;
+	DCP dc;
+
+	if ( !p )
+		return 0;
+	else if ( NUM(p) )
+		return NID((Num)p);
+	else {
+		type = 0;
+		for ( dc = DC(p); dc; dc = NEXT(dc) ) {
+			t = get_field_type(COEF(dc));
+			if ( !t )
+				continue;
+			if ( t < 0 )
+				return t;
+			if ( !type )
+				type = t;
+			else if ( t != type )
+				return -1;
+		}
+		return type;
 	}
 }