=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.51 retrieving revision 1.53 diff -u -p -r1.51 -r1.53 --- OpenXM_contrib2/asir2000/builtin/gr.c 2003/07/09 07:11:07 1.51 +++ OpenXM_contrib2/asir2000/builtin/gr.c 2003/07/18 10:13:12 1.53 @@ -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/builtin/gr.c,v 1.50 2003/07/01 08:12:38 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.52 2003/07/16 05:31:21 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -105,8 +105,8 @@ static int NoRA = 0; static int ShowMag = 0; static int Stat = 0; static int Denominator = 1; -static int Top = 0; -static int Reverse = 0; +int Top = 0; +int Reverse = 0; static int Max_mag = 0; static int Max_coef = 0; static char *Demand = 0; @@ -1974,7 +1974,7 @@ DP_pairs criterion_F( DP_pairs d1 ) for ( head = last = 0, p = d1; NEXT(p); ) { s = (r = w = collect_pairs_of_hdlcm( p, &rest ))->sugar; while ( w = NEXT(w) ) - if ( criterion_2( w->dp1, w->dp2 ) ) { + if ( !do_weyl && criterion_2( w->dp1, w->dp2 ) ) { r = w; break; } else if ( w->sugar < s ) s = (r = w)->sugar;