[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.14 and 1.18

version 1.14, 2010/06/19 06:17:34 version 1.18, 2011/01/16 08:46:10
Line 1 
Line 1 
   /* $OpenXM: OpenXM/src/asir-contrib/testing/noro/ndbf.rr,v 1.17 2010/07/12 07:20:03 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 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 1409  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;
         if ( type(Vord=getopt(vord)) == -1 || type(Vord) != 4 ) Vord = 0;          if ( type(Vord=getopt(vord)) == -1 || type(Vord) != 4 ) Vord = 0;
         if ( type(Wt=getopt(weight)) == -1 ) Wt = 0;          if ( type(Wt=getopt(weight)) == -1 ) Wt = 0;
           if ( type(ElimIdeal=getopt(elimideal)) == -1 ) ElimIdeal = 0;
         L = in_ww(F|weight=Wt,heuristic=Heu,vord=Vord);          L = in_ww(F|weight=Wt,heuristic=Heu,vord=Vord);
         T1 = time();          T1 = time();
         print(["in_ww",(T1[0]+T1[1])-(T0[0]+T0[1])]);          print(["in_ww",(T1[0]+T1[1])-(T0[0]+T0[1])]);
Line 1452  def bf_strat(F)
Line 1463  def bf_strat(F)
         }          }
   
         L2 = bf_strat_stage2(L);          L2 = bf_strat_stage2(L);
           if ( ElimIdeal ) return L2;
         S = bf_strat_stage3(L2);          S = bf_strat_stage3(L2);
         R = [];          R = [];
         for ( T = S; T != []; T = cdr(T) ) {          for ( T = S; T != []; T = cdr(T) ) {
Line 1562  def bf_strat_stage3(L)
Line 1574  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.14  
changed lines
  Added in v.1.18
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>