=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/kanExport0.c,v retrieving revision 1.21 retrieving revision 1.23 diff -u -p -r1.21 -r1.23 --- OpenXM/src/kan96xx/Kan/kanExport0.c 2004/02/28 13:39:42 1.21 +++ OpenXM/src/kan96xx/Kan/kanExport0.c 2004/07/30 11:21:55 1.23 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.20 2003/12/06 02:49:22 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.22 2004/05/13 04:38:28 takayama Exp $ */ #include #include "datatype.h" #include "stackm.h" @@ -144,7 +144,7 @@ struct object KooAdd(ob1,ob2) default: if (QuoteMode) { - rob = addTree(ob1,ob2); + rob = addTree(ob1,ob2); }else{ warningKan("KooAdd() has not supported yet these objects.\n"); } @@ -422,7 +422,7 @@ struct object KooMult(ob1,ob2) default: if (QuoteMode) { - rob = timesTree(ob1,ob2); + rob = timesTree(ob1,ob2); }else{ warningKan("KooMult() has not supported yet these objects.\n"); } @@ -1001,7 +1001,15 @@ struct object KdataConversion(obj,key) rob = NullObject; return(rob); }else { - warningKan("Sorry. This type of data conversion has not supported yet.\n"); + { /* Automatically maps the elements. */ + int n,i; + n = getoaSize(obj); + rob = newObjectArray(n); + for (i=0; i ' ')) { - wc++; inblank = 0; - }else if ((!inblank) && (s[i] <= ' ')) { - inblank = 1; - } + if (inblank && (s[i] > ' ')) { + wc++; inblank = 0; + }else if ((!inblank) && (s[i] <= ' ')) { + inblank = 1; + } } argv = (char **) sGC_malloc(sizeof(char *)*(wc+2)); argv[0] = NULL; inblank = 1; wc = 0; for (i=0; i ' ')) { - argv[wc] = &(s[i]); argv[wc+1]=NULL; - wc++; inblank = 0; - }else if ((inblank == 0) && (s[i] <= ' ')) { - inblank = 1; s[i] = 0; - }else if (inblank && (s[i] <= ' ')) { - s[i] = 0; - } + if (inblank && (s[i] > ' ')) { + argv[wc] = &(s[i]); argv[wc+1]=NULL; + wc++; inblank = 0; + }else if ((inblank == 0) && (s[i] <= ' ')) { + inblank = 1; s[i] = 0; + }else if (inblank && (s[i] <= ' ')) { + s[i] = 0; + } } rob = newObjectArray(wc); for (i=0; im->ringp)))); - } + rob = newObjectArray(2); + f1 = reduceContentOfPoly(f1,&cont); + putoa(rob,0,KpoPOLY(f1)); + if (f1 == POLYNULL) { + putoa(rob,1,KpoPOLY(f1)); + }else{ + putoa(rob,1,KpoPOLY(newCell(cont,newMonomial(f1->m->ringp)))); + } }else if (strcmp(key,"ord_ws_all")==0) { if (size != 3) errorKan1("%s\n","[(ord_ws_all) fv wv] gbext"); obj1 = getoa(obj,1); obj2 = getoa(obj,2); rob = KordWsAll(obj1,obj2); + }else if (strcmp(key,"exponents")==0) { + if (size == 3) { + obj1 = getoa(obj,1); + obj2 = getoa(obj,2); + rob = KgetExponents(obj1,obj2); + }else if (size == 2) { + obj1 = getoa(obj,1); + obj2 = KpoInteger(2); + rob = KgetExponents(obj1,obj2); + }else{ + errorKan1("%s\n","[(exponents) f type] gbext"); + } }else { errorKan1("%s\n","gbext : unknown tag."); } @@ -2843,6 +2874,7 @@ errorKan1(str,message) longjmp(EnvOfStackMachine,1); #endif } + warningKan(str) char *str;