[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.33 and 1.38

version 1.33, 2020/07/09 02:33:38 version 1.38, 2020/10/26 02:41:05
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.32 2020/07/07 08:08:26 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.37 2020/10/06 06:31:19 noro Exp $ */
   
 #include "nd.h"  #include "nd.h"
   
Line 18  NM _nm_free_list;
Line 18  NM _nm_free_list;
 ND _nd_free_list;  ND _nd_free_list;
 ND_pairs _ndp_free_list;  ND_pairs _ndp_free_list;
 NODE nd_hcf;  NODE nd_hcf;
 int Nsyz;  int Nsyz,Nsamesig;
   
 Obj nd_top_weight;  Obj nd_top_weight;
   
Line 66  static int *nd_poly_weight,*nd_module_weight;
Line 66  static int *nd_poly_weight,*nd_module_weight;
 static NODE nd_tracelist;  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;  static int nd_gentrace,nd_gensyz,nd_nora,nd_newelim,nd_intersect,nd_lf;
   static int nd_f4_td,nd_sba_f4step,nd_sba_pot,nd_sba_largelcm;
 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 1223  void print_sig(SIG s)
Line 1224  void print_sig(SIG s)
   fprintf(asir_out,">>*e%d",s->pos);    fprintf(asir_out,">>*e%d",s->pos);
 }  }
   
   // assuming increasing order wrt signature
   
 INLINE int ndl_find_reducer_s(UINT *dg,SIG sig)  INLINE int ndl_find_reducer_s(UINT *dg,SIG sig)
 {  {
   RHist r;    RHist r;
Line 1237  INLINE int ndl_find_reducer_s(UINT *dg,SIG sig)
Line 1240  INLINE int ndl_find_reducer_s(UINT *dg,SIG sig)
     tmp = (UINT *)MALLOC(wpd*sizeof(UINT));      tmp = (UINT *)MALLOC(wpd*sizeof(UINT));
   }    }
   d = ndl_hash_value(dg);    d = ndl_hash_value(dg);
   #if 1
   for ( r = nd_red[d], k = 0; r; r = NEXT(r), k++ ) {    for ( r = nd_red[d], k = 0; r; r = NEXT(r), k++ ) {
     if ( ndl_equal(dg,DL(r)) ) {      if ( ndl_equal(dg,DL(r)) ) {
       return r->index;        return r->index;
     }      }
   }    }
   #endif
   singular = 0;    singular = 0;
   for ( i = 0; i < nd_psn; i++ ) {    for ( i = 0; i < nd_psn; i++ ) {
     r = nd_psh[i];      r = nd_psh[i];
Line 1252  INLINE int ndl_find_reducer_s(UINT *dg,SIG sig)
Line 1257  INLINE int ndl_find_reducer_s(UINT *dg,SIG sig)
       quo->pos = nd_psh[i]->sig->pos;        quo->pos = nd_psh[i]->sig->pos;
       ret = comp_sig(sig,quo);        ret = comp_sig(sig,quo);
       if ( ret > 0 ) { singular = 0; break; }        if ( ret > 0 ) { singular = 0; break; }
       if ( ret == 0 ) { fprintf(asir_out,"s"); fflush(asir_out); singular = 1; }        if ( ret == 0 ) { /* fprintf(asir_out,"s"); fflush(asir_out); */ singular = 1; }
     }      }
   }    }
   if ( singular ) return -1;    if ( singular ) return -1;
Line 2477  get_eg(&eg2); add_eg(&eg_update,&eg1,&eg2);
Line 2482  get_eg(&eg2); add_eg(&eg_update,&eg1,&eg2);
      }       }
      if ( DP_Print ) { printf("."); fflush(stdout); }       if ( DP_Print ) { printf("."); fflush(stdout); }
        FREENDP(l);         FREENDP(l);
    }       }
  }    }
  conv_ilist(nd_demand,0,g,indp);    conv_ilist(nd_demand,0,g,indp);
     if ( !checkonly && DP_Print ) { printf("nd_gb done. Number of nd_add=%d\n",Nnd_add); fflush(stdout); }    if ( !checkonly && DP_Print ) { printf("nd_gb done. Number of nd_add=%d\n",Nnd_add); fflush(stdout); }
 print_eg("update",&eg_update);  
     return g;    if ( DP_Print )
       print_eg("update",&eg_update);
     return g;
 }  }
   
 ND_pairs update_pairs_s(ND_pairs d,int t,NODE *syz);  ND_pairs update_pairs_s(ND_pairs d,int t,NODE *syz);
