===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v
retrieving revision 1.26
retrieving revision 1.30
diff -u -p -r1.26 -r1.30
--- OpenXM_contrib2/asir2000/lib/weight	2004/01/09 03:48:58	1.26
+++ OpenXM_contrib2/asir2000/lib/weight	2004/01/14 09:29:39	1.30
@@ -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)$
@@ -520,27 +530,27 @@ def qcheck(PolyList,Vars,FLAG){
 				else{
 
 					TMP=vtol(TMP1[1])$
-
+					RET0=[]$
 					if((TMP0=fixedpoint(TMP,0))!=[]){
 					
 						for(I=0;I<length(TMP0);I++)
 							TMP=map(subst,TMP,TMP0[I][0],TMP0[I][1])$
-
-						TMP=value2(Vars,TMP)$
-
-						if(TMP!=[])
-							RET=append(RET,wsort(TMP,Vars,TMP,1/10))$
-					}	
-					else if((TMP0=fixedpoint(TMP,1))!=[]){
+						RET0=value2(Vars,TMP)$
+						if(RET0!=[])
+							RET0=wsort(RET0,Vars,RET0,1/10)$
+					}
+	
+					TMP=vtol(TMP1[1])$
+					if(RET0==[] && (TMP0=fixedpoint(TMP,1))!=[]){
 					
 						for(I=0;I<length(TMP0);I++)
 							TMP=map(subst,TMP,TMP0[I][0],TMP0[I][1])$
-
-						TMP=value2(Vars,TMP)$
+						RET0=value2(Vars,TMP)$
 	
-						if(TMP!=[])
-							RET=append(RET,wsort(TMP,Vars,TMP,1/10))$
+						if(RET0!=[])
+							RET0=wsort(RET0,Vars,RET0,1/10)$
 					}
+					RET=append(RET,RET0)$
 				}
 			}
 			else if(FLAG==1)
@@ -615,27 +625,28 @@ def leastsq(NormMat,ExpMat,Vars,FLAG,ID){
 			else{
 
 				TMP=vtol(TMP1[1])$
-
-				if((TMP0=fixedpoint(TMP1[1],0))!=[]){
+				RET0=[]$
+				if((TMP0=fixedpoint(TMP,0))!=[]){
 					
 					for(I=0;I<length(TMP0);I++)
 						TMP=map(subst,TMP,TMP0[I][0],TMP0[I][1])$
-
-					TMP=value2(Vars,TMP)$
-
-					if(TMP!=[])
-						RET=append(RET,wsort(TMP,Vars,TMP,ID+1/10))$
-				}	
-				else if((TMP0=fixedpoint(TMP1[1],1))!=[]){
-
+					RET0=value2(Vars,TMP)$
+					if(RET0!=[])
+						RET0=wsort(RET0,Vars,RET0,ID+1/10)$
+				}
+	
+				TMP=vtol(TMP1[1])$
+				if(RET0==[] && (TMP0=fixedpoint(TMP,1))!=[]){
+					
 					for(I=0;I<length(TMP0);I++)
 						TMP=map(subst,TMP,TMP0[I][0],TMP0[I][1])$
-
-					TMP=value2(Vars,TMP)$
-
-					if(TMP!=[])
-						RET=append(RET,wsort(TMP,Vars,TMP,ID+1/10))$
+					RET0=value2(Vars,TMP)$
+	
+					if(RET0!=[])
+						RET0=wsort(RET0,Vars,RET0,ID+1/10)$
 				}
+
+				RET=append(RET,RET0)$
 			}
 
 		}
@@ -695,10 +706,10 @@ def unitweight(ExpMat,Vars,PolyListNum,OneMat,FLAG){
 
 	if(jacobi(ExtMatColNum,NormMat1,WorkMat)){
 
-		Res=newvect(ExpMatColNum)$
-		for(I=0;I<ExpMatColNum;I++){
+		Res=newvect(ExtMatColNum)$
+		for(I=0;I<ExtMatColNum;I++){
 			Res[I]=newvect(2)$
-			Res[I][0]=Vars[I]$
+			Res[I][0]=ExtVars[I]$
 			Res[I][1]=WorkMat[ExtMatColNum-1][I]$
 		}
 
@@ -714,8 +725,7 @@ def unitweight(ExpMat,Vars,PolyListNum,OneMat,FLAG){
 				if(TMP!=[])
 					RET=append(RET,wsort(TMP1[1],Vars,TMP,2))$
 			}
-			
-			if(FLAG==1)
+			else if(FLAG==1)
 				RET=append(RET,[[1,Vars,vtol(TMP1[1])]])$
 		}
 	}