===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v
retrieving revision 1.27
retrieving revision 1.29
diff -u -p -r1.27 -r1.29
--- OpenXM_contrib2/asir2000/lib/weight	2004/01/10 14:47:01	1.27
+++ OpenXM_contrib2/asir2000/lib/weight	2004/01/13 03:26:49	1.29
@@ -313,21 +313,31 @@ def makeret(Res,Vars,FLAG){
 
 	ResVec=newvect(ResNum)$
 
-        for(M=0,I=0;I<ResNum;I++){
+	if(FLAG)
+		M=0$
+	else
+		M=-1$
+
+        for(I=0;I<ResNum;I++){
                 if(member(Res[I][0],Vars)){
                         ResVec[I]=Res[I][1]$
 
-                        if(FLAG && type(ResVec[I])==1){
-                                if(M==0)
-                                        M=ResVec[I]$
-                                else
-                                        if(ResVec[I]<M)
-                                                M=ResVec[I]$
-                        }
-                }
+                        if(FLAG){
+				if(type(ResVec[I])==1){
+                                	if(M==0)
+                                        	M=ResVec[I]$
+                                	else
+                                        	if(ResVec[I]<M)
+                                                	M=ResVec[I]$
+				}
+				else
+					M=-1$
+			}
+		}
         }               
 
-	if(M!=0)
+
+	if(M!=-1)
 		ResVec=ResVec/M;
 
  	RET=newvect(VarsNum,Vars)$
@@ -622,7 +632,7 @@ def leastsq(NormMat,ExpMat,Vars,FLAG,ID){
 						TMP=map(subst,TMP,TMP0[I][0],TMP0[I][1])$
 					RET0=value2(Vars,TMP)$
 					if(RET0!=[])
-						RET0=wsort(RET0,Vars,RET0,1/10)$
+						RET0=wsort(RET0,Vars,RET0,ID+1/10)$
 				}
 	
 				TMP=vtol(TMP1[1])$
@@ -633,7 +643,7 @@ def leastsq(NormMat,ExpMat,Vars,FLAG,ID){
 					RET0=value2(Vars,TMP)$
 	
 					if(RET0!=[])
-						RET0=wsort(RET0,Vars,RET0,1/10)$
+						RET0=wsort(RET0,Vars,RET0,ID+1/10)$
 				}
 
 				RET=append(RET,RET0)$