Line 2555  int small_lcm(ND_pairs l)
Line 2562  int small_lcm(ND_pairs l)
   static DL lcm,mul,quo;    static DL lcm,mul,quo;
   static int nvar;    static int nvar;
   
     if ( nd_sba_largelcm ) return 0;
   if ( nvar < nd_nvar ) {    if ( nvar < nd_nvar ) {
     nvar = nd_nvar; NEWDL(lcm,nvar); NEWDL(quo,nvar); NEWDL(mul,nvar);      nvar = nd_nvar; NEWDL(lcm,nvar); NEWDL(quo,nvar); NEWDL(mul,nvar);
   }    }
Line 2713  get_eg(&eg2); add_eg(&eg_remove,&eg1,&eg2);
Line 2721  get_eg(&eg2); add_eg(&eg_remove,&eg1,&eg2);
  }   }
  g = conv_ilist_s(nd_demand,0,indp);   g = conv_ilist_s(nd_demand,0,indp);
  if ( DP_Print ) {   if ( DP_Print ) {
    printf("\nnd_sba done. nd_add=%d,Nsyz=%d,Nredundant=%d\n",Nnd_add,Nsyz,Nredundant);     printf("\nnd_sba done. nd_add=%d,Nsyz=%d,Nsamesig=%d,Nredundant=%d\n",Nnd_add,Nsyz,Nsamesig,Nredundant);
    fflush(stdout);     fflush(stdout);
    print_eg("create",&eg_create);     print_eg("create",&eg_create);
    print_eg("merge",&eg_merge);     print_eg("merge",&eg_merge);
Line 3197  ND_pairs nd_newpairs( NODE g, int t )
Line 3205  ND_pairs nd_newpairs( NODE g, int t )
   
 int comp_sig(SIG s1,SIG s2)  int comp_sig(SIG s1,SIG s2)
 {  {
 #if 0    if ( nd_sba_pot ) {
   if ( s1->pos > s2->pos ) return 1;      if ( s1->pos > s2->pos ) return 1;
   else if ( s1->pos < s2->pos ) return -1;      else if ( s1->pos < s2->pos ) return -1;
   else return (*cmpdl)(nd_nvar,s1->dl,s2->dl);      else return (*cmpdl)(nd_nvar,s1->dl,s2->dl);
 #else    } else {
   static DL m1,m2;      static DL m1,m2;
   static int nvar;      static int nvar;
   int ret;      int ret;
   
   if ( nvar != nd_nvar ) {      if ( nvar != nd_nvar ) {
     nvar = nd_nvar; NEWDL(m1,nvar); NEWDL(m2,nvar);        nvar = nd_nvar; NEWDL(m1,nvar); NEWDL(m2,nvar);
       }
       _adddl(nd_nvar,s1->dl,nd_sba_hm[s1->pos],m1);
       _adddl(nd_nvar,s2->dl,nd_sba_hm[s2->pos],m2);
       ret = (*cmpdl)(nd_nvar,m1,m2);
       if ( ret != 0 ) return ret;
       else if ( s1->pos > s2->pos ) return 1;
       else if ( s1->pos < s2->pos ) return -1;
       else return 0;
   }    }
 #if 0  
   _copydl(nd_nvar,nd_sba_hm[s1->pos],m1);  
   _copydl(nd_nvar,nd_sba_hm[s2->pos],m2);  
   _addtodl(nd_nvar,s1->dl,m1);  
   _addtodl(nd_nvar,s2->dl,m2);  
 #else  
   _adddl(nd_nvar,s1->dl,nd_sba_hm[s1->pos],m1);  
   _adddl(nd_nvar,s2->dl,nd_sba_hm[s2->pos],m2);  
 #endif  
   ret = (*cmpdl)(nd_nvar,m1,m2);  
   if ( ret != 0 ) return ret;  
   else if ( s1->pos > s2->pos ) return 1;  
   else if ( s1->pos < s2->pos ) return -1;  
   else return 0;  
 #endif  
 }  }
   
 int _create_spair_s(int i1,int i2,ND_pairs sp,SIG sig1,SIG sig2)  int _create_spair_s(int i1,int i2,ND_pairs sp,SIG sig1,SIG sig2)
Line 3307  ND_pairs merge_pairs_s(ND_pairs p1,ND_pairs p2)
Line 3308  ND_pairs merge_pairs_s(ND_pairs p1,ND_pairs p2)
       r->next = q2; r = q2; q2 = q2->next;        r->next = q2; r = q2; q2 = q2->next;
     } else {      } else {
       ret = DL_COMPARE(q1->lcm,q2->lcm);        ret = DL_COMPARE(q1->lcm,q2->lcm);
         Nsamesig++;
       if ( ret < 0 ) {        if ( ret < 0 ) {
         r->next = q1; r = q1; q1 = q1->next;          r->next = q1; r = q1; q1 = q1->next;
         q2 = q2->next;          q2 = q2->next;
Line 4266  void nd_sba(LIST f,LIST v,int m,int homo,int retdp,int
Line 4268  void nd_sba(LIST f,LIST v,int m,int homo,int retdp,int
   nd_module = 0;    nd_module = 0;
   nd_demand = 0;    nd_demand = 0;
   parse_nd_option(current_option);    parse_nd_option(current_option);
     Nsamesig = 0;
   if ( DP_Multiple )    if ( DP_Multiple )
     nd_scale = ((double)DP_Multiple)/(double)(Denominator?Denominator:1);      nd_scale = ((double)DP_Multiple)/(double)(Denominator?Denominator:1);
   get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&nd_vc);    get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&nd_vc);
Line 4337  void nd_sba(LIST f,LIST v,int m,int homo,int retdp,int
Line 4339  void nd_sba(LIST f,LIST v,int m,int homo,int retdp,int
   for ( r0 = 0, t = x; t; t = NEXT(t) ) {    for ( r0 = 0, t = x; t; t = NEXT(t) ) {
     NEXTNODE(r0,r);      NEXTNODE(r0,r);
     if ( retdp ) BDY(r) = ndvtodp(m,BDY(t));      if ( retdp ) BDY(r) = ndvtodp(m,BDY(t));
     BDY(r) = ndvtop(m,CO,vv,BDY(t));      else BDY(r) = ndvtop(m,CO,vv,BDY(t));
   }    }
   if ( r0 ) NEXT(r) = 0;    if ( r0 ) NEXT(r) = 0;
   MKLIST(*rp,r0);    MKLIST(*rp,r0);
Line 7992  NODE nd_f4(int m,int checkonly,int **indp)
Line 7994  NODE nd_f4(int m,int checkonly,int **indp)
         if ( nflist ) nd_last_nonzero = f4red;          if ( nflist ) nd_last_nonzero = f4red;
         for ( r = nflist; r; r = NEXT(r) ) {          for ( r = nflist; r; r = NEXT(r) ) {
             nf = (NDV)BDY(r);              nf = (NDV)BDY(r);
               if ( nd_f4_td ) SG(nf) = nd_tdeg(nf);
             ndv_removecont(m,nf);              ndv_removecont(m,nf);
             if ( !m && nd_nalg ) {              if ( !m && nd_nalg ) {
                 ND nf1;                  ND nf1;
Line 9561  NODE conv_ilist_s(int demand,int trace,int **indp)
Line 9564  NODE conv_ilist_s(int demand,int trace,int **indp)
   
 void parse_nd_option(NODE opt)  void parse_nd_option(NODE opt)
 {  {
     NODE t,p,u;    NODE t,p,u;
   int i,s,n;    int i,s,n;
     char *key;    char *key;
     Obj value;    Obj value;
   
     nd_gentrace = 0; nd_gensyz = 0; nd_nora = 0; nd_gbblock = 0;    nd_gentrace = 0; nd_gensyz = 0; nd_nora = 0; nd_gbblock = 0;
   nd_newelim = 0; nd_intersect = 0; nd_nzlist = 0;    nd_newelim = 0; nd_intersect = 0; nd_nzlist = 0;
   nd_splist = 0; nd_check_splist = 0;    nd_splist = 0; nd_check_splist = 0;
     nd_sugarweight = 0;    nd_sugarweight = 0; nd_f4red =0; nd_rank0 = 0;
     nd_f4red =0;    nd_f4_td = 0; nd_sba_f4step = 2; nd_sba_pot = 0; nd_sba_largelcm = 0;
     nd_rank0 = 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));      key = BDY((STRING)BDY(p));
         key = BDY((STRING)BDY(p));      value = (Obj)BDY(NEXT(p));
         value = (Obj)BDY(NEXT(p));      if ( !strcmp(key,"gentrace") )
         if ( !strcmp(key,"gentrace") )        nd_gentrace = value?1:0;
             nd_gentrace = value?1:0;      else if ( !strcmp(key,"gensyz") )
         else if ( !strcmp(key,"gensyz") )        nd_gensyz = value?1:0;
             nd_gensyz = value?1:0;      else if ( !strcmp(key,"nora") )
         else if ( !strcmp(key,"nora") )        nd_nora = value?1:0;
             nd_nora = value?1:0;      else if ( !strcmp(key,"gbblock") ) {
         else if ( !strcmp(key,"gbblock") ) {        if ( value && OID(value) == O_LIST ) {
             if ( value && OID(value) == O_LIST ) {  
         u = BDY((LIST)value);          u = BDY((LIST)value);
               nd_gbblock = MALLOC((2*length(u)+1)*sizeof(int));          nd_gbblock = MALLOC((2*length(u)+1)*sizeof(int));
         for ( i = 0; u; u = NEXT(u) ) {          for ( i = 0; u; u = NEXT(u) ) {
           p = BDY((LIST)BDY(u));            p = BDY((LIST)BDY(u));
           s = nd_gbblock[i++] = ZTOS((Q)BDY(p));            s = nd_gbblock[i++] = ZTOS((Q)BDY(p));
           nd_gbblock[i++] = s+ZTOS((Q)BDY(NEXT(p)))-1;            nd_gbblock[i++] = s+ZTOS((Q)BDY(NEXT(p)))-1;
         }          }
         nd_gbblock[i] = -1;          nd_gbblock[i] = -1;
             } else        } else
               nd_gbblock = 0;          nd_gbblock = 0;
     } else if ( !strcmp(key,"newelim") )      } else if ( !strcmp(key,"newelim") )
             nd_newelim = value?1:0;              nd_newelim = value?1:0;
     else if ( !strcmp(key,"intersect") )      else if ( !strcmp(key,"intersect") )
Line 9603  void parse_nd_option(NODE opt)
Line 9605  void parse_nd_option(NODE opt)
     else if ( !strcmp(key,"lf") )      else if ( !strcmp(key,"lf") )
             nd_lf = value?1:0;              nd_lf = value?1:0;
     else if ( !strcmp(key,"trace") ) {      else if ( !strcmp(key,"trace") ) {
            if ( value ) {        if ( value ) {
                u = BDY((LIST)value);          u = BDY((LIST)value);
            nd_nzlist = BDY((LIST)ARG2(u));          nd_nzlist = BDY((LIST)ARG2(u));
            nd_bpe = ZTOS((Q)ARG3(u));          nd_bpe = ZTOS((Q)ARG3(u));
            }        }
     } else if ( !strcmp(key,"f4red") ) {      } else if ( !strcmp(key,"f4red") ) {
        nd_f4red = ZTOS((Q)value);        nd_f4red = ZTOS((Q)value);
     } else if ( !strcmp(key,"rank0") ) {      } else if ( !strcmp(key,"rank0") ) {
             nd_rank0 = value?1:0;        nd_rank0 = value?1:0;
     } else if ( !strcmp(key,"splist") ) {      } else if ( !strcmp(key,"splist") ) {
             nd_splist = value?1:0;        nd_splist = value?1:0;
     } else if ( !strcmp(key,"check_splist") ) {      } else if ( !strcmp(key,"check_splist") ) {
       nd_check_splist = BDY((LIST)value);        nd_check_splist = BDY((LIST)value);
     } else if ( !strcmp(key,"sugarweight") ) {      } else if ( !strcmp(key,"sugarweight") ) {
       u = BDY((LIST)value);        u = BDY((LIST)value);
             n = length(u);        n = length(u);
             nd_sugarweight = MALLOC(n*sizeof(int));        nd_sugarweight = MALLOC(n*sizeof(int));
       for ( i = 0; i < n; i++, u = NEXT(u) )        for ( i = 0; i < n; i++, u = NEXT(u) )
                 nd_sugarweight[i] = ZTOS((Q)BDY(u));          nd_sugarweight[i] = ZTOS((Q)BDY(u));
       } else if ( !strcmp(key,"f4_td") ) {
         nd_f4_td = value?1:0;
       } else if ( !strcmp(key,"sba_f4step") ) {
         nd_sba_f4step = value?ZTOS((Q)value):0;
       } else if ( !strcmp(key,"sba_pot") ) {
         nd_sba_pot = value?1:0;
       } else if ( !strcmp(key,"sba_largelcm") ) {
         nd_sba_largelcm = value?1:0;
     }      }
     }    }
 }  }
   
 ND mdptond(DP d);  ND mdptond(DP d);
Line 10875  int nd_symbolic_preproc_s(PGeoBucket bucket,int trace,
Line 10885  int nd_symbolic_preproc_s(PGeoBucket bucket,int trace,
   
 NODE nd_sba_f4(int m,int **indp)  NODE nd_sba_f4(int m,int **indp)
 {  {
   int i,nh,stat,index,f4red;    int i,nh,stat,index,f4red,f4step;
   int col,rank,len,k,j,a,sugar,nbase,psugar,ms;    int col,rank,len,k,j,a,sugar,nbase,psugar,ms;
   NODE r,g,rp0,nflist;    NODE r,g,rp0,nflist;
   ND_pairs d,l,t;    ND_pairs d,l,t;
Line 10899  NODE nd_sba_f4(int m,int **indp)
Line 10909  NODE nd_sba_f4(int m,int **indp)
   nd_nbase = nd_psn;    nd_nbase = nd_psn;
   f4red = 1;    f4red = 1;
   psugar = 0;    psugar = 0;
     f4step = 0;
   while ( d ) {    while ( d ) {
     for ( t = d, ms = SG(d); t; t = NEXT(t) )      for ( t = d, ms = SG(d); t; t = NEXT(t) )
       if ( SG(t) < ms ) ms = SG(t);        if ( SG(t) < ms ) ms = SG(t);
     if ( ms == psugar ) {      if ( ms == psugar && f4step >= nd_sba_f4step ) {
 again:  again:
       l = d; d = d->next;        l = d; d = d->next;
       if ( small_lcm(l) ) {        if ( small_lcm(l) ) {
Line 10952  again:
Line 10963  again:
         FREENDP(l);          FREENDP(l);
       }        }
     } else {      } else {
         if ( ms != psugar ) f4step = 1;
         else f4step++;
 again2:  again2:
       if ( DP_Print ) { printf("\n"); fflush(stdout); }  
       psugar = ms;        psugar = ms;
       l = nd_minsugarp_s(d,&d);        l = nd_minsugarp_s(d,&d);
       sugar = nd_sugarweight?d->sugar2:SG(d);        sugar = nd_sugarweight?d->sugar2:SG(d);
Line 10968  again2:
Line 10980  again2:
       if ( bucket->m < 0 ) continue;        if ( bucket->m < 0 ) continue;
       col = nd_symbolic_preproc_s(bucket,0,&s0vect,&rp0);        col = nd_symbolic_preproc_s(bucket,0,&s0vect,&rp0);
       if ( !col ) {        if ( !col ) {
         for ( t = l; NEXT(t); t = NEXT(t) );          for ( t = l; NEXT(t); t = NEXT(t) )
           NEXT(t) = d; d = l;            ;
           NEXT(t) = d; d = l;
         d = nd_reconstruct(0,d);          d = nd_reconstruct(0,d);
         goto again2;          goto again2;
       }        }
       if ( DP_Print ) fprintf(asir_out,"sugar=%d,",psugar);        if ( DP_Print ) fprintf(asir_out,"\nsugar=%d,",psugar);
       nflist = nd_f4_red_s(m,l,0,s0vect,col,rp0,syzlist);        nflist = nd_f4_red_s(m,l,0,s0vect,col,rp0,syzlist);
       /* adding new bases */        /* adding new bases */
       for ( r = nflist; r; r = NEXT(r) ) {        for ( r = nflist; r; r = NEXT(r) ) {
         nfv = (NDV)BDY(r);          nfv = (NDV)BDY(r);
           if ( nd_f4_td ) SG(nfv) = nd_tdeg(nfv);
         ndv_removecont(m,nfv);          ndv_removecont(m,nfv);
         nh = ndv_newps(m,nfv,0);          nh = ndv_newps(m,nfv,0);
         d = update_pairs_s(d,nh,syzlist);          d = update_pairs_s(d,nh,syzlist);
Line 10988  again2:
Line 11002  again2:
             d = remove_spair_s(d,(SIG)BDY(r));              d = remove_spair_s(d,(SIG)BDY(r));
       d = remove_large_lcm(d);        d = remove_large_lcm(d);
       if ( DP_Print ) {        if ( DP_Print ) {
         fprintf(asir_out,"f4red=%d,gblen=%d\n",f4red,nd_psn); fflush(asir_out);          fprintf(asir_out,"f4red=%d,gblen=%d",f4red,nd_psn); fflush(asir_out);
       }        }
       f4red++;        f4red++;
     }      }
   }    }
   if ( DP_Print ) {    if ( DP_Print ) {
     fprintf(asir_out,"number of red=%d,",Nf4_red);      fprintf(asir_out,"\nnumber of red=%d,",Nf4_red);
   }    }
   g = conv_ilist_s(nd_demand,0,indp);    g = conv_ilist_s(nd_demand,0,indp);
   return g;    return g;
Legend:
Removed from v.1.33  
changed lines
  Added in v.1.38
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>