=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v retrieving revision 1.10 retrieving revision 1.14 diff -u -p -r1.10 -r1.14 --- OpenXM_contrib2/asir2000/lib/weight 2003/11/27 11:25:00 1.10 +++ OpenXM_contrib2/asir2000/lib/weight 2003/12/11 15:12:35 1.14 @@ -389,7 +389,7 @@ def qcheck(PolyList,Vars,FLAG){ return RET$ } else{ - RET=append(RET,[[Vars,ResVars[1]]])$ + RET=append(RET,[[Vars,vtol(ResVars[1])]])$ return RET$ } } @@ -450,7 +450,7 @@ def leastsq(NormMat,ExpMat,Vars,FLAG){ if(nonposdegchk(Res)){ TMP1=makeret(Res,Vars,1)$ if(TMP1[0]==0){ - TMP=roundret(TMP1[1]*1.0)$ + TMP=roundret(TMP1[1])$ if(TMP!=[]) RET=append(RET,wsort(TMP1[1],Vars,TMP,FLAG))$ @@ -460,7 +460,7 @@ def leastsq(NormMat,ExpMat,Vars,FLAG){ return RET$ } else{ - RET=append(RET,[[Vars,TMP1[1]*1.0]])$ + RET=append(RET,[[Vars,vtol(TMP1[1]*1.0)]])$ return RET$ } } @@ -566,7 +566,7 @@ def weightr(ExpMat,Vars,PolyListNum,OneMat,FLAG){ TMP1=makeret(Res,Vars,1)$ if(TMP1[0]==0){ - TMP=roundret(TMP1[1]*1.0)$ + TMP=roundret(TMP1[1])$ if(TMP!=[]) RET=append(RET,wsort(TMP1[1],Vars, TMP,FLAG))$ @@ -575,7 +575,7 @@ def weightr(ExpMat,Vars,PolyListNum,OneMat,FLAG){ map(drint,TMP1[1]*1.0),FLAG))$ } else{ - RET=append(RET,[[Vars,TMP1[1]*1.0]])$ + RET=append(RET,[[Vars,vtol(TMP1[1]*1.0)]])$ } }