===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.83
retrieving revision 1.94
diff -u -p -r1.83 -r1.94
--- OpenXM_contrib2/asir2000/builtin/dp.c	2010/09/27 05:05:58	1.83
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2015/01/13 00:54:54	1.94
@@ -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.82 2010/05/01 02:17:49 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.93 2014/10/10 09:02:24 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -56,6 +56,7 @@ extern int dp_order_pair_length;
 extern struct order_pair *dp_order_pair;
 extern struct order_spec *dp_current_spec;
 extern struct modorder_spec *dp_current_modspec;
+extern int nd_rref2;
 
 int do_weyl;
 
@@ -96,6 +97,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();
@@ -107,11 +109,14 @@ void Pdp_compute_essential_df();
 void Pdp_get_denomlist();
 void Pdp_symb_add();
 void Pdp_mono_raddec();
+void Pdp_mono_reduce();
+void Pdp_rref2();
 
 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);
 
@@ -162,6 +167,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},
@@ -268,7 +275,10 @@ struct ftab dp_supp_tab[] = {
 	{"dp_compute_last_t",Pdp_compute_last_t,5},
 	{"dp_compute_essential_df",Pdp_compute_essential_df,2},
 	{"dp_mono_raddec",Pdp_mono_raddec,2},
+	{"dp_mono_reduce",Pdp_mono_reduce,2},
 
+	{"dp_rref2",Pdp_rref2,2},
+
 	{0,0,0}
 };
 
@@ -1276,6 +1286,8 @@ DP *rp;
 	p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg);
 	asir_assert(p1,O_DP,"dp_symb_add");
 	asir_assert(p2,O_DP,"dp_symb_add");
+	if ( !p1 ) { *rp = p2; return; }
+	else if ( !p2 ) { *rp = p1; return; }
 	if ( p1->nv != p2->nv )
 		error("dp_sumb_add : invalid input");
 	nv = p1->nv;
@@ -2133,11 +2145,12 @@ 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;
+	nd_rref2 = 0;
 	asir_assert(ARG0(arg),O_LIST,"nd_f4");
 	asir_assert(ARG1(arg),O_LIST,"nd_f4");
 	asir_assert(ARG2(arg),O_N,"nd_f4");
@@ -2148,8 +2161,11 @@ 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;
+	if ( get_opt("rref2",&val) && val ) nd_rref2 = 1;
+	nd_gr(f,v,m,homo,retdp,1,ord,rp);
 }
 
 void Pnd_gr(arg,rp)
@@ -2157,8 +2173,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;
@@ -2172,8 +2188,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)
@@ -2199,6 +2217,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;
@@ -2276,8 +2342,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;
@@ -2291,8 +2357,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;
 }
 
@@ -2576,44 +2644,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;
 	}
 }
 
@@ -2632,6 +2707,7 @@ NODE arg;
 VECT *rp;
 {
 	VECT v;
+	NODE node;
 	int i,n;
 
 	if ( !arg )
@@ -2641,8 +2717,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));
@@ -2693,6 +2778,135 @@ void Pdp_mono_raddec(NODE arg,LIST *rp)
 	}
 }
 
