===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v
retrieving revision 1.32
retrieving revision 1.38
diff -u -p -r1.32 -r1.38
--- OpenXM_contrib2/asir2000/lib/weight	2004/02/14 18:28:39	1.32
+++ 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,14 +454,14 @@ def checktd(PolyList,Vars,ResVars){
 	return 1$
 }
 
-def value2(Vars,Ans){
+def value2(Vars,Ans,Ba,FLAG){
 
 	N=length(Vars)$
 	Res=newvect(N)$
 	for(I=0;I<N;I++){
 		Res[I]=newvect(2)$
 		Res[I][0]=Vars[I]$
-		Res[I][1]=Ans[I]$
+		Res[I][1]=Ba*Ans[I]$
 	}
 	Res=map(vtol,Res)$
 	Res=vtol(Res)$
@@ -470,7 +469,7 @@ def value2(Vars,Ans){
 	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)$
+						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)$
+						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))$
@@ -610,7 +610,7 @@ def unitweight2(NormMat0,ExpMat,Vars,FLAG,ID){
 		}
 	}	
 	
-	return RET$
+	return [NormMat0,RET]$
 }
 
 def unitweight1(ExpMat,Vars,PolyListNum,OneMat,FLAG){
@@ -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))$
@@ -687,6 +687,103 @@ def unitweight1(ExpMat,Vars,PolyListNum,OneMat,FLAG){
 	return [NormMat0,RET]$
 }
 
+def leastsq(NormMat,ExpMat,Vars,FLAG,ID){
+
+	RET=[]$
+
+	ExpMatRowNum=size(ExpMat)[0]$
+	ExpMatColNum=size(ExpMat[0])[0]$
+
+	if(NormMat==0){
+		NormMat=newmat(ExpMatColNum,ExpMatColNum)$
+
+		for(I=0;I<ExpMatColNum;I++)
+			for(J=I;J<ExpMatColNum;J++)
+				for(K=0;K<ExpMatRowNum;K++)
+					NormMat[I][J]+=
+						ExpMat[K][I]*ExpMat[K][J]$
+	}
+
+	BVec=newvect(ExpMatColNum)$
+
+	for(I=0;I<ExpMatColNum;I++)
+		for(J=0;J<ExpMatRowNum;J++)
+			BVec[I]+=ExpMat[J][I]$
+
+	SolveList=[]$
+	for(I=0;I<ExpMatColNum;I++){
+		TMP=0$
+		for(J=0;J<I;J++)
+			TMP+=NormMat[J][I]*Vars[J]$
+
+		for(J=I;J<ExpMatColNum;J++)
+			TMP+=NormMat[I][J]*Vars[J]$
+
+		TMP-=BVec[I]$
+		SolveList=cons(TMP,SolveList)$
+	}
+
+	Rea=vars(SolveList)$
+
+	VarsList=[]$
+	for(I=0;I<length(Vars);I++)
+		if(member(Vars[I],Rea))
+			VarsList=cons(Vars[I],VarsList)$
+
+	Res=solve(SolveList,VarsList)$
+	Res=getgcd(Res,Rea)$
+
+	if(nonposdegchk(Res)){
+
+		TMP1=makeret(Res,Vars,1)$
+
+		if(FLAG==0){
+
+			if(TMP1[0]==0){	
+
+				TMP=roundret(TMP1[1])$
+
+				RET=append(RET,wsort(TMP1[1],Vars,map(drint,TMP1[1]),ID))$
+
+				if(TMP!=[])
+					RET=append(RET,wsort(TMP1[1],Vars,TMP,ID+1))$
+			}
+			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])$
+					RET0=value2(Vars,TMP,1,1)$
+
+					if(RET0!=[])
+						RET0=wsort(RET0,Vars,map(drint,RET0),-ID)$
+				}
+	
+				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])$
+					RET0=value2(Vars,TMP,-1,1)$
+	
+					if(RET0!=[])
+						RET0=wsort(RET0,Vars,map(drint,RET0),-ID)$
+				}
+
+				RET=append(RET,RET0)$
+			}
+
+		}
+		else if(FLAG==1)
+			RET=append(RET,[[ID,Vars,vtol(TMP1[1])]])$
+	}
+
+	return [NormMat0,RET]$
+}
+
 def weight(PolyList,Vars,FLAG){
 
 	Vars0=vars(PolyList)$
@@ -724,13 +821,13 @@ def weight(PolyList,Vars,FLAG){
 	ExpMat=newvect(length(ExpMat),ExpMat)$
 
 	TMP=unitweight1(ExpMat,Vars,PolyListNum,OneMat,FLAG)$
+	if(TMP[1]!=[])
+		RET=append(RET,TMP[1])$
 
-	RET=append(RET,TMP[1])$
+	TMP=leastsq(0,ExpMat,Vars,FLAG,3)$
+	if(TMP[1]!=[])
+		RET=append(RET,TMP[1])$
 
-	TMP=unitweight2(TMP[0],ExpMat,Vars,FLAG,3)$
-
-	RET=append(RET,TMP)$
-
 	ExpMat=qsort(ExpMat,junban)$
 
 	ExpMat2=[]$
@@ -740,23 +837,28 @@ def weight(PolyList,Vars,FLAG){
 
 	if(size(ExpMat)[0]!=length(ExpMat2)){
 		ExpMat=newvect(length(ExpMat2),ExpMat2)$
-		RET=append(RET,unitweight2(0,ExpMat,Vars,FLAG,5))$
+		TMP=leastsq(0,ExpMat,Vars,FLAG,5)$
+		if(TMP[1]!=[])
+			RET=append(RET,TMP[1])$
 	}
 	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$
 }
 
 end$
+
+