===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.84
retrieving revision 1.93
diff -u -p -r1.84 -r1.93
--- OpenXM_contrib2/asir2000/builtin/dp.c	2011/02/18 02:54:48	1.84
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2014/10/10 09:02:24	1.93
@@ -44,7 +44,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.83 2010/09/27 05:05:58 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.92 2014/08/19 06:35:01 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -96,6 +96,7 @@ void Pdp_nf_f(),Pdp_weyl_nf_f();
 void Pdp_lnf_f();
 void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(),Pnd_f4_trace();
 void Pnd_gr_postproc(), Pnd_weyl_gr_postproc();
+void Pnd_gr_recompute_trace(), Pnd_btog();
 void Pnd_weyl_gr(),Pnd_weyl_gr_trace();
 void Pnd_nf(),Pnd_weyl_nf();
 void Pdp_initial_term();
@@ -113,6 +114,7 @@ LIST dp_initial_term();
 LIST dp_order();
 void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo,
 	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);
 
@@ -163,6 +165,8 @@ struct ftab dp_tab[] = {
 	{"nd_gr_trace",Pnd_gr_trace,5},
 	{"nd_f4_trace",Pnd_f4_trace,5},
 	{"nd_gr_postproc",Pnd_gr_postproc,5},
+	{"nd_gr_recompute_trace",Pnd_gr_recompute_trace,5},
+	{"nd_btog",Pnd_btog,-6},
 	{"nd_weyl_gr_postproc",Pnd_weyl_gr_postproc,5},
 	{"nd_weyl_gr",Pnd_weyl_gr,4},
 	{"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5},
@@ -2135,8 +2139,8 @@ NODE arg;
 LIST *rp;
 {
 	LIST f,v;
-	int m,find;
-	Obj homo;
+	int m,homo,retdp;
+	Obj val;
 	struct order_spec *ord;
 
 	do_weyl = 0;
@@ -2150,8 +2154,10 @@ LIST *rp;
 	}
 	m = QTOS((Q)ARG2(arg));
 	create_order_spec(0,ARG3(arg),&ord);
-	find = get_opt("homo",&homo);
-	nd_gr(f,v,m,find&&homo,1,ord,rp);
+	homo = retdp = 0;
+	if ( get_opt("homo",&val) && val ) homo = 1;
+	if ( get_opt("dp",&val) && val ) retdp = 1;
+	nd_gr(f,v,m,homo,retdp,1,ord,rp);
 }
 
 void Pnd_gr(arg,rp)
@@ -2159,8 +2165,8 @@ NODE arg;
 LIST *rp;
 {
 	LIST f,v;
-	int m,find;
-	Obj homo;
+	int m,homo,retdp;
+	Obj val;
 	struct order_spec *ord;
 
 	do_weyl = 0;
@@ -2174,8 +2180,10 @@ LIST *rp;
 	}
 	m = QTOS((Q)ARG2(arg));
 	create_order_spec(0,ARG3(arg),&ord);
-	find = get_opt("homo",&homo);
-	nd_gr(f,v,m,find&&homo,0,ord,rp);
+	homo = retdp = 0;
+	if ( get_opt("homo",&val) && val ) homo = 1;
+	if ( get_opt("dp",&val) && val ) retdp = 1;
+	nd_gr(f,v,m,homo,retdp,0,ord,rp);
 }
 
 void Pnd_gr_postproc(arg,rp)
@@ -2201,6 +2209,54 @@ LIST *rp;
 	nd_gr_postproc(f,v,m,ord,do_check,rp);
 }
 
+void Pnd_gr_recompute_trace(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	LIST f,v,tlist;
+	int m;
+	struct order_spec *ord;
+
+	do_weyl = 0;
+	asir_assert(ARG0(arg),O_LIST,"nd_gr_recompute_trace");
+	asir_assert(ARG1(arg),O_LIST,"nd_gr_recompute_trace");
+	asir_assert(ARG2(arg),O_N,"nd_gr_recompute_trace");
+	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	m = QTOS((Q)ARG2(arg));
+	create_order_spec(0,ARG3(arg),&ord);
+	tlist = (LIST)ARG4(arg);
+	nd_gr_recompute_trace(f,v,m,ord,tlist,rp);
+}
+
+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)
 NODE arg;
 LIST *rp;
@@ -2278,8 +2334,8 @@ NODE arg;
 LIST *rp;
 {
 	LIST f,v;
-	int m,find;
-	Obj homo;
+	int m,homo,retdp;
+	Obj val;
 	struct order_spec *ord;
 
 	do_weyl = 1;
@@ -2293,8 +2349,10 @@ LIST *rp;
 	}
 	m = QTOS((Q)ARG2(arg));
 	create_order_spec(0,ARG3(arg),&ord);
