=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v retrieving revision 1.19 retrieving revision 1.23 diff -u -p -r1.19 -r1.23 --- OpenXM_contrib2/asir2000/lib/weight 2004/01/07 06:53:11 1.19 +++ OpenXM_contrib2/asir2000/lib/weight 2004/01/08 06:48:32 1.23 @@ -565,7 +565,7 @@ def leastsq(NormMat,ExpMat,Vars,FLAG,ID){ return RET$ } else{ - RET=append(RET,[[ID,Vars,vtol(TMP1[1]*1.0)]])$ + RET=append(RET,[[ID,Vars,vtol(TMP1[1])]])$ return RET$ } } @@ -690,8 +690,10 @@ def weight(PolyList,Vars,FLAG){ RET=append(RET,TMP[1])$ - RET=append(RET,leastsq(TMP[0],ExpMat,Vars,FLAG,3))$ + TMP0=leastsq(TMP[0],ExpMat,Vars,FLAG,3)$ + RET=append(RET,TMP0)$ + ExpMat=qsort(ExpMat,junban)$ ExpMat2=[]$ @@ -702,6 +704,16 @@ def weight(PolyList,Vars,FLAG){ if(size(ExpMat)[0]!=length(ExpMat2)){ ExpMat=newvect(length(ExpMat2),ExpMat2)$ RET=append(RET,leastsq(0,ExpMat,Vars,FLAG,5))$ + } + else{ + TMP0=map(ltov,TMP0)$ + + for(I=0;I