===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v
retrieving revision 1.34
retrieving revision 1.37
diff -u -p -r1.34 -r1.37
--- OpenXM_contrib2/asir2000/lib/weight	2004/05/05 13:15:01	1.34
+++ OpenXM_contrib2/asir2000/lib/weight	2004/05/17 12:03:17	1.37
@@ -306,25 +306,24 @@ def makeret(Res,Vars,FLAG){
 	else
 		M=-1$
 
-        for(I=0;I<ResNum;I++){
-                if(member(Res[I][0],Vars)){
-                        ResVec[I]=Res[I][1]$
+	for(I=0;I<ResNum;I++){
+    	if(member(Res[I][0],Vars)){
+        	ResVec[I]=Res[I][1]$
 
-                        if(FLAG){
+			if(FLAG){
 				if(type(ResVec[I])==1){
-                                	if(M==0)
-                                        	M=ResVec[I]$
-                                	else
-                                        	if(ResVec[I]<M)
-                                                	M=ResVec[I]$
+            		if(M==0)
+                		M=ResVec[I]$
+            		else
+                		if(ResVec[I]<M)
+                    		M=ResVec[I]$
 				}
 				else
 					M=-1$
 			}
 		}
-        }               
+     }
 
-
 	if(M!=-1)
 		ResVec=ResVec/M;
 
@@ -471,7 +470,7 @@ def value2(Vars,Ans,Ba){
 
 	if(nonposdegchk(Res)){
 		TMP1=makeret(Res,Vars,1)$
-		return vtol(TMP1[1])$
+		return [vtol(TMP1[1]),vtol(map(drint,TMP1[1]*1.0))]$
 	}
 	else
 		return []$
@@ -525,8 +524,9 @@ def qcheck(PolyList,Vars,FLAG){
 						for(I=0;I<length(TMP0);I++)
 							TMP=map(subst,TMP,TMP0[I][0],TMP0[I][1])$
 						RET0=value2(Vars,TMP,1)$
+
 						if(RET0!=[])
-							RET0=wsort(RET0,Vars,RET0,-1)$
+							RET0=wsort(RET0[0],Vars,RET0[1],-1)$
 					}
 	
 					TMP=vtol(TMP1[1])$
@@ -537,7 +537,7 @@ def qcheck(PolyList,Vars,FLAG){
 						RET0=value2(Vars,TMP,-1)$
 	
 						if(RET0!=[])
-							RET0=wsort(RET0,Vars,RET0,-1)$
+							RET0=wsort(RET0[0],Vars,RET0[1],-1)$
 					}
 					RET=append(RET,RET0)$
 				}
@@ -756,9 +756,10 @@ def leastsq(NormMat,ExpMat,Vars,FLAG,ID){
 					
 					for(I=0;I<length(TMP0);I++)
 						TMP=map(subst,TMP,TMP0[I][0],TMP0[I][1])$
-					RET0=value2(Vars,TMP)$
+					RET0=value2(Vars,TMP,1)$
+
 					if(RET0!=[])
-						RET0=wsort(RET0,Vars,RET0,-ID)$
+						RET0=wsort(RET0[0],Vars,RET0[1],-ID)$
 				}
 	
 				TMP=vtol(TMP1[1])$
@@ -766,10 +767,10 @@ def leastsq(NormMat,ExpMat,Vars,FLAG,ID){
 					
 					for(I=0;I<length(TMP0);I++)
 						TMP=map(subst,TMP,TMP0[I][0],TMP0[I][1])$
-					RET0=value2(Vars,TMP)$
+					RET0=value2(Vars,TMP,-1)$
 	
 					if(RET0!=[])
-						RET0=wsort(RET0,Vars,RET0,-ID)$
+						RET0=wsort(RET0[0],Vars,RET0[1],-ID)$
 				}
 
 				RET=append(RET,RET0)$
@@ -780,7 +781,7 @@ def leastsq(NormMat,ExpMat,Vars,FLAG,ID){
 			RET=append(RET,[[ID,Vars,vtol(TMP1[1])]])$
 	}
 
-	return RET$
+	return [NormMat0,RET]$
 }
 
 def weight(PolyList,Vars,FLAG){
@@ -823,12 +824,9 @@ def weight(PolyList,Vars,FLAG){
 	if(TMP[1]!=[])
 		RET=append(RET,TMP[1])$
 
-	TMP=unitweight2(TMP[0],ExpMat,Vars,FLAG,3)$
+	TMP=leastsq(0,ExpMat,Vars,FLAG,3)$
 	if(TMP[1]!=[])
 		RET=append(RET,TMP[1])$
-	else{
-		RET=append(RET,leastsq(0,ExpMat,Vars,FLAG,7))$
-	}
 
 	ExpMat=qsort(ExpMat,junban)$
 
@@ -839,26 +837,23 @@ def weight(PolyList,Vars,FLAG){
 
 	if(size(ExpMat)[0]!=length(ExpMat2)){
 		ExpMat=newvect(length(ExpMat2),ExpMat2)$
-		TMP=unitweight2(0,ExpMat,Vars,FLAG,5)$
+		TMP=leastsq(0,ExpMat,Vars,FLAG,5)$
 		if(TMP[1]!=[])
 			RET=append(RET,TMP[1])$
-		else{
-			RET=append(RET,leastsq(0,ExpMat,Vars,FLAG,9))$
-		}
-
 	}
 	else{
-		TMP0=map(ltov,TMP0)$
+		TMP=map(ltov,TMP[1])$
 
-		for(I=0;I<length(TMP0);I++)
-			if(TMP0[I][0]==3)
-				TMP0[I][0]=5$
-			else if(TMP0[I][0]==4)
-				TMP0[I][0]=6$
+		for(I=0;I<length(TMP);I++){
+			if(TMP[I][0]==3)
+				TMP[I][0]=5$
+			else if(TMP[I][0]==4)
+				TMP[I][0]=6$
+		}
 
-		TMP0=map(vtol,TMP0)$
+		TMP=map(vtol,TMP)$
 
-		RET=append(RET,TMP0)$
+		RET=append(RET,TMP)$
 	}
 
 	return RET$