-	find = get_opt("homo",&homo);
-	nd_gr(f,v,m,find&&homo,0,ord,rp);
+	homo = retdp = 0;
+	if ( get_opt("homo",&val) && val ) homo = 1;
+	if ( get_opt("dp",&val) && val ) retdp = 1;
+	nd_gr(f,v,m,homo,retdp,0,ord,rp);
 	do_weyl = 0;
 }
 
@@ -2578,44 +2636,51 @@ VECT *rp;
 	}
 }
 
-VECT current_top_weight_vector_obj;
-N *current_top_weight_vector;
+extern Obj current_top_weight;
+extern Obj nd_top_weight;
 
-void Pdp_set_top_weight(arg,rp)
-NODE arg;
-VECT *rp;
+void Pdp_set_top_weight(NODE arg,Obj *rp)
 {
 	VECT v;
-	int i,n;
+	MAT m;
+	Obj obj;
+	int i,j,n,id,row,col;
+	Q *mi;
 	NODE node;
 
 	if ( !arg )
-		*rp = current_top_weight_vector_obj;
+		*rp = current_top_weight;
 	else if ( !ARG0(arg) ) {
-		current_top_weight_vector = 0;
-		current_top_weight_vector_obj = 0;
+		reset_top_weight();
 		*rp = 0;
 	} else {
-		if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST )
+		id = OID(ARG0(arg));
+		if ( id != O_VECT && id != O_MAT && id != O_LIST )
 			error("dp_set_top_weight : invalid argument");
-		if ( OID(ARG0(arg)) == O_VECT )
-			v = (VECT)ARG0(arg);
-		else {
+		if ( id == O_LIST ) {
 			node = (NODE)BDY((LIST)ARG0(arg));
 			n = length(node);
 			MKVECT(v,n);
 			for ( i = 0; i < n; i++, node = NEXT(node) )
 				BDY(v)[i] = BDY(node);
+		    obj = v;
+		} else
+		    obj = ARG0(arg);
+		if ( OID(obj) == O_VECT ) {
+			v = (VECT)obj;
+		    for ( i = 0; i < v->len; i++ )
+			    if ( !INT(BDY(v)[i]) || (BDY(v)[i] && SGN((Q)BDY(v)[i]) < 0) )
+				    error("dp_set_top_weight : each element must be a non-negative integer");
+		} else {
+			m = (MAT)obj; row = m->row; col = m->col;
+		    for ( i = 0; i < row; i++ )
+				for ( j = 0, mi = (Q *)BDY(m)[i]; j < col; j++ )
+			        if ( !INT(mi[j]) || (mi[j] && SGN((Q)mi[j]) < 0) )
+				        error("dp_set_top_weight : each element must be a non-negative integer");
 		}
-		for ( i = 0; i < v->len; i++ )
-			if ( !INT(BDY(v)[i]) || (BDY(v)[i] && SGN((Q)BDY(v)[i]) < 0) )
-				error("dp_set_top_weight : each element must be a non-negative integer");
-		current_top_weight_vector_obj = v;
-		current_top_weight_vector = (N *)MALLOC(v->len*sizeof(N));
-		for ( i = 0; i < v->len; i++ ) {
-			current_top_weight_vector[i] = !BDY(v)[i]?0:NM((Q)BDY(v)[i]);
-		}
-		*rp = current_top_weight_vector_obj;
+        current_top_weight = obj;
+		nd_top_weight = obj;
+		*rp = current_top_weight;
 	}
 }
 
@@ -2634,6 +2699,7 @@ NODE arg;
 VECT *rp;
 {
 	VECT v;
+	NODE node;
 	int i,n;
 
 	if ( !arg )
@@ -2643,8 +2709,17 @@ VECT *rp;
 		current_weyl_weight_vector = 0;
 		*rp = 0;
 	} else {
-		asir_assert(ARG0(arg),O_VECT,"dp_weyl_set_weight");
-		v = (VECT)ARG0(arg);
+		if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST )
+			error("dp_weyl_set_weight : invalid argument");
+		if ( OID(ARG0(arg)) == O_VECT )
+			v = (VECT)ARG0(arg);
+		else {
+			node = (NODE)BDY((LIST)ARG0(arg));
+			n = length(node);
+			MKVECT(v,n);
+			for ( i = 0; i < n; i++, node = NEXT(node) )
+				BDY(v)[i] = BDY(node);
+		}
 		current_weyl_weight_vector_obj = v;
 		n = v->len;
 		current_weyl_weight_vector = (int *)CALLOC(n,sizeof(int));
@@ -2900,4 +2975,3 @@ int get_opt(char *key0,Obj *r) {
    }
    return 0;
 }
-