===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/F.c,v
retrieving revision 1.10
retrieving revision 1.12
diff -u -p -r1.10 -r1.12
--- OpenXM_contrib2/asir2000/engine/F.c	2001/10/09 01:36:09	1.10
+++ OpenXM_contrib2/asir2000/engine/F.c	2013/01/08 07:25:58	1.12
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/engine/F.c,v 1.9 2001/07/04 07:19:19 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/F.c,v 1.11 2002/01/15 01:09:55 noro Exp $ 
 */
 #include "ca.h"
 #include <math.h>
@@ -130,13 +130,13 @@ void mfctr(VL vl,P f,DCP *dcp)
 #endif
 		pcp(mvl,pmin,&ppmin,&cmin);
 		if ( !NUM(cmin) ) {
-			mfctrmain(mvl,cmin,&dcs);
-			for ( dcr = dcs; dcr; dcr = NEXT(dcr) ) {
+			mfctr(mvl,cmin,&dcs);
+			for ( dcr = NEXT(dcs); dcr; dcr = NEXT(dcr) ) {
 				DEG(dcr) = DEG(dct);
 				reorderp(vl,mvl,COEF(dcr),&t); COEF(dcr) = t;
 			}
 			for ( ; NEXT(dc); dc = NEXT(dc) );
-			NEXT(dc) = dcs;
+			NEXT(dc) = NEXT(dcs);
 		}
 		mfctrmain(mvl,ppmin,&dcs);
 		for ( dcr = dcs; dcr; dcr = NEXT(dcr) ) {
@@ -160,9 +160,9 @@ void mfctr_wrt_v(VL vl,P f,V v,DCP *dcp)
 	NEWDC(dc0); dc = dc0; COEF(dc) = (P)c; DEG(dc) = ONE; NEXT(dc) = 0;
 	msqfr(vl,p,&dct);
 	for ( ; dct; dct = NEXT(dct) ) {
-		clctv(vl,f,&nvl);
+		clctv(vl,COEF(dct),&nvl);
 		reordvar(nvl,v,&mvl);
-		reorderp(mvl,vl,f,&pmin);
+		reorderp(mvl,vl,COEF(dct),&pmin);
 		pcp(mvl,pmin,&ppmin,&cmin);
 		if ( !NUM(cmin) ) {
 			mfctrmain(mvl,cmin,&dcs);