===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v
retrieving revision 1.11
retrieving revision 1.27
diff -u -p -r1.11 -r1.27
--- OpenXM_contrib2/asir2000/lib/weight	2003/11/28 11:10:47	1.11
+++ OpenXM_contrib2/asir2000/lib/weight	2004/01/10 14:47:01	1.27
@@ -1,6 +1,204 @@
 load("solve")$
 load("gr")$
 
+#define EPS 1E-6
+#define TINY 1E-20
+#define MAX_ITER 100
+#define ROUND_THRESHOLD 0.4
+
+def rotate(A,I,J,K,L,C,S){
+
+	X=A[I][J];
+	Y=A[K][L];
+	A[I][J]=X*C-Y*S;
+	A[K][L]=X*S+Y*C;
+
+	return 1;
+}
+
+def jacobi(N,A,W){
+
+	S=OFFDIAG=0.0;
+
+	for(J=0;J<N;J++){
+
+		for(K=0;K<N;K++)
+			W[J][K]=0.0;
+
+		W[J][J]=1.0;
+		S+=A[J][J]*A[J][J];
+		
+		for(K=J+1;K<N;K++)
+			OFFDIAG+=A[J][K]*A[J][K];
+	}
+
+	TOLERANCE=EPS*EPS*(S/2+OFFDIAG);
+
+	for(ITER=1;ITER<=MAX_ITER;ITER++){
+
+		OFFDIAG=0.0;
+		for(J=0;J<N-1;J++)
+			for(K=J+1;K<N;K++)
+				OFFDIAG+=A[J][K]*A[J][K];
+
+		if(OFFDIAG < TOLERANCE)
+			break;
+
+		for(J=0;J<N-1;J++){
+			for(K=J+1;K<N;K++){
+
+				if(dabs(A[J][K])<TINY)
+					continue;
+
+				T=(A[K][K]-A[J][J])/(2.0*A[J][K]);
+
+				if(T>=0.0)
+					T=1.0/(T+dsqrt(T*T+1));
+				else
+					T=1.0/(T-dsqrt(T*T+1));
+
+				C=1.0/dsqrt(T*T+1);
+
+				S=T*C;
+
+				T*=A[J][K];
+
+				A[J][J]-=T;
+				A[K][K]+=T;
+				A[J][K]=0.0;
+
+				for(I=0;I<J;I++)
+					rotate(A,I,J,I,K,C,S);
+
+				for(I=J+1;I<K;I++)
+					rotate(A,J,I,I,K,C,S);
+
+				for(I=K+1;I<N;I++)
+					rotate(A,J,I,K,I,C,S);
+
+				for(I=0;I<N;I++)
+					rotate(W,J,I,K,I,C,S);
+
+			}
+		}
+	}
+
+	if (ITER > MAX_ITER)
+		return 0;
+
+	for(I=0;I<N-1;I++){
+
+		K=I;
+
+		T=A[K][K];
+
+		for(J=I+1;J<N;J++)
+			if(A[J][J]>T){
+				K=J;
+				T=A[K][K];
+			}
+
+		A[K][K]=A[I][I];
+
+		A[I][I]=T;
+
+		V=W[K];
+
+		W[K]=W[I];
+		
+		W[I]=V;
+	}
+
+	return 1;
+}
+
+def interval2value(A,Vars){
+
+	B=atl(A)$
+
+	if(length(B)>2){
+		print("bug")$
+		return []$
+	}
+	else if(length(B)==0){
+		if(fop(A)==0)
+			return [Vars,1]$
+		else
+			return []$
+	}
+	else if(length(B)==1){
+		
+		C=fargs(B[0])$
+		D=vars(C)$
+		E=solve(C,D)$
+
+		if(fop(B[0])==15)
+			return [Vars,E[0][1]+1]$
+		else if(fop(B[0])==11)
+			return [Vars,E[0][1]-1]$
+		else if(fop(B[0])==8)
+			return [Vars,E[0][1]]$
+		else
+			return []$
+	}
+	else{
+
+		C=fargs(B[0])$
+		D=vars(C)$
+		E=solve(C,D)$
+
+		C=fargs(B[1])$
+		D=vars(C)$
+		F=solve(C,D)$
+	
+		return [Vars,(E[0][1]+F[0][1])/2]$
+	}
+
+} 
+
+def fixpointmain(F,Vars){
+
+	RET=[]$
+	for(I=length(Vars)-1;I>=1;I--){
+
+		for(H=[],J=0;J<I;J++)
+			H=cons(Vars[J],H)$
+
+		G=interval2value(qe(ex(H,F)),Vars[I])$
+
+		if(G==[])
+			return RET$
+		else
+			RET=cons(G,RET)$
+
+		F=subf(F,G[0],G[1])$
+	}
+
+	G=interval2value(simpl(F),Vars[0])$
+
+	if(G==[])
+		return RET$
+	else
+		RET=cons(G,RET)$
+
+	return RET$
+}
+
+
+def fixedpoint(A,FLAG){
+
+	Vars=vars(A)$
+
+	N=length(A)$
+
+	if (FLAG==0)
+		for(F=@true,I=0;I < N; I++ ) { F = F @&& A[I] @> 0$ }
+	else if (FLAG==1)
+		for(F=@true,I=0;I < N; I++ ) { F = F @&& A[I] @< 0$ }
+
+	return fixpointmain(F,Vars)$
+}
+
 def nonzerovec(A){
 
 	for(I=0;I<size(A)[0];I++)
@@ -35,115 +233,25 @@ def bsort(A){
 	return A$
 }
 
-def perm(I,P,TMP){
+def wsort(A,B,C,ID){
 
-	if(I>0){
-		TMP=perm(I-1,P,TMP)$
-		for(J=I-1;J>=0;J--){
-			T=P[I]$
-			P[I]=P[J]$
-			P[J]=T$
-			TMP=perm(I-1,P,TMP)$
-			T=P[I]$
-			P[I]=P[J]$
-			P[J]=T$
-		}
+	D=newvect(length(B))$
+	for(I=0;I<length(B);I++)
+		D[I]=[A[I],B[I],C[I]]$
 
-		return TMP$
-	}
-	else{
-		for(TMP0=[],K=0;K<size(P)[0];K++)
-			TMP0=cons(P[K],TMP0)$
-				
-		TMP=cons(TMP0,TMP)$
-		return TMP$
-	}
-}
+	D=bsort(D)$
 
-def marge(A,B){
+	for(E=[],I=0;I<length(B);I++)
+		E=cons(D[I][1],E)$
+	E=reverse(E)$
 
-	RET=[]$
-	for(I=0;I<length(A);I++)
-		for(J=0;J<length(B);J++)
-			RET=cons(append(A[I],B[J]),RET)$
-
-	return RET$
-}
-
-def wsort(A,B,C,FLAG){
-
-	if(FLAG==0){
-		D=newvect(length(B))$
-		for(I=0;I<length(B);I++)
-			D[I]=[A[I],B[I],C[I]]$
-
-		D=bsort(D)$
-		E=[]$
-		for(I=0;I<length(B);I++)
-			E=cons(D[I][1],E)$
-		E=reverse(E)$
-		F=[]$
-		for(I=0;I<length(B);I++)
-			F=cons(D[I][2],F)$
-		F=reverse(F)$
+	for(F=[],I=0;I<length(B);I++)
+		F=cons(D[I][2],F)$
+	F=reverse(F)$
 	
-		return [[E,F]]$
-	}
-	else{
-		D=newvect(length(B))$
-		for(I=0;I<length(B);I++)
-			D[I]=[A[I],B[I],C[I]]$
-
-		D=qsort(D,worder)$
-		D0=[]$
-
-		for(I=0,J=0,TMP=[],X=0;I<size(D)[0];I++){
-			if(X==D[I][0])
-				TMP=cons(cdr(D[I]),TMP)$
-			else{
-				D0=cons(TMP,D0)$	
-				TMP=[]$
-				TMP=cons(cdr(D[I]),TMP)$
-				X=car(D[I])$
-			}
-		}
-		D0=cdr(reverse(cons(TMP,D0)))$
-		D0=map(ltov,D0)$
-		for(I=0,TMP=[[]];I<length(D0);I++){
-			TMP0=perm(length(D0[I])-1,D0[I],[])$
-			TMP=marge(TMP,TMP0)$
-		}
-		
-		RET=[]$
-		for(I=0;I<length(TMP);I++){
-			TMP0=[]$
-			TMP1=[]$
-			for(J=0;J<length(TMP[I]);J++){
-				TMP0=cons(TMP[I][J][0],TMP0)$
-				TMP1=cons(TMP[I][J][1],TMP1)$
-			}	
-			TMP0=reverse(TMP0)$
-			TMP1=reverse(TMP1)$
-
-			RET=cons([TMP0,TMP1],RET)$
-		}
-		
-		return RET$
-	}	
+	return [[ID,E,F]]$
 }
 
-def derase(A){
-
-	B=newvect(length(A),A)$
-	B=qsort(B,junban)$
-	C=[]$
-	for(I=0;I<size(B)[0];I++)
-		if(car(C)!=B[I])
-			C=cons(B[I],C)$
-
-	return reverse(C)$
-}
-
 def nonposdegchk(Res){
 
 	for(I=0;I<length(Res);I++)
@@ -163,7 +271,7 @@ def getgcd(A,B){
 	for(I=0;I<VarsNumA;I++){
 
 		for(J=0;J<VarsNumB;J++)
-			if(C[J]==A[I][0])
+			if(B[J]==A[I][0])
 				break$
 
 		if(J<VarsNumB)
@@ -204,24 +312,25 @@ def makeret(Res,Vars,FLAG){
 	VarsNum=length(Vars)$
 
 	ResVec=newvect(ResNum)$
-	for(M=0,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]$
-			}
-		}
-	}		
-	
+        for(M=0,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(M!=0)
 		ResVec=ResVec/M;
 
-	RET=newvect(VarsNum,Vars)$
+ 	RET=newvect(VarsNum,Vars)$
 
 	for(I=0;I<ResNum;I++){
 		for(J=0;J<VarsNum;J++)
@@ -253,7 +362,7 @@ def roundret(V){
 		RET1=I*RET0$
 		for(J=0;J<VN;J++){
 			X=drint(RET1[J])$
-			if(dabs(X-RET1[J])<0.2)
+			if(dabs(X-RET1[J])<ROUND_THRESHOLD)
 				RET1[J]=X$
 			else
 				break$
@@ -349,6 +458,26 @@ def checktd(PolyList,Vars,ResVars){
 	return 1$
 }
 
+def value2(Vars,Ans){
+
+	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=getgcd(Res,Vars)$
+
+	if(nonposdegchk(Res)){
+		TMP1=makeret(Res,Vars,1)$
+		return vtol(TMP1[1])$
+	}
+	else
+		return []$
+}
+
 def qcheck(PolyList,Vars,FLAG){
 
 	RET=[]$
@@ -380,28 +509,49 @@ def qcheck(PolyList,Vars,FLAG){
 
 	if(nonposdegchk(Res)){
 
-	   	ResVars=makeret(Res,Vars,0)$
+	   	TMP1=makeret(Res,Vars,0)$
 
-		if(checktd(PolyList,Vars,ResVars[1])==1){
-			if(ResVars[0]==0){
-				RET=append(RET,wsort(ResVars[1],Vars,
-					ResVars[1],FLAG))$
-				return RET$
+		if(checktd(PolyList,Vars,TMP1[1])==1){
+
+			if(FLAG==0){
+
+				if(TMP1[0]==0)
+					RET=append(RET,wsort(TMP1[1],Vars,TMP1[1],0))$
+				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)$
+						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])$
+						RET0=value2(Vars,TMP)$
+	
+						if(RET0!=[])
+							RET0=wsort(RET0,Vars,RET0,1/10)$
+					}
+					RET=append(RET,RET0)$
+				}
 			}
-			else{
-				RET=append(RET,[[Vars,vtol(ResVars[1])]])$
-				return RET$
-			}
+			else if(FLAG==1)
+				RET=append(RET,[[0,Vars,vtol(TMP1[1])]])$
 		}
-		else
-			return []$
 	}
-	else
-		return []$
 
+	return RET$
 }
 
-def leastsq(NormMat,ExpMat,Vars,FLAG){
+def leastsq(NormMat,ExpMat,Vars,FLAG,ID){
 
 	RET=[]$
 
@@ -448,28 +598,56 @@ def leastsq(NormMat,ExpMat,Vars,FLAG){
 	Res=getgcd(Res,Rea)$
 
 	if(nonposdegchk(Res)){
+
 		TMP1=makeret(Res,Vars,1)$
-		if(TMP1[0]==0){	
-			TMP=roundret(TMP1[1]*1.0)$
-			if(TMP!=[])
-				RET=append(RET,wsort(TMP1[1],Vars,TMP,FLAG))$
 
-			RET=append(RET,wsort(TMP1[1],Vars,
-				map(drint,TMP1[1]*1.0),FLAG))$
+		if(FLAG==0){
 
-			return RET$
+			if(TMP1[0]==0){	
+
+				TMP=roundret(TMP1[1])$
+
+				RET=append(RET,wsort(TMP1[1],Vars,map(drint,TMP1[1]*1.0),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)$
+					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])$
+					RET0=value2(Vars,TMP)$
+	
+					if(RET0!=[])
+						RET0=wsort(RET0,Vars,RET0,1/10)$
+				}
+
+				RET=append(RET,RET0)$
+			}
+
 		}
-		else{
-			RET=append(RET,[[Vars,vtol(TMP1[1]*1.0)]])$
-			return RET$
-		}
+		else if(FLAG==1)
+			RET=append(RET,[[ID,Vars,vtol(TMP1[1])]])$
 	}
-	else
-		return RET$
 
+	return RET$
 }
 
-def weightr(ExpMat,Vars,PolyListNum,OneMat,FLAG){
+def unitweight(ExpMat,Vars,PolyListNum,OneMat,FLAG){
 
 	RET=[]$
 
@@ -483,108 +661,69 @@ def weightr(ExpMat,Vars,PolyListNum,OneMat,FLAG){
 
 	ExtVars=reverse(ExtVars)$
 
-	NormMat=newmat(ExpMatColNum,ExtMatColNum)$
+	NormMat0=newvect(ExpMatColNum)$
+	for(I=0;I<ExpMatColNum;I++)
+		NormMat0[I]=newvect(ExpMatColNum)$
 
 	for(I=0;I<ExpMatColNum;I++)
 		for(J=I;J<ExpMatColNum;J++)
 			for(K=0;K<ExpMatRowNum;K++)
-				NormMat[I][J]+=
+				NormMat0[I][J]+=
 					ExpMat[K][I]*
 					ExpMat[K][J]$
 
-	for(I=0;I<ExpMatColNum;I++)
-		for(J=0;J<PolyListNum;J++)
-			for(K=OneMat[J];K<OneMat[J+1];K++)
-				NormMat[I][J+ExpMatColNum]-=
-					ExpMat[K][I]$
+	NormMat1=newvect(ExtMatColNum)$
+	for(I=0;I<ExtMatColNum;I++)
+		NormMat1[I]=newvect(ExtMatColNum)$
 
-	WVect=newvect(PolyListNum)$
-	for(I=0;I<PolyListNum;I++)
-		WVect[I]=OneMat[I+1]-OneMat[I]$
 
-	for(F=0;F<ExtMatColNum;F++){
-		SolveList=[]$
-		for(I=0;I<ExpMatColNum;I++){
-			if (F==I) 
-				continue$
+	WorkMat=newvect(ExtMatColNum)$
+	for(I=0;I<ExtMatColNum;I++)
+		WorkMat[I]=newvect(ExtMatColNum)$
 
-			TMP=0$
-		
-			for(J=0;J<I;J++)
-				if(J!=F)
-					TMP+=NormMat[J][I]*ExtVars[J]$
 
-			for(J=I;J<ExtMatColNum;J++)
-				if(J!=F)	
-					TMP+=NormMat[I][J]*ExtVars[J]$
-			
-			if(F<I)
-				TMP+=NormMat[F][I]$
-			else
-				TMP+=NormMat[I][F]$
-	
-			SolveList=cons(TMP,SolveList)$
-		}		
-		
-		for(I=0;I<PolyListNum;I++){
-			if(F==(I+ExpMatColNum))
-				continue$
-			
-			TMP=0$
-			for(J=0;J<ExpMatColNum;J++)
-				if(J!=F)
-					TMP+=NormMat[J][I+ExpMatColNum]
-						*ExtVars[J]$
+	for(I=0;I<ExpMatColNum;I++)
+		for(J=I;J<ExpMatColNum;J++)
+			NormMat1[I][J]=NormMat0[I][J]$
 
-			TMP+=WVect[I]*ExtVars[I+ExpMatColNum]$
+	for(I=0;I<ExpMatColNum;I++)
+		for(J=0;J<PolyListNum;J++)
+			for(K=OneMat[J];K<OneMat[J+1];K++)
+				NormMat1[I][J+ExpMatColNum]-=ExpMat[K][I]$
 
-			if(F<ExpMatColNum)
-				TMP+=NormMat[F][I+ExpMatColNum]$
+	for(I=0;I<PolyListNum;I++)
+		NormMat1[I+ExpMatColNum][I+ExpMatColNum]=OneMat[I+1]-OneMat[I]$
 
-			SolveList=cons(TMP,SolveList)$
-		}	
+	if(jacobi(ExtMatColNum,NormMat1,WorkMat)){
 
-		Rea=vars(SolveList)$
+		Res=newvect(ExpMatColNum)$
+		for(I=0;I<ExpMatColNum;I++){
+			Res[I]=newvect(2)$
+			Res[I][0]=Vars[I]$
+			Res[I][1]=WorkMat[ExtMatColNum-1][I]$
+		}
 
-		SolVars=[]$
-		for(I=0;I<ExtMatColNum;I++)
-			if(I!=F && member(ExtVars[I],Rea))
-				SolVars=cons(ExtVars[I],SolVars)$
-
-		Res=solve(SolveList,SolVars)$
-		Res=cons([ExtVars[F],1],Res)$
-
-		TMP=[]$
-		for(I=0;I<length(Rea);I++)
-			if(member(Rea[I],Vars))
-				TMP=cons(Rea[I],TMP)$
-	
-		TMP=cons(ExtVars[F],TMP)$
-		Res=getgcd(Res,TMP)$
-	
 		if(nonposdegchk(Res)){
 
 			TMP1=makeret(Res,Vars,1)$
-			if(TMP1[0]==0){	
-				TMP=roundret(TMP1[1]*1.0)$
-				if(TMP!=[])
-					RET=append(RET,wsort(TMP1[1],Vars,
-						TMP,FLAG))$
 
-				RET=append(RET,wsort(TMP1[1],Vars,
-					map(drint,TMP1[1]*1.0),FLAG))$
-			}
-			else{
-				RET=append(RET,[[Vars,vtol(TMP1[1]*1.0)]])$
-			}
-		}
+			if(FLAG==0){		
+				TMP=roundret(TMP1[1])$
 
-	}
+				RET=append(RET,wsort(TMP1[1],Vars,map(drint,TMP1[1]*1.0),1))$
 
-	return [NormMat,RET]$
+				if(TMP!=[])
+					RET=append(RET,wsort(TMP1[1],Vars,TMP,2))$
+			}
+			else if(FLAG==1)
+				RET=append(RET,[[1,Vars,vtol(TMP1[1])]])$
+		}
+	}	
+	
+	return [NormMat0,RET]$
 }
 
-def weight(PolyList,Vars,FLAG1,FLAG2){
+def weight(PolyList,Vars,FLAG){
 
 	Vars0=vars(PolyList)$
 	Vars1=[]$
@@ -596,52 +735,38 @@ def weight(PolyList,Vars,FLAG1,FLAG2){
 
 	RET=[]$
 
-	TMP=qcheck(PolyList,Vars,FLAG2)$
+	TMP=qcheck(PolyList,Vars,FLAG)$
 
 	if(TMP!=[]){
 		RET=append(RET,TMP)$
-		return cons(1,RET)$
+		return RET$
 	}
 
 	dp_ord(2)$
 
 	PolyListNum=length(PolyList)$
 
-	if(FLAG1){
-
-		OneMat=newvect(PolyListNum+1,[0])$
-		ExpMat=[]$
-		for(I=0;I<PolyListNum;I++){
-			for(Poly=dp_ptod(PolyList[I],Vars);
-				Poly!=0;Poly=dp_rest(Poly)){
-				ExpMat=cons(dp_etov(dp_ht(Poly)),ExpMat)$
-			}
-			OneMat[I+1]=length(ExpMat)$
+	OneMat=newvect(PolyListNum+1,[0])$
+	ExpMat=[]$
+	for(I=0;I<PolyListNum;I++){
+		for(Poly=dp_ptod(PolyList[I],Vars);
+			Poly!=0;Poly=dp_rest(Poly)){
+			ExpMat=cons(dp_etov(dp_ht(Poly)),ExpMat)$
 		}
+		OneMat[I+1]=length(ExpMat)$
+	}
 
-		ExpMat=reverse(ExpMat)$
-		ExpMat=newvect(length(ExpMat),ExpMat)$
+	ExpMat=reverse(ExpMat)$
+	ExpMat=newvect(length(ExpMat),ExpMat)$
 
-		TMP=weightr(ExpMat,Vars,PolyListNum,OneMat,FLAG2)$
-		RET=append(RET,TMP[1])$
-		RET=append(RET,leastsq(TMP[0],ExpMat,Vars,FLAG2))$
-	}
-	else{
-		ExpMat=[]$
-		for(I=0;I<PolyListNum;I++){
-			for(Poly=dp_ptod(PolyList[I],Vars);
-				Poly!=0;Poly=dp_rest(Poly)){
-				if(nonzerovec(TMP=dp_etov(dp_ht(Poly))))
-					ExpMat=cons(TMP,ExpMat)$
-			}
-		}
+	TMP=unitweight(ExpMat,Vars,PolyListNum,OneMat,FLAG)$
 
-		ExpMat=reverse(ExpMat)$
-		ExpMat=newvect(length(ExpMat),ExpMat)$
+	RET=append(RET,TMP[1])$
 
-		RET=append(RET,leastsq(0,ExpMat,Vars,FLAG2))$
-	}
+	TMP0=leastsq(TMP[0],ExpMat,Vars,FLAG,3)$
 
+	RET=append(RET,TMP0)$
+
 	ExpMat=qsort(ExpMat,junban)$
 
 	ExpMat2=[]$
@@ -651,11 +776,23 @@ def weight(PolyList,Vars,FLAG1,FLAG2){
 
 	if(size(ExpMat)[0]!=length(ExpMat2)){
 		ExpMat=newvect(length(ExpMat2),ExpMat2)$
-		RET=append(RET,leastsq(0,ExpMat,Vars,FLAG2))$
+		RET=append(RET,leastsq(0,ExpMat,Vars,FLAG,5))$
 	}
+	else{
+		TMP0=map(ltov,TMP0)$
 
-	RET=derase(RET)$
-	return cons(0,RET)$
+		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$
+
+		TMP0=map(vtol,TMP0)$
+
+		RET=append(RET,TMP0)$
+	}
+
+	return RET$
 }
 
 end$