=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/order.c,v retrieving revision 1.12 retrieving revision 1.16 diff -u -p -r1.12 -r1.16 --- OpenXM/src/kan96xx/Kan/order.c 2004/05/15 12:00:48 1.12 +++ OpenXM/src/kan96xx/Kan/order.c 2018/09/07 00:15:44 1.16 @@ -1,5 +1,6 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/order.c,v 1.11 2004/05/13 06:30:51 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/order.c,v 1.15 2005/07/03 11:08:54 ohara Exp $ */ #include +#include #include "datatype.h" #include "stackm.h" #include "extern.h" @@ -173,8 +174,8 @@ void showRing(level,ringp) }else { mtype = "unknown"; } - fprintf(fp,"Multiplication function --%s(%xH).\n", - mtype,(unsigned int) ringp->multiplication); + fprintf(fp,"Multiplication function --%s(%p).\n", + mtype, ringp->multiplication); if (ringp->schreyer) { fprintf(fp,"schreyer=1, gbListTower="); printObjectList((struct object *)(ringp->gbListTower)); @@ -196,6 +197,14 @@ void showRing(level,ringp) } fprintf(fp,"--- weight vectors ---\n"); if (level) printOrder(ringp); + + if (ringp->partialEcart) { + fprintf(fp,"--- partialEcartGlobalVarX ---\n"); + for (i=0; ipartialEcart; i++) { + fprintf(fp," %4s ",TransX[ringp->partialEcartGlobalVarX[i]]); + } + fprintf(fp,"\n"); + } if (ringp->next != (struct ring *)NULL) { fprintf(fp,"\n\n-------- The next ring is .... --------------\n"); @@ -318,7 +327,8 @@ void printOrder(ringp) struct object oGetOrderMatrix(struct ring *ringp) { - struct object rob,ob2; + struct object rob = OINIT; + struct object ob2 = OINIT; int n,i,j,m; int *om; n = ringp->n; @@ -623,7 +633,7 @@ int mmLarger_tower3(POLY f,POLY g,struct object *gbLis int n,fv,gv,t,r,nn; POLY fm; POLY gm; - struct object gb; + struct object gb = OINIT; if (f == POLYNULL) { if (g == POLYNULL) return(2); @@ -680,8 +690,8 @@ int mmLarger_tower3(POLY f,POLY g,struct object *gbLis static struct object auxPruneZeroRow(struct object ob) { int i,m,size; - struct object obt; - struct object rob; + struct object obt = OINIT; + struct object rob = OINIT; m = getoaSize(ob); size=0; for (i=0; i