===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v
retrieving revision 1.34
retrieving revision 1.39
diff -u -p -r1.34 -r1.39
--- OpenXM_contrib2/asir2000/lib/weight	2004/05/05 13:15:01	1.34
+++ OpenXM_contrib2/asir2000/lib/weight	2004/05/18 14:11:09	1.39
@@ -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;
 
@@ -417,7 +416,7 @@ def qcheckmain(PolyList,Vars){
 		Poly=dp_ptod(PolyList[I],Vars)$
 		BASE0=dp_etov(dp_ht(Poly))$
 		Poly=dp_rest(Poly)$
-		for(;Poly!=0;Poly=dp_rest(Poly)){
+		for(;L!=VarsNum && Poly!=0;Poly=dp_rest(Poly)){
 			ExpMat[L]=dp_etov(dp_ht(Poly))-BASE0$
 			L=chkou(L,ExpMat,CHAGORD)$
 			if(L==VarsNum-1)
@@ -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)$
@@ -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$