[BACK]Return to nd.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2018 / engine

Diff for /OpenXM_contrib2/asir2018/engine/nd.c between version 1.51 and 1.52

version 1.51, 2021/03/09 07:07:02 version 1.52, 2021/03/09 08:48:50
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.50 2021/03/09 05:20:35 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.51 2021/03/09 07:07:02 noro Exp $ */
   
 #include "nd.h"  #include "nd.h"
   
Line 2623  init_eg(&eg_update);
Line 2623  init_eg(&eg_update);
   }    }
   sugar = 0;    sugar = 0;
   if ( nd_hpdata ) {    if ( nd_hpdata ) {
       if ( DP_Print ) fprintf(asir_out,"Hilbert driven algorithm.\n");
     setup_hpdata(&final_hpdata,&current_hpdata);      setup_hpdata(&final_hpdata,&current_hpdata);
   }    }
   while ( d ) {    while ( d ) {
Line 2647  again:
Line 2648  again:
         else {          else {
           final_hpvalue = hpvalue(&final_hpdata,sugar);            final_hpvalue = hpvalue(&final_hpdata,sugar);
           if ( final_hpvalue == hpvalue(&current_hpdata,sugar) ) {            if ( final_hpvalue == hpvalue(&current_hpdata,sugar) ) {
             if ( DP_Print ) fprintf(asir_out,"sugar=%d done.\n",sugar);  //            if ( DP_Print ) fprintf(asir_out,"done.\n",sugar);
             d = nd_remove_same_sugar(d,sugar);              d = nd_remove_same_sugar(d,sugar);
             continue;              continue;
           }            }
Line 2713  get_eg(&eg2); add_eg(&eg_update,&eg1,&eg2);
Line 2714  get_eg(&eg2); add_eg(&eg_update,&eg1,&eg2);
       if ( nd_hpdata ) {        if ( nd_hpdata ) {
         update_hpdata(&current_hpdata,nh,1);          update_hpdata(&current_hpdata,nh,1);
         if ( final_hpvalue == hpvalue(&current_hpdata,sugar) ) {          if ( final_hpvalue == hpvalue(&current_hpdata,sugar) ) {
           if ( DP_Print ) fprintf(asir_out,"sugar=%d done.\n",sugar);  //          if ( DP_Print ) fprintf(asir_out,"sugar=%d done.\n",sugar);
           d = nd_remove_same_sugar(d,sugar);            d = nd_remove_same_sugar(d,sugar);
         }          }
       }        }
Line 3049  init_eg(&eg_hpdata);
Line 3050  init_eg(&eg_hpdata);
 init_eg(&eg_sbabuch);  init_eg(&eg_sbabuch);
 get_eg(&eg3);  get_eg(&eg3);
   while ( 1 ) {    while ( 1 ) {
     if ( DP_Print && dlen%100 == 0 ) fprintf(asir_out,"(%d)",dlen);      if ( DP_Print && !nd_hpdata && dlen%100 == 0 ) fprintf(asir_out,"(%d)",dlen);
 again :  again :
 get_eg(&eg1);  get_eg(&eg1);
     ind = nd_minsig(d);      ind = nd_minsig(d);
Line 3371  NODE nd_gb_trace(int m,int ishomo,int **indp)
Line 3372  NODE nd_gb_trace(int m,int ishomo,int **indp)
   }    }
   sugar = 0;    sugar = 0;
   if ( nd_hpdata ) {    if ( nd_hpdata ) {
       if ( DP_Print ) fprintf(asir_out,"Hilbert driven algorithm.\n");
     setup_hpdata(&final_hpdata,&current_hpdata);      setup_hpdata(&final_hpdata,&current_hpdata);
   }    }
   
Line 3400  again:
Line 3402  again:
         else {          else {
           final_hpvalue = hpvalue(&final_hpdata,sugar);            final_hpvalue = hpvalue(&final_hpdata,sugar);
           if ( final_hpvalue == hpvalue(&current_hpdata,sugar) ) {            if ( final_hpvalue == hpvalue(&current_hpdata,sugar) ) {
             if ( DP_Print ) fprintf(asir_out,"sugar=%d done.\n",sugar);  //            if ( DP_Print ) fprintf(asir_out,"sugar=%d done.\n",sugar);
             d = nd_remove_same_sugar(d,sugar);              d = nd_remove_same_sugar(d,sugar);
             continue;              continue;
           }            }
Line 3482  again:
Line 3484  again:
         if ( nd_hpdata ) {          if ( nd_hpdata ) {
           update_hpdata(&current_hpdata,nh,1);            update_hpdata(&current_hpdata,nh,1);
           if ( final_hpvalue == hpvalue(&current_hpdata,sugar) ) {            if ( final_hpvalue == hpvalue(&current_hpdata,sugar) ) {
             if ( DP_Print ) fprintf(asir_out,"sugar=%d done.\n",sugar);  //            if ( DP_Print ) fprintf(asir_out,"sugar=%d done.\n",sugar);
             d = nd_remove_same_sugar(d,sugar);              d = nd_remove_same_sugar(d,sugar);
           }            }
         }          }
Legend:
Removed from v.1.51  
changed lines
  Added in v.1.52
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>