+void Pdp_mono_reduce(NODE arg,LIST *rp)
+{
+	NODE t,t0,t1,r0,r;
+	int i,n;
+	DP m;
+	DP *a;
+
+	t0 = BDY((LIST)ARG0(arg));
+	t1 = BDY((LIST)ARG1(arg));
+	n = length(t0);
+	a = (DP *)MALLOC(n*sizeof(DP));
+	for ( i = 0; i < n; i++, t0 = NEXT(t0) ) a[i] = (DP)BDY(t0);
+	for ( t = t1; t; t = NEXT(t) ) {
+		m = (DP)BDY(t);
+		for ( i = 0; i < n; i++ )
+			if ( a[i] && dp_redble(a[i],m) ) a[i] = 0;
+	}
+	for ( i = n-1, r0 = 0; i >= 0; i-- )
+		if ( a[i] ) { NEXTNODE(r0,r); BDY(r) = a[i]; }
+	if ( r0 ) NEXT(r) = 0;
+	MKLIST(*rp,r0);
+}
+
+#define BLEN (8*sizeof(unsigned long))
+
+void showmat2(unsigned long **a,int row,int col)
+{
+  int i,j;
+
+  for ( i = 0; i < row; i++, putchar('\n') )
+    for ( j = 0; j < col; j++ )
+	    if ( a[i][j/BLEN] & (1L<<(j%BLEN)) ) putchar('1');
+      else putchar('0');
+}
+
+int rref2(unsigned long **a,int row,int col)
+{
+  int i,j,k,l,s,wcol,wj;
+  unsigned long bj;
+  unsigned long *ai,*ak,*as,*t;
+  int *pivot;
+
+  wcol = (col+BLEN-1)/BLEN; 
+  pivot = (int *)MALLOC_ATOMIC(row*sizeof(int));
+  i = 0;
+  for ( j = 0; j < col; j++ ) {
+	  wj = j/BLEN; bj = 1L<<(j%BLEN);
+    for ( k = i; k < row; k++ )
+  	  if ( a[k][wj] & bj ) break;
+    if ( k == row ) continue;
+    pivot[i] = j;
+    if ( k != i ) {
+     t = a[i]; a[i] = a[k]; a[k] = t;
+	  }
+	  ai = a[i];
+    for ( k = i+1; k < row; k++ ) {
+	    ak = a[k];
+	    if ( ak[wj] & bj ) {
+	      for ( l = wj; l < wcol; l++ )
+		      ak[l] ^= ai[l];
+	    }
+	  }
+  	i++;
+  }
+  for ( k = i-1; k >= 0; k-- ) {
+    j = pivot[k]; wj = j/BLEN; bj = 1L<<(j%BLEN);
+	  ak = a[k];
+    for ( s = 0; s < k; s++ ) {
+	    as = a[s];
+      if ( as[wj] & bj ) {
+        for ( l = wj; l < wcol; l++ )
+		      as[l] ^= ak[l];
+	    }
+	  }
+  }
+  return i;
+}
+
+void Pdp_rref2(NODE arg,VECT *rp)
+{
+  VECT f,term,ret;
+  int row,col,wcol,size,nv,i,j,rank,td;
+  unsigned long **mat;
+  unsigned long *v;
+  DL d;
+  DL *t;
+  DP dp;
+  MP m,m0;
+
+  f = (VECT)ARG0(arg);
+  row = f->len;
+  term = (VECT)ARG1(arg);
+  col = term->len; 
+  mat = (unsigned long **)MALLOC(row*sizeof(unsigned long *));
+  size = sizeof(unsigned long)*((col+BLEN-1)/BLEN);
+  nv = ((DP)term->body[0])->nv;
+  t = (DL *)MALLOC(col*sizeof(DL));
+  for ( i = 0; i < col; i++ ) t[i] = BDY((DP)BDY(term)[i])->dl;
+  for ( i = 0; i < row; i++ ) {
+    v = mat[i] = (unsigned long *)MALLOC_ATOMIC_IGNORE_OFF_PAGE(size);
+	bzero(v,size);
+	for ( j = 0, m = BDY((DP)BDY(f)[i]); m; m = NEXT(m) ) {
+	  d = m->dl;
+	  for ( ; !dl_equal(nv,d,t[j]); j++ );
+	  v[j/BLEN] |= 1L <<(j%BLEN);
+	}
+  }
+  rank = rref2(mat,row,col);
+  MKVECT(ret,rank);
+  *rp = ret;
+  for ( i = 0; i < rank; i++ ) {
+    v = mat[i];
+	m0 = 0;
+	td = 0;
+    for ( j = 0; j < col; j++ ) {
+	  if ( v[j/BLEN] & (1L<<(j%BLEN)) ) {
+	    NEXTMP(m0,m);
+		m->dl = t[j];
+		m->c = (P)ONE;
+	    td = MAX(td,m->dl->td);
+	  }
+	}
+	NEXT(m) = 0;
+	MKDP(nv,m0,dp);
+	dp->sugar = td;
+    BDY(ret)[i] = (pointer)dp;
+  }
+}
+
 LIST remove_zero_from_list(LIST l)
 {
 	NODE n,r0,r;
@@ -2875,4 +3089,3 @@ int get_opt(char *key0,Obj *r) {
    }
    return 0;
 }
-