===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/weight,v
retrieving revision 1.34
retrieving revision 1.36
diff -u -p -r1.34 -r1.36
--- OpenXM_contrib2/asir2000/lib/weight	2004/05/05 13:15:01	1.34
+++ OpenXM_contrib2/asir2000/lib/weight	2004/05/06 02:55:39	1.36
@@ -780,7 +780,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){
@@ -827,7 +827,8 @@ def weight(PolyList,Vars,FLAG){
 	if(TMP[1]!=[])
 		RET=append(RET,TMP[1])$
 	else{
-		RET=append(RET,leastsq(0,ExpMat,Vars,FLAG,7))$
+		TMP=leastsq(0,ExpMat,Vars,FLAG,7)$
+		RET=append(RET,TMP[1])$
 	}
 
 	ExpMat=qsort(ExpMat,junban)$
@@ -843,22 +844,27 @@ def weight(PolyList,Vars,FLAG){
 		if(TMP[1]!=[])
 			RET=append(RET,TMP[1])$
 		else{
-			RET=append(RET,leastsq(0,ExpMat,Vars,FLAG,9))$
+			TMP=leastsq(0,ExpMat,Vars,FLAG,9)$
+			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$
+			else if(TMP[I][0]==7)
+				TMP[I][0]=9$
+			else if(TMP[I][0]==8)
+				TMP[I][0]=10$
+		}
 
-		TMP0=map(vtol,TMP0)$
+		TMP=map(vtol,TMP)$
 
-		RET=append(RET,TMP0)$
+		RET=append(RET,TMP)$
 	}
 
 	return RET$