[BACK]Return to module_syz.rr CVS log [TXT][DIR] Up to [local] / OpenXM / src / asir-contrib / testing / noro

Diff for /OpenXM/src/asir-contrib/testing/noro/module_syz.rr between version 1.4 and 1.6

version 1.4, 2020/01/22 22:44:21 version 1.6, 2020/02/05 04:56:10
Line 83  def module_syz(F,V,H,Ord)
Line 83  def module_syz(F,V,H,Ord)
         else Ind++;          else Ind++;
       }        }
     } else      } else
       G = nd_gr(B,V,0,[1,Ord]|dp=1,homo=H);        G = nd_gr_trace(B,V,H,1,[1,Ord]|dp=1);
   }    }
   G0 = []; S0 = []; Gen0 = [];    G0 = []; S0 = []; Gen0 = [];
   for ( T = G; T != []; T = cdr(T) ) {    for ( T = G; T != []; T = cdr(T) ) {
Line 169  def fres(F,V,H,O)
Line 169  def fres(F,V,H,O)
     L = L[0];      L = L[0];
     L = ordcheck(L,V);      L = ordcheck(L,V);
     if ( L == [] ) {      if ( L == [] ) {
         R = reverse(R);
       if ( DP ) return R;        if ( DP ) return R;
       else return map(dpmlisttollist,R,V);        else return map(dpmlisttollist,R,V);
     }      }
Line 200  def minres(F,V,H,O)
Line 201  def minres(F,V,H,O)
       R = cdr(R); break;        R = cdr(R); break;
     }      }
   }    }
     R = reverse(R);
   if ( DP ) return R;    if ( DP ) return R;
   else return map(dpmlisttollist,R,V);    else return map(dpmlisttollist,R,V);
 }  }
Line 220  def sres(F,V,H,Ord)
Line 222  def sres(F,V,H,Ord)
   if ( I == K ) return [[],[],[]];    if ( I == K ) return [[],[],[]];
   L = todpmlist(F,V);    L = todpmlist(F,V);
   F = L[0]; N = L[1];    F = L[0]; N = L[1];
   #if 0
   G = nd_gr(F,V,H,[0,Ord]|dp=1);    G = nd_gr(F,V,H,[0,Ord]|dp=1);
   #else
     G = nd_gr_trace(F,V,H,1,[0,Ord]|dp=1);
   #endif
   G = reverse(G);    G = reverse(G);
   R = [G];    R = [G];
   dp_ord([0,Ord]);    dp_ord([0,Ord]);
Line 231  def sres(F,V,H,Ord)
Line 237  def sres(F,V,H,Ord)
     else R = cons(S,R);      else R = cons(S,R);
   }    }
   dp_ord([0,0]);    dp_ord([0,0]);
     R = reverse(R);
   if ( DP ) return R;    if ( DP ) return R;
   else return map(dpmlisttollist,R,V);    else return map(dpmlisttollist,R,V);
 }  }
Line 239  def minsres(F,V,H,Ord)
Line 246  def minsres(F,V,H,Ord)
 {  {
   if ( type(DP=getopt(dp)) == -1 ) DP = 0;    if ( type(DP=getopt(dp)) == -1 ) DP = 0;
   R = sres(F,V,H,Ord|dp=1);    R = sres(F,V,H,Ord|dp=1);
   R = ltov(R);    R = ltov(reverse(R));
   M = length(R);    M = length(R);
   for ( I = 0; I < M; I++ ) R[I] = map(dpm_sort,R[I]);    for ( I = 0; I < M; I++ ) R[I] = map(dpm_sort,R[I]);
   R = vtol(R);    R = vtol(R);
Line 418  def lres_setup(F,V,H,Ord)
Line 425  def lres_setup(F,V,H,Ord)
   } else {    } else {
     error("lres_setup: arugument type is invalid.");      error("lres_setup: arugument type is invalid.");
   }    }
     dp_ord([0,Ord]);
     F = map(dpm_sort,F);
   #if 0
   G = nd_gr(F,V,H,[0,Ord]|dp=1);    G = nd_gr(F,V,H,[0,Ord]|dp=1);
   #else
     G = nd_gr_trace(F,V,H,1,[0,Ord]|dp=1);
   #endif
   G = reverse(G);    G = reverse(G);
   dp_ord([0,Ord]);    dp_ord([0,Ord]);
   One = dp_ptod(1,V);    One = dp_ptod(1,V);
Line 442  def lres(F,V,H,Ord)
Line 455  def lres(F,V,H,Ord)
 {  {
   T0 = time();    T0 = time();
   if ( type(Top=getopt(top)) == -1 ) Top = 0;    if ( type(Top=getopt(top)) == -1 ) Top = 0;
     if ( type(DP=getopt(dp)) == -1 ) DP = 0;
   if ( type(NoSimpK=getopt(nosimpk)) == -1 ) NoSimpK = 0;    if ( type(NoSimpK=getopt(nosimpk)) == -1 ) NoSimpK = 0;
   if ( type(NoPreProj=getopt(nopreproj)) == -1 ) NoPreProj = 0;    if ( type(NoPreProj=getopt(nopreproj)) == -1 ) NoPreProj = 0;
   Rtime = Stime = Ptime = 0;    Rtime = Stime = Ptime = 0;
Line 531  def lres(F,V,H,Ord)
Line 545  def lres(F,V,H,Ord)
   print(["Frame",Ftime,"Prep",Ptime,"Reduce",Rtime,"Search",Stime,"Minimalize",T1[0]-T0[0]]);    print(["Frame",Ftime,"Prep",Ptime,"Reduce",Rtime,"Search",Stime,"Minimalize",T1[0]-T0[0]]);
 //  return [C,H,K,Kind,D];  //  return [C,H,K,Kind,D];
   D = compress_h(D);    D = compress_h(D);
   return D;    if ( DP ) return D;
     else return vtol(map(dpmlisttollist,D,V));
 }  }
   
 def create_base_ord(K,N)  def create_base_ord(K,N)
Line 623  def phi(C,F)
Line 638  def phi(C,F)
   R = 0;    R = 0;
   for ( T = F; T; T = dpm_rest(T) ) {    for ( T = F; T; T = dpm_rest(T) ) {
     Coef = dpm_hc(T); Pos = dpm_hp(T);      Coef = dpm_hc(T); Pos = dpm_hp(T);
     R += Coef*C[Pos];      R += Coef*C[Pos-1];
   }    }
   return R;    return R;
 }  }
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.6
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>