=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/F.c,v retrieving revision 1.5 retrieving revision 1.7 diff -u -p -r1.5 -r1.7 --- OpenXM_contrib2/asir2000/engine/F.c 2001/04/19 04:52:41 1.5 +++ OpenXM_contrib2/asir2000/engine/F.c 2001/04/20 02:46:55 1.7 @@ -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.4 2000/08/22 05:04:04 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/F.c,v 1.6 2001/04/20 02:34:21 noro Exp $ */ #include "ca.h" #include @@ -317,6 +317,8 @@ DCP *dcp; } } + /* determine the position of variables which is not allowed to + be set to 0 */ for ( i = 0; vn1[i].v; i++ ) { x = vn1[i].n; vn1[i].n = 0; substvp(nvl,LC(p),vn1,&p0); @@ -852,13 +854,14 @@ DCP *dcp; *dcp = dc; return; } else { - d = d1; + d = d1+1; /* XXX : try searching better evaluation */ + found = 0; break; } } } - for ( dcr0 = 0, g = p, d = deg(VR(g),g), found = 0; ; ) { + for ( dcr0 = 0, g = p; ; ) { while ( 1 ) { for ( i = 0, j = 0; vn[i].v; i++ ) if ( vn[i].n ) vnt[j++].v = (V)i;