===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v
retrieving revision 1.11
retrieving revision 1.16
diff -u -p -r1.11 -r1.16
--- OpenXM_contrib2/asir2000/lib/weight	2003/11/28 11:10:47	1.11
+++ OpenXM_contrib2/asir2000/lib/weight	2004/01/06 09:26:11	1.16
@@ -163,7 +163,7 @@ def getgcd(A,B){
 	for(I=0;I<VarsNumA;I++){
 
 		for(J=0;J<VarsNumB;J++)
-			if(C[J]==A[I][0])
+			if(B[J]==A[I][0])
 				break$
 
 		if(J<VarsNumB)
@@ -203,17 +203,24 @@ def makeret(Res,Vars,FLAG){
 	ResNum=length(Res)$
 	VarsNum=length(Vars)$
 
-	ResVec=newvect(ResNum)$
-	for(M=0,I=0;I<ResNum;I++){
-		if(member(Res[I][0],Vars)){
-			ResVec[I]=Res[I][1]$
+	ResVec=newvect(VarsNum,Vars)$
 
-			if(FLAG && type(ResVec[I])==1){
+	M=0$
+	for(I=0;I<ResNum;I++){
+
+		for(J=0;J<VarsNum;J++)
+			if(Vars[J]==Res[I][0])
+				break;
+
+		if(J<VarsNum){
+			ResVec[J]=TMP=Res[I][1]$
+
+			if(FLAG && type(TMP)==1){
 				if(M==0)
-					M=ResVec[I]$
+					M=TMP$
 				else
-					if(ResVec[I]<M)
-						M=ResVec[I]$
+					if(TMP<M)
+						M=TMP$
 			}
 		}
 	}		
@@ -448,9 +455,11 @@ def leastsq(NormMat,ExpMat,Vars,FLAG){
 	Res=getgcd(Res,Rea)$
 
 	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))$
 
@@ -559,14 +568,17 @@ def weightr(ExpMat,Vars,PolyListNum,OneMat,FLAG){
 			if(member(Rea[I],Vars))
 				TMP=cons(Rea[I],TMP)$
 	
-		TMP=cons(ExtVars[F],TMP)$
+		if(member(ExtVars[F],Vars))
+			TMP=cons(ExtVars[F],TMP)$
+
 		Res=getgcd(Res,TMP)$
 	
 		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))$