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

Diff for /OpenXM/src/asir-contrib/testing/noro/ndbf.rr between version 1.12 and 1.17

version 1.12, 2010/06/16 08:32:10 version 1.17, 2010/07/12 07:20:03
Line 1 
Line 1 
   /* $OpenXM: OpenXM/src/asir-contrib/testing/noro/ndbf.rr,v 1.16 2010/07/12 07:01:04 noro Exp $ */
 /* requires 'primdec' */  /* requires 'primdec' */
   
 #define TMP_H hhhhhhhh  #define TMP_H hhhhhhhh
 #define TMP_S ssssssss  #define TMP_S ssssssss
 #define TMP_DS dssssssss  #define TMP_DS dssssssss
 #define TMP_T t  #define TMP_T tttttttt
 #define TMP_DT dt  #define TMP_DT dtttttttt
 #define TMP_Y1 yyyyyyyy1  #define TMP_Y1 yyyyyyyy1
 #define TMP_DY1 dyyyyyyyy1  #define TMP_DY1 dyyyyyyyy1
 #define TMP_Y2 yyyyyyyy2  #define TMP_Y2 yyyyyyyy2
Line 44  localf ideal_intersection$
Line 45  localf ideal_intersection$
   
 def bfunction(F)  def bfunction(F)
 {  {
           if ( member(s,vars(F)) )
                   error("ann : the variable 's' is reserved.");
         /* F -> F/Fcont */          /* F -> F/Fcont */
         F1 = ptozp(F); Fcont = sdiv(F,F1); F = F1;          F1 = ptozp(F); Fcont = sdiv(F,F1); F = F1;
   
Line 85  def bfunction(F)
Line 88  def bfunction(F)
         Cont = cont(CR); CR /= Cont;          Cont = cont(CR); CR /= Cont;
         Cont *= dn(Fcont); Den *= nm(Fcont);          Cont *= dn(Fcont); Den *= nm(Fcont);
         Gcd = igcd(Den,Cont);          Gcd = igcd(Den,Cont);
         return [subst(B,s,-s-1),(Den/Gcd)*Ax,(Cont/Gcd)*CR];          return [subst(B,s,-s-1),(Cont*CR)/(Den*Ax)];
 }  }
   
 /*  /*
Line 296  def ann(F)
Line 299  def ann(F)
 {  {
         if ( member(s,vars(F)) )          if ( member(s,vars(F)) )
                 error("ann : the variable 's' is reserved.");                  error("ann : the variable 's' is reserved.");
           if ( type(Vord=getopt(vord)) == -1 ) Vord = 0;
         F = ptozp(F);          F = ptozp(F);
         V = vars(F);          V = vars(F);
           if ( Vord ) {
                   Param = setminus(V,Vord);
                   V = Vord;
           }
         N = length(V);          N = length(V);
         D = newvect(N);          D = newvect(N);
         if ( type(Wt=getopt(weight)) == -1 )          if ( type(Wt=getopt(weight)) == -1 )
Line 1260  def replace_var(V,X,Y)
Line 1268  def replace_var(V,X,Y)
   
 def action_on_gfs(P,V,GFS)  def action_on_gfs(P,V,GFS)
 {  {
           for ( T = V, DV = []; T != []; T = cdr(T) )
                   DV = cons(strtov("d"+rtostr(car(T))),DV);
           V = append(append(V,[s]),reverse(cons(ds,DV)));
         DP = dp_ptod(P,V);          DP = dp_ptod(P,V);
         N = length(V)/2;          N = length(V)/2;
         for ( I = N-1, V0 = []; I >= 0; I-- )          for ( I = N-1, V0 = []; I >= 0; I-- )
Line 1406  def weyl_ideal_quotient(B,F,VDV)
Line 1417  def weyl_ideal_quotient(B,F,VDV)
   
 def bf_strat(F)  def bf_strat(F)
 {  {
           if ( member(s,vars(F)) )
                   error("ann : the variable 's' is reserved.");
         dp_ord(0);          dp_ord(0);
         T0 = time();          T0 = time();
         if ( type(Heu=getopt(heuristic)) == -1 ) Heu = 0;          if ( type(Heu=getopt(heuristic)) == -1 ) Heu = 0;
Line 1559  def bf_strat_stage3(L)
Line 1572  def bf_strat_stage3(L)
   
 def bf_local(F,P)  def bf_local(F,P)
 {  {
           if ( member(s,vars(F)) )
                   error("ann : the variable 's' is reserved.");
         /* F -> F/Fcont */          /* F -> F/Fcont */
         F1 = ptozp(F); Fcont = sdiv(F,F1); F = F1;          F1 = ptozp(F); Fcont = sdiv(F,F1); F = F1;
         if ( type(Heu=getopt(heuristic)) == -1 ) Heu = 0;          if ( type(Heu=getopt(heuristic)) == -1 ) Heu = 0;
Legend:
Removed from v.1.12  
changed lines
  Added in v.1.17
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>