===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.86
retrieving revision 1.91
diff -u -p -r1.86 -r1.91
--- OpenXM_contrib2/asir2000/builtin/dp.c	2012/04/10 07:15:07	1.86
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2013/09/12 06:46:16	1.91
@@ -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.85 2011/03/30 02:43:18 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.90 2013/09/09 09:47:09 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -96,7 +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();
+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();
@@ -114,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);
 
@@ -165,6 +166,7 @@ struct ftab dp_tab[] = {
 	{"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},
@@ -2137,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;
@@ -2152,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)
@@ -2161,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;
@@ -2176,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)
@@ -2222,6 +2228,35 @@ LIST *rp;
 	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;
@@ -2299,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;
@@ -2314,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;
 }