[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.5

version 1.4, 2020/01/22 22:44:21 version 1.5, 2020/01/27 02:16:02
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 231  def sres(F,V,H,Ord)
Line 233  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 242  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 442  def lres(F,V,H,Ord)
Line 445  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 535  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)
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>