=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/kanExport0.c,v retrieving revision 1.28 retrieving revision 1.43 diff -u -p -r1.28 -r1.43 --- OpenXM/src/kan96xx/Kan/kanExport0.c 2004/08/31 04:45:42 1.28 +++ OpenXM/src/kan96xx/Kan/kanExport0.c 2005/06/16 05:07:23 1.43 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.27 2004/08/28 07:28:54 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.42 2005/06/09 05:46:57 takayama Exp $ */ #include #include "datatype.h" #include "stackm.h" @@ -30,7 +30,8 @@ struct object KooAdd(ob1,ob2) POLY r; int s,i; objectp f1,f2,g1,g2; - struct object nn,dd; + struct object nn = OINIT; + struct object dd = OINIT; switch (Lookup[ob1.tag][ob2.tag]) { case SintegerSinteger: @@ -161,7 +162,8 @@ struct object KooSub(ob1,ob2) int s,i; objectp f1,f2,g1,g2; extern struct coeff *UniversalZero; - struct object nn,dd; + struct object nn = OINIT; + struct object dd = OINIT; switch (Lookup[ob1.tag][ob2.tag]) { case SintegerSinteger: @@ -292,7 +294,8 @@ struct object KooMult(ob1,ob2) POLY r; int i,s; objectp f1,f2,g1,g2; - struct object dd,nn; + struct object dd = OINIT; + struct object nn = OINIT; switch (Lookup[ob1.tag][ob2.tag]) { @@ -438,7 +441,7 @@ struct object KoNegate(obj) { struct object rob = NullObject; extern struct ring SmallRing; - struct object tob; + struct object tob = OINIT; switch(obj.tag) { case Sinteger: rob = obj; @@ -480,7 +483,7 @@ struct object KoInverse(obj) struct object rob = NullObject; extern struct coeff *UniversalOne; objectp onep; - struct object tob; + struct object tob = OINIT; switch(obj.tag) { case Spoly: tob.tag = SuniversalNumber; @@ -546,11 +549,11 @@ struct object KaoMult(aa,bb) POLY tmp; POLY fik; POLY gkj; - struct object rob; + struct object rob = OINIT; int r1,r2; int rsize; - struct object tob; - struct object ob1; + struct object tob = OINIT; + struct object ob1 = OINIT; extern struct ring SmallRing; m = getoaSize(aa); m2 = getoaSize(bb); @@ -610,7 +613,9 @@ struct object KaoMult(aa,bb) r1 = isMatrix(aa,m,n); r2 = isMatrix(bb,m2,n2); if (r1 == -1 || r2 == -1) { /* Object multiplication. Elements are not polynomials. */ - struct object ofik,ogkj,otmp; + struct object ofik = OINIT; + struct object ogkj = OINIT; + struct object otmp = OINIT; rob = newObjectArray(m); for (i=0; im2?m2:m1); i++) { rr=KooGreater(getoa(obj1,i),getoa(obj2,i)); @@ -856,7 +869,7 @@ struct object KooLess(obj1,obj2) case Sarray: { int i,m1,m2; - struct object rr; + struct object rr = OINIT; m1 = getoaSize(obj1); m2 = getoaSize(obj2); for (i=0; i< (m1>m2?m2:m1); i++) { rr=KooLess(getoa(obj1,i),getoa(obj2,i)); @@ -882,11 +895,12 @@ struct object KdataConversion(obj,key) { char tmps[128]; /* Assume that double is not more than 128 digits */ char intstr[100]; /* Assume that int is not more than 100 digits */ - struct object rob; + struct object rob = OINIT; extern struct ring *CurrentRingp; extern struct ring SmallRing; int flag; - struct object rob1,rob2; + struct object rob1 = OINIT; + struct object rob2 = OINIT; char *s; int i; double f; @@ -919,6 +933,10 @@ struct object KdataConversion(obj,key) return(rob); }else if (strcmp(key,"poly") == 0) { rob = KpoPOLY(ZERO); + return rob; + }else if (strcmp(key,"array") == 0) { + rob = newObjectArray(0); + return rob; }else{ warningKan("Sorry. The data conversion from null to this data type has not supported yet.\n"); } @@ -1015,7 +1033,7 @@ struct object KdataConversion(obj,key) if (strcmp(key,"array") == 0) { return(rob); }else if (strcmp(key,"list") == 0) { - rob = *( arrayToList(obj) ); + rob = KarrayToList(obj); return(rob); }else if (strcmp(key,"arrayOfPOLY")==0) { rob = KpoArrayOfPOLY(arrayToArrayOfPOLY(obj)); @@ -1029,6 +1047,9 @@ struct object KdataConversion(obj,key) }else if (strcmp(key,"null") == 0) { rob = NullObject; return(rob); + }else if (strcmp(key,"byteArray") == 0) { + rob = newByteArray(getoaSize(obj),obj); + return(rob); }else { { /* Automatically maps the elements. */ int n,i; @@ -1108,7 +1129,7 @@ struct object KdataConversion(obj,key) break; case Slist: if (strcmp(key,"array") == 0) { - rob = listToArray(&obj); + rob = KlistToArray(obj); return(rob); } break; @@ -1206,23 +1227,31 @@ struct object KdataConversion(obj,key) warningKan("Sorryl This type of data conversion of ringp has not supported yet.\n"); } break; + case SbyteArray: + if (strcmp(key,"array") == 0) { + rob = byteArrayToArray(obj); + return(rob); + } else { + warningKan("Sorryl This type of data conversion of ringp has not supported yet.\n"); + } + break; default: warningKan("Sorry. This type of data conversion has not supported yet.\n"); } return(NullObject); } -/* cf. macro to_int */ -struct object Kto_int(struct object ob) { +/* cf. macro to_int32 */ +struct object Kto_int32(struct object ob) { int n,i; - struct object otmp; - struct object rob; + struct object otmp = OINIT; + struct object rob = OINIT; if (ob.tag == SuniversalNumber) return KdataConversion(ob,"integer"); if (ob.tag == Sarray) { n = getoaSize(ob); rob = newObjectArray(n); for (i=0; in; a = aa->array; r = newObjectArray(size); @@ -1323,8 +1352,8 @@ struct object arrayOfPOLYToArray(aa) struct object matrixOfPOLYToArray(pmat) struct matrixOfPOLY *pmat; { - struct object r; - struct object tmp; + struct object r = OINIT; + struct object tmp = OINIT; int i,j; int m,n; POLY *mat; @@ -1347,7 +1376,7 @@ struct arrayOfPOLY *arrayToArrayOfPOLY(oa) POLY *a; int size; int i; - struct object tmp; + struct object tmp = OINIT; struct arrayOfPOLY *ap; if (oa.tag != Sarray) errorKan1("KarrayToArrayOfPOLY(): %s", @@ -1375,7 +1404,8 @@ struct matrixOfPOLY *arrayToMatrixOfPOLY(oa) int i,j; struct matrixOfPOLY *ma; - struct object tmp,tmp2; + struct object tmp = OINIT; + struct object tmp2 = OINIT; if (oa.tag != Sarray) errorKan1("KarrayToMatrixOfPOLY(): %s", "Argument is not array\n"); m = getoaSize(oa); @@ -1413,8 +1443,8 @@ int objArrayToOrderMatrix(oA,order,n,oasize) { int size; int k,j; - struct object tmpOa; - struct object obj; + struct object tmpOa = OINIT; + struct object obj = OINIT; if (oA.tag != Sarray) { warningKan("The argument should be of the form [ [...] [...] ... [...]]."); return(-1); @@ -1499,10 +1529,10 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) ob4 = Order matrix ob5 = [(keyword) value (keyword) value ....] */ -#define RP_LIMIT 500 +#define RP_LIMIT 5000 { int i; - struct object ob; + struct object ob = OINIT; int c,l,m,n; int cc,ll,mm,nn; int p; @@ -1525,7 +1555,7 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) extern char *F_mpMult; char *fmp_mult_saved; char *mpMultName = NULL; - struct object rob; + struct object rob = OINIT; struct ring *savedCurrentRingp; /* To get the ring structure. */ @@ -1597,7 +1627,7 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) } } - ob4 = Kto_int(ob4); /* order matrix */ + ob4 = Kto_int32(ob4); /* order matrix */ oasize = getoaSize(ob4); order = (int *)sGC_malloc(sizeof(int)*((2*n)*oasize+1)); if (order == (int *)NULL) errorKan1("%s\n","No memory."); @@ -1642,6 +1672,8 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) newRingp->degreeShiftSize = 0; newRingp->degreeShiftN = 0; newRingp->degreeShift = NULL; + newRingp->partialEcart = 0; + newRingp->partialEcartGlobalVarX = NULL; if (ob5.tag != Sarray || (getoaSize(ob5) % 2) != 0) { errorKan1("%s\n","[(keyword) value (keyword) value ....] should be given."); @@ -1698,8 +1730,8 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) errorKan1("%s\n","An array of array should be given. (degreeShift)"); } { - struct object ods; - struct object ods2; + struct object ods = OINIT; + struct object ods2 = OINIT; int dssize,k,j,nn; ods=getoa(ob5,i+1); if ((getoaSize(ods) < 1) || (getoa(ods,0).tag != Sarray)) { @@ -1722,6 +1754,36 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) } } } + } else if (strcmp(KopString(getoa(ob5,i)),"partialEcartGlobalVarX") == 0) { + if (getoa(ob5,i+1).tag != Sarray) { + errorKan1("%s\n","An array of array should be given. (partialEcart)"); + } + { + struct object odv = OINIT; + struct object ovv = OINIT; + int k,j,nn; + char *vname; + odv=getoa(ob5,i+1); + nn = getoaSize(odv); + newRingp->partialEcart = nn; + newRingp->partialEcartGlobalVarX = (int *) sGC_malloc(sizeof(int)*nn+1); + if (newRingp->partialEcartGlobalVarX == NULL) errorKan1("%s\n","No more memory."); + for (j=0; jpartialEcartGlobalVarX)[j] = -1; + for (j=0; jpartialEcartGlobalVarX)[j] = k; break; + }else{ + if (k == n-1) errorKan1("%s\n","partialEcartGlobalVarX: no such variable."); + } + } + } + } + switch_function("grade","module1v"); /* Warning: grading is changed to module1v!! */ } else { @@ -1776,8 +1838,8 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5) struct object KsetVariableNames(struct object ob,struct ring *rp) { int n,i; - struct object ox; - struct object otmp; + struct object ox = OINIT; + struct object otmp = OINIT; char **xvars; char **dvars; if (ob.tag != Sarray) { @@ -1822,7 +1884,7 @@ struct object KswitchFunction(ob1,ob2) struct object ob1,ob2; { char *ans ; - struct object rob; + struct object rob = OINIT; int needWarningForAvoidTheSameRing = 0; extern int AvoidTheSameRing; if ((ob1.tag != Sdollar) || (ob2.tag != Sdollar)) { @@ -1864,14 +1926,14 @@ struct object KoReplace(of,rule) struct object of; struct object rule; { - struct object rob; + struct object rob = OINIT; POLY f; POLY lRule[N0*2]; POLY rRule[N0*2]; POLY r; int i; int n; - struct object trule; + struct object trule = OINIT; if (rule.tag != Sarray) { @@ -1927,7 +1989,7 @@ struct object Kparts(f,v) { POLY ff; POLY vv; - struct object obj; + struct object obj = OINIT; struct matrixOfPOLY *co; /* check the data type */ if (f.tag != Spoly || v.tag != Spoly) @@ -1944,7 +2006,7 @@ struct object Kparts2(f,v) { POLY ff; POLY vv; - struct object obj; + struct object obj = OINIT; struct matrixOfPOLY *co; /* check the data type */ if (f.tag != Spoly || v.tag != Spoly) @@ -1992,7 +2054,8 @@ struct object Ksp(ob1,ob2) struct object ob1,ob2; { struct spValue sv; - struct object rob,cob; + struct object rob = OINIT; + struct object cob = OINIT; POLY f; if (ob1.tag != Spoly || ob2.tag != Spoly) errorKan1("%s\n","Ksp(): The arguments must be polynomials."); @@ -2022,7 +2085,7 @@ struct object Keval(obj) { char *key; int size; - struct object rob; + struct object rob = OINIT; rob = NullObject; if (obj.tag != Sarray) @@ -2067,8 +2130,8 @@ char *KremoveSpace(str) struct object KtoRecords(ob) struct object ob; { - struct object obj; - struct object tmp; + struct object obj = OINIT; + struct object tmp = OINIT; int i; int size; char **argv; @@ -2164,7 +2227,7 @@ int KtoArgvbyCurryBrace(str,argv,limit) } struct object KstringToArgv(struct object ob) { - struct object rob; + struct object rob = OINIT; char *s; int n,wc,i,inblank; char **argv; @@ -2226,7 +2289,7 @@ static void checkDuplicateName(xvars,dvars,n) } struct object KooPower(struct object ob1,struct object ob2) { - struct object rob; + struct object rob = OINIT; /* Bug. It has not yet been implemented. */ if (QuoteMode) { rob = powerTree(ob1,ob2); @@ -2348,9 +2411,11 @@ struct object KgbExtension(struct object obj) { char *key; int size; - struct object keyo; + struct object keyo = OINIT; struct object rob = NullObject; - struct object obj1,obj2,obj3; + struct object obj1 = OINIT; + struct object obj2 = OINIT; + struct object obj3 = OINIT; POLY f1; POLY f2; POLY f3; @@ -2519,9 +2584,12 @@ struct object KmpzExtension(struct object obj) { char *key; int size; - struct object keyo; + struct object keyo = OINIT; struct object rob = NullObject; - struct object obj0,obj1,obj2,obj3; + struct object obj0 = OINIT; + struct object obj1 = OINIT; + struct object obj2 = OINIT; + struct object obj3 = OINIT; MP_INT *f; MP_INT *g; MP_INT *h; @@ -2750,7 +2818,7 @@ struct object KmpzExtension(struct object obj) /** : context */ struct object KnewContext(struct object superObj,char *name) { struct context *cp; - struct object ob; + struct object ob = OINIT; if (superObj.tag != Sclass) { errorKan1("%s\n","The argument of KnewContext must be a Class.Context"); } @@ -2769,10 +2837,10 @@ struct object KcreateClassIncetance(struct object ob1, struct object ob3) { /* [class-tag super-obj] size [class-tag] cclass */ - struct object ob4; + struct object ob4 = OINIT; int size,size2,i; - struct object ob5; - struct object rob; + struct object ob5 = OINIT; + struct object rob = OINIT; if (ob1.tag != Sarray) errorKan1("%s\n","cclass: The first argument must be an array."); @@ -2825,8 +2893,8 @@ struct object KpoDouble(double a) { double toDouble0(struct object ob) { double r; int r3; - struct object ob2; - struct object ob3; + struct object ob2 = OINIT; + struct object ob3 = OINIT; switch(ob.tag) { case Sinteger: return( (double) (KopInteger(ob)) ); @@ -2855,7 +2923,7 @@ double toDouble0(struct object ob) { } struct object KpoGradedPolySet(struct gradedPolySet *grD) { - struct object rob; + struct object rob = OINIT; rob.tag = Sclass; rob.lc.ival = CLASSNAME_GradedPolySet; rob.rc.voidp = (void *) grD; @@ -2872,10 +2940,14 @@ static char *getspace0(int a) { return(s); } struct object KdefaultPolyRing(struct object ob) { - struct object rob; + struct object rob = OINIT; int i,j,k,n; - struct object ob1,ob2,ob3,ob4,ob5; - struct object t1; + struct object ob1 = OINIT; + struct object ob2 = OINIT; + struct object ob3 = OINIT; + struct object ob4 = OINIT; + struct object ob5 = OINIT; + struct object t1 = OINIT; char *s1; extern struct ring *CurrentRingp; static struct ring *a[N0]; @@ -2946,11 +3018,244 @@ struct object KdefaultPolyRing(struct object ob) { } +struct object Krest(struct object ob) { + struct object rob; + struct object *op; + int n,i; + if (ob.tag == Sarray) { + n = getoaSize(ob); + if (n == 0) return ob; + rob = newObjectArray(n-1); + for (i=1; i 0) { + ba = (unsigned char *) sGC_malloc(size); + if (ba == NULL) errorKan1("%s\n","No more memory."); + } + rob.tag = SbyteArray; rob.lc.bytes = ba; rob.rc.ival = size; + if (obj.tag == SbyteArray) { + n = getByteArraySize(obj); + ba2 = KopByteArray(obj); + for (i=0; i<(n 0) { + ba = (unsigned char *) sGC_malloc(size); + if (ba == NULL) errorKan1("%s\n","No more memory."); + } + rob.tag = SbyteArray; rob.lc.bytes = ba; rob.rc.ival = size; + for (i=0; i