===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v
retrieving revision 1.36
retrieving revision 1.38
diff -u -p -r1.36 -r1.38
--- OpenXM_contrib2/asir2000/lib/weight	2004/05/06 02:55:39	1.36
+++ OpenXM_contrib2/asir2000/lib/weight	2004/05/18 10:03:15	1.38
@@ -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;
 
@@ -455,7 +454,7 @@ def checktd(PolyList,Vars,ResVars){
 	return 1$
 }
 
-def value2(Vars,Ans,Ba){
+def value2(Vars,Ans,Ba,FLAG){
 
 	N=length(Vars)$
 	Res=newvect(N)$
@@ -470,7 +469,7 @@ def value2(Vars,Ans,Ba){
 	Res=getgcd(Res,Vars)$
 
 	if(nonposdegchk(Res)){
-		TMP1=makeret(Res,Vars,1)$
+		TMP1=makeret(Res,Vars,FLAG)$
 		return vtol(TMP1[1])$
 	}
 	else
@@ -524,7 +523,8 @@ 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)$
+						RET0=value2(Vars,TMP,1,0)$
+
 						if(RET0!=[])
 							RET0=wsort(RET0,Vars,RET0,-1)$
 					}
@@ -534,7 +534,7 @@ 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)$
+						RET0=value2(Vars,TMP,-1,0)$
 	
 						if(RET0!=[])
 							RET0=wsort(RET0,Vars,RET0,-1)$
@@ -600,7 +600,7 @@ def unitweight2(NormMat0,ExpMat,Vars,FLAG,ID){
 			if(FLAG==0){		
 				TMP=roundret(TMP1[1])$
 
-				RET=append(RET,wsort(TMP1[1],Vars,map(drint,TMP1[1]*1.0),ID))$
+				RET=append(RET,wsort(TMP1[1],Vars,map(drint,TMP1[1]),ID))$
 
 				if(TMP!=[])
 					RET=append(RET,wsort(TMP1[1],Vars,TMP,ID+1))$
@@ -674,7 +674,7 @@ def unitweight1(ExpMat,Vars,PolyListNum,OneMat,FLAG){
 			if(FLAG==0){		
 				TMP=roundret(TMP1[1])$
 
-				RET=append(RET,wsort(TMP1[1],Vars,map(drint,TMP1[1]*1.0),1))$
+				RET=append(RET,wsort(TMP1[1],Vars,map(drint,TMP1[1]),1))$
 
 				if(TMP!=[])
 					RET=append(RET,wsort(TMP1[1],Vars,TMP,2))$
@@ -743,7 +743,7 @@ def leastsq(NormMat,ExpMat,Vars,FLAG,ID){
 
 				TMP=roundret(TMP1[1])$
 
-				RET=append(RET,wsort(TMP1[1],Vars,map(drint,TMP1[1]*1.0),ID))$
+				RET=append(RET,wsort(TMP1[1],Vars,map(drint,TMP1[1]),ID))$
 
 				if(TMP!=[])
 					RET=append(RET,wsort(TMP1[1],Vars,TMP,ID+1))$
@@ -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,1)$
+
 					if(RET0!=[])
-						RET0=wsort(RET0,Vars,RET0,-ID)$
+						RET0=wsort(RET0,Vars,map(drint,RET0),-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,1)$
 	
 					if(RET0!=[])
-						RET0=wsort(RET0,Vars,RET0,-ID)$
+						RET0=wsort(RET0,Vars,map(drint,RET0),-ID)$
 				}
 
 				RET=append(RET,RET0)$
@@ -823,13 +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{
-		TMP=leastsq(0,ExpMat,Vars,FLAG,7)$
-		RET=append(RET,TMP[1])$
-	}
 
 	ExpMat=qsort(ExpMat,junban)$
 
@@ -840,13 +837,9 @@ 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{
-			TMP=leastsq(0,ExpMat,Vars,FLAG,9)$
-			RET=append(RET,TMP[1])$
-		}
 	}
 	else{
 		TMP=map(ltov,TMP[1])$
@@ -856,10 +849,6 @@ def weight(PolyList,Vars,FLAG){
 				TMP[I][0]=5$
 			else if(TMP[I][0]==4)
 				TMP[I][0]=6$
-			else if(TMP[I][0]==7)
-				TMP[I][0]=9$
-			else if(TMP[I][0]==8)
-				TMP[I][0]=10$
 		}
 
 		TMP=map(vtol,TMP)$