===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/num.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- OpenXM_contrib2/asir2000/engine/num.c	2001/09/05 09:01:27	1.5
+++ OpenXM_contrib2/asir2000/engine/num.c	2001/10/09 01:36:13	1.6
@@ -45,62 +45,48 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/engine/num.c,v 1.4 2001/09/03 07:01:06 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/num.c,v 1.5 2001/09/05 09:01:27 noro Exp $ 
 */
 #include "ca.h"
 
-void addnum(vl,a,b,c)
-VL vl;
-Num a,b,*c;
+void addnum(VL vl,Num a,Num b,Num *c)
 {
 	(*addnumt[MAX(a?NID(a):0,b?NID(b):0)])(a,b,c);
 }
 
-void subnum(vl,a,b,c)
-VL vl;
-Num a,b,*c;
+void subnum(VL vl,Num a,Num b,Num *c)
 {
 	(*subnumt[MAX(a?NID(a):0,b?NID(b):0)])(a,b,c);
 }
 
-void mulnum(vl,a,b,c)
-VL vl;
-Num a,b,*c;
+void mulnum(VL vl,Num a,Num b,Num *c)
 {
 	(*mulnumt[MAX(a?NID(a):0,b?NID(b):0)])(a,b,c);
 }
 
-void divnum(vl,a,b,c)
-VL vl;
-Num a,b,*c;
+void divnum(VL vl,Num a,Num b,Num *c)
 {
 	(*divnumt[MAX(a?NID(a):0,b?NID(b):0)])(a,b,c);
 }
 
-void pwrnum(vl,a,b,c)
-VL vl;
-Num a,b,*c;
+void pwrnum(VL vl,Num a,Num b,Num *c)
 {
 	(*pwrnumt[MAX(a?NID(a):0,b?NID(b):0)])(a,b,c);
 }
 
-void chsgnnum(a,c)
-Num a,*c;
+void chsgnnum(Num a,Num *c)
 {
 	(*chsgnnumt[a?NID(a):0])(a,c);
 }
 
-int compnum(vl,a,b)
-VL vl;
-Num a,b;
+int compnum(VL vl,Num a,Num b)
 {
 	return (*cmpnumt[MAX(a?NID(a):0,b?NID(b):0)])(a,b);
 }
 
 extern int current_ff;
 
-void one_ff(c)
-Num *c;
+void one_ff(Num *c)
 {
 	LM lm;
 	GFS fs;
@@ -117,7 +103,7 @@ Num *c;
 			*c = (Num)fs;
 			break;
 		case FF_GFSN:
-			ntogfsn(ONE,&fspn);
+			ntogfsn((Obj)ONE,&fspn);
 			*c = (Num)fspn;
 			break;
 		default:
@@ -125,8 +111,7 @@ Num *c;
 	}
 }
 
-int negative_number(c)
-Num c;
+int negative_number(Num c)
 {
 	if ( !c )
 		return 0;
@@ -141,5 +126,100 @@ Num c;
 			default:
 				return 0;
 		}
+	}
+}
+
+/* general simplifier for finite field elements */
+/* XXX : we don't have appropriate file */
+
+void simp_ff(Obj p,Obj *rp)
+{
+	LM s;
+	DCP dc,dcr0,dcr;
+	GF2N rg,sg;
+	GFPN rpn,spn;
+	GFS rs;
+	GFSN rspn,sspn;
+	P t;
+	Obj obj;
+
+	lm_lazy = 0;
+	if ( !p )
+		*rp = 0;
+	else if ( OID(p) == O_N ) {
+		switch ( current_ff ) {
+			case FF_GFP:
+				ptolmp((P)p,&t); simplm((LM)t,&s); *rp = (Obj)s;
+				break;
+			case FF_GF2N:
+				ptogf2n((Obj)p,&rg); simpgf2n((GF2N)rg,&sg); *rp = (Obj)sg;
+				break;
+			case FF_GFPN:
+				ntogfpn((Obj)p,&rpn); simpgfpn((GFPN)rpn,&spn); *rp = (Obj)spn;
+				break;
+			case FF_GFS:
+				if ( NID((Num)p) == N_GFS )
+					*rp = p;
+				else {
+					ptomp(current_gfs_p,(P)p,&t); mqtogfs((MQ)t,&rs);
+					*rp = (Obj)rs;
+				} 
+				break;
+			case FF_GFSN:
+				ntogfsn((Obj)p,&rspn); simpgfsn((GFSN)rspn,&sspn);
+				*rp = (Obj)sspn;
+				break;
+			default:
+				*rp = (Obj)p;
+				break;
+		}
+	} else if ( OID(p) == O_P ) {
+		for ( dc = DC((P)p), dcr0 = 0; dc; dc = NEXT(dc) ) {
+			simp_ff((Obj)COEF(dc),&obj);
+			if ( obj ) {
+				NEXTDC(dcr0,dcr); DEG(dcr) = DEG(dc); COEF(dcr) = (P)obj;
+			}
+		}
+		if ( !dcr0 ) 
+			*rp = 0;
+		else {
+			NEXT(dcr) = 0; MKP(VR((P)p),dcr0,t); *rp = (Obj)t;
+		}
+	} else
+		error("simp_ff : not implemented yet");
+}
+
+
+void field_order_ff(N *order)
+{
+	UP2 up2;
+	UP up;
+	UM dp;
+	N m;
+	int d,w;
+
+	switch ( current_ff ) {
+		case FF_GFP:
+			getmod_lm(order); break;
+		case FF_GF2N:
+			getmod_gf2n(&up2); d = degup2(up2);
+			w = (d>>5)+1;
+			*order = m = NALLOC(w);
+			PL(m)=w;
+			bzero((char *)BD(m),w*sizeof(unsigned int));
+			BD(m)[d>>5] |= 1<<(d&31);
+			break;
+		case FF_GFPN:
+			getmod_lm(&m);
+			getmod_gfpn(&up); pwrn(m,up->d,order);
+			break;
+		case FF_GFS:
+			STON(current_gfs_q,*order); break;
+		case FF_GFSN:
+			STON(current_gfs_q,m);
+			getmod_gfsn(&dp); pwrn(m,DEG(dp),order);
+			break;
+		default:
+			error("field_order_ff : current_ff is not set");
 	}
 }