[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.62 and 1.63

version 1.62, 2021/12/19 08:23:28 version 1.63, 2022/01/13 08:15:02
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.61 2021/12/18 04:43:59 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.62 2021/12/19 08:23:28 noro Exp $ */
   
 #include "nd.h"  #include "nd.h"
   
Line 70  static NODE nd_tracelist;
Line 70  static NODE nd_tracelist;
 static NODE nd_alltracelist;  static NODE nd_alltracelist;
 static int nd_gentrace,nd_gensyz,nd_nora,nd_newelim,nd_intersect,nd_lf,nd_norb;  static int nd_gentrace,nd_gensyz,nd_nora,nd_newelim,nd_intersect,nd_lf,nd_norb;
 static int nd_f4_td,nd_sba_f4step,nd_sba_pot,nd_sba_largelcm,nd_sba_dontsort,nd_sba_redundant_check;  static int nd_f4_td,nd_sba_f4step,nd_sba_pot,nd_sba_largelcm,nd_sba_dontsort,nd_sba_redundant_check;
 static int nd_top,nd_sba_syz,nd_sba_inputisgb;  static int nd_top,nd_sba_syz,nd_sba_inputisgb,nd_sba_heu;
 static int *nd_gbblock;  static int *nd_gbblock;
 static NODE nd_nzlist,nd_check_splist;  static NODE nd_nzlist,nd_check_splist;
 static int nd_splist;  static int nd_splist;
Line 2601  ND_pairs nd_remove_same_sugar( ND_pairs d, int sugar)
Line 2601  ND_pairs nd_remove_same_sugar( ND_pairs d, int sugar)
       prev = cur;        prev = cur;
     cur = cur->next;      cur = cur->next;
   }    }
   if ( DP_Print ) fprintf(asir_out,"[%d]",i);    if ( DP_Print && i ) fprintf(asir_out,"[%d]",i);
   return root.next;    return root.next;
 }  }
   
Line 3171  get_eg(&eg2); 
Line 3171  get_eg(&eg2); 
        get_eg(&eg2); add_eg(&eg_updatepairs,&eg1,&eg2);         get_eg(&eg2); add_eg(&eg_updatepairs,&eg1,&eg2);
        nd_sba_pos[sig->pos] = append_one(nd_sba_pos[sig->pos],nh);         nd_sba_pos[sig->pos] = append_one(nd_sba_pos[sig->pos],nh);
        if ( nd_hpdata ) {         if ( nd_hpdata ) {
            int dg,sugar0;
   
          get_eg(&eg1);           get_eg(&eg1);
          update_hpdata(&current_hpdata,nh);           update_hpdata(&current_hpdata,nh);
          get_eg(&eg2); add_eg(&eg_hpdata,&eg1,&eg2);           get_eg(&eg2); add_eg(&eg_hpdata,&eg1,&eg2);
          if ( !compp(CO,final_hpdata.hn,current_hpdata.hn) ) {           dg = comp_hn(final_hpdata.hn,current_hpdata.hn);
   //         if ( !compp(CO,final_hpdata.hn,current_hpdata.hn) )
            if ( dg < 0 ) {
            if ( DP_Print ) { printf("\nWe found a gb.\n"); }             if ( DP_Print ) { printf("\nWe found a gb.\n"); }
              break;               break;
          }           } else if ( nd_sba_heu == 1 ) {
              for ( i = 0; i < ngen; i++ ) {
                sugar0 = sugar;
                while ( d[i] && dg > sugar0 ) {
                  d[i] = nd_remove_same_sugar(d[i],sugar0);
                  sugar0++;
                }
             }
           }
       }        }
    } else {     } else {
       d[ind] = d[ind]->next; dlen--;        d[ind] = d[ind]->next; dlen--;
Line 10670  void parse_nd_option(VL vl,NODE opt)
Line 10682  void parse_nd_option(VL vl,NODE opt)
   nd_f4_td = 0; nd_sba_f4step = 2; nd_sba_pot = 0; nd_sba_largelcm = 0;    nd_f4_td = 0; nd_sba_f4step = 2; nd_sba_pot = 0; nd_sba_largelcm = 0;
   nd_sba_dontsort = 0; nd_top = 0; nd_sba_redundant_check = 0;    nd_sba_dontsort = 0; nd_top = 0; nd_sba_redundant_check = 0;
   nd_sba_syz = 0; nd_sba_modord = 0; nd_sba_inputisgb = 0;    nd_sba_syz = 0; nd_sba_modord = 0; nd_sba_inputisgb = 0;
   nd_hpdata = 0;    nd_hpdata = 0; nd_sba_heu = 0;
   
   for ( t = opt; t; t = NEXT(t) ) {    for ( t = opt; t; t = NEXT(t) ) {
     p = BDY((LIST)BDY(t));      p = BDY((LIST)BDY(t));
Line 10739  void parse_nd_option(VL vl,NODE opt)
Line 10751  void parse_nd_option(VL vl,NODE opt)
       nd_sba_dontsort = value?1:0;        nd_sba_dontsort = value?1:0;
     } else if ( !strcmp(key,"sba_syz") ) {      } else if ( !strcmp(key,"sba_syz") ) {
       nd_sba_syz = value?1:0;        nd_sba_syz = value?1:0;
       } else if ( !strcmp(key,"sba_heu") ) {
         nd_sba_heu = value?1:0;
     } else if ( !strcmp(key,"sba_modord") ) {      } else if ( !strcmp(key,"sba_modord") ) {
       // value=[vlist,ordspec,weight]        // value=[vlist,ordspec,weight]
       u = BDY((LIST)value);        u = BDY((LIST)value);
Legend:
Removed from v.1.62  
changed lines
  Added in v.1.63
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>