Changeset 38c165 in git


Ignore:
Timestamp:
May 12, 2000, 2:17:19 PM (24 years ago)
Author:
Kai Krüger <krueger@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c1c65551e4b3a0de0b13ddf30446f6e9569681b5')
Children:
06f16f99b85c345dd60a647c2025081e13cfa7c2
Parents:
fa1af627353fd9365bd5fdad189f015e30251a16
Message:
Changed excute syntax from command to function


git-svn-id: file:///usr/local/Singular/svn/trunk@4318 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular/LIB
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/poly.lib

    rfa1af6 r38c165  
    1 // $Id: poly.lib,v 1.25 2000-03-15 17:17:09 siebert Exp $
     1// $Id: poly.lib,v 1.26 2000-05-12 12:17:16 krueger Exp $
    22//(GMG, last modified 22.06.96)
    33//(obachman: 17.12.97 -- added katsura)
    44///////////////////////////////////////////////////////////////////////////////
    55
    6 version="$Id: poly.lib,v 1.25 2000-03-15 17:17:09 siebert Exp $";
     6version="$Id: poly.lib,v 1.26 2000-05-12 12:17:16 krueger Exp $";
    77info="
    88LIBRARY:  poly.lib      PROCEDURES FOR MANIPULATING POLYS, IDEALS, MODULES
     
    580580  degBound=0;
    581581  string mp=string(minpoly);
    582   execute "ring R=("+charstr(br)+"),(x(1..n),z),dp;";
    583   execute "minpoly=number("+mp+");";
     582  execute("ring R=("+charstr(br)+"),(x(1..n),z),dp;");
     583  execute("minpoly=number("+mp+");");
    584584  ideal irrel=x(1..n);
    585585  map f=br,irrel;
  • Singular/LIB/presolve.lib

    rfa1af6 r38c165  
    1 // $Id: presolve.lib,v 1.12 1999-09-21 17:32:17 Singular Exp $
     1// $Id: presolve.lib,v 1.13 2000-05-12 12:17:17 krueger Exp $
    22//(GMG)
    33///////////////////////////////////////////////////////////////////////////////
    44
    5 version="$Id: presolve.lib,v 1.12 1999-09-21 17:32:17 Singular Exp $";
     5version="$Id: presolve.lib,v 1.13 2000-05-12 12:17:17 krueger Exp $";
    66info="
    77LIBRARY:  presolve.lib     PROCEDURES FOR PRE-SOLVING POLYNOMIAL EQUATIONS
     
    9797   if( fi == 0 or find(ordstr(P),"a") != 0 )
    9898   {
    99       execute "ring newP = ("+charstr(P)+"),("+varstr(P)+"),dp;";
     99      execute("ring newP = ("+charstr(P)+"),("+varstr(P)+"),dp;");
    100100      ideal i = imap(P,i);
    101101   }
     
    251251         if( ordstr(P) != "c,dp(n)" )
    252252         {
    253             execute "ring newP = ("+charstr(P)+"),("+varstr(P)+"),(c,dp);";
     253            execute("ring newP = ("+charstr(P)+"),("+varstr(P)+"),(c,dp);");
    254254            ideal k1 = imap(P,k1);
    255255            ideal k2 = imap(P,k2);
     
    363363   if ( size(b) != 0 ) { b = b[1,size(b)-1]; }
    364364   else { a = a[1,size(a)-1]; }
    365    execute "ring gnir ="+charstr(P)+",("+a+b+"),dp;";
     365   execute("ring gnir ="+charstr(P)+",("+a+b+"),dp;");
    366366   ideal i = imap(P,i);
    367367   list L = elimpart(i,n,e)+list(n);
     
    418418   string newvar = string(L[4]);
    419419   L = L[1],p;
    420    execute "ring r1=("+charstr(P)+"),("+newvar+"),"+"dp;";
     420   execute("ring r1=("+charstr(P)+"),("+newvar+"),"+"dp;");
    421421   list L = imap(P,L);
    422422//------------------- find "best" ordering of variables  ----------------------
     
    444444   {
    445445      intvec hi = hilbvec(L[1]);         // Hilbert-series of i
    446       execute "ring r2=("+charstr(P)+"),("+varstr(basering)+",@homo),dp;";
     446      execute("ring r2=("+charstr(P)+"),("+varstr(basering)+",@homo),dp;");
    447447      list L = imap(r1,L);
    448448      L[1] = homog(L[1],@homo);          // @homo = homogenizing var
     
    532532   if ( @s==0 )
    533533   {
    534       execute "ring "+@s1+"=("+charstr(@P)+"),("+varstr(@P)+"),("+@o+");";
     534      execute("ring "+@s1+"=("+charstr(@P)+"),("+varstr(@P)+"),("+@o+");");
    535535      def @id = imap(@P,@id);
    536536      verbose(noredefine);
     
    567567   if ( @h != 0 )
    568568   {
    569       execute "ring @Q=("+charstr(@P)+"),("+varstr(@P)+",@homo),("+@o+");";
     569      execute("ring @Q=("+charstr(@P)+"),("+varstr(@P)+",@homo),("+@o+");");
    570570      def @id = imap(@P,@id);
    571571      kill @P;
     
    594594         else { @o = @o[1,size(@o)-8] + @o[size(@o)-1,2]; }
    595595      }
    596       execute "ring @P=("+charstr(@Q)+"),("+@va+"),("+@o+");";
     596      execute("ring @P=("+charstr(@Q)+"),("+@va+"),("+@o+");");
    597597      def @id = imap(@Q,@id);
    598598   }
     
    701701   if ( size(#) == 2 ) {  @c = #[1]; @o = #[2]; }
    702702   string @si = typeof(@id)+" @i = "+string(@id)+";";  //** weg
    703    execute "ring @r=("+@c+"),("+varstr(basering)+"),("+@o+");";
     703   execute("ring @r=("+@c+"),("+varstr(basering)+"),("+@o+");");
    704704   //**def i = imap(P,@id);
    705    execute @si;                   //** weg
     705   execute(@si);                   //** weg
    706706   //show(basering);
    707707   @i = std(@i);
     
    795795   dbprint( pr,"","// variables which did not occur:",L[3] );
    796796
    797    execute "ring "+s1+"=("+charstr(P)+"),("+newvar+"),("+s2+");";
     797   execute("ring "+s1+"=("+charstr(P)+"),("+newvar+"),("+s2+");");
    798798   def id = imap(P,id);
    799799   export(basering);
     
    943943   @o=@o[1..size(@o)-1];
    944944//------------------ create new ring and make objects global -----------------
    945    execute "ring "+@s1+"=("+charstr(@P)+"),("+@va+"),("+@o+");";
     945   execute("ring "+@s1+"=("+charstr(@P)+"),("+@va+"),("+@o+");");
    946946   def @id = imap(@P,@id);
    947    execute "def "+ @s2+"=@id;";
     947   execute("def "+ @s2+"=@id;");
    948948   execute("export("+@s1+");");
    949949   execute("export("+@s2+");");
  • Singular/LIB/ring.lib

    rfa1af6 r38c165  
    1 // $Id: ring.lib,v 1.10 1999-07-07 16:38:27 obachman Exp $
     1// $Id: ring.lib,v 1.11 2000-05-12 12:17:17 krueger Exp $
    22//(GMG, last modified 03.11.95)
    33///////////////////////////////////////////////////////////////////////////////
    44
    5 version="$Id: ring.lib,v 1.10 1999-07-07 16:38:27 obachman Exp $";
     5version="$Id: ring.lib,v 1.11 2000-05-12 12:17:17 krueger Exp $";
    66info="
    77LIBRARY:  ring.lib      PROCEDURES FOR MANIPULATING RINGS AND MAPS
     
    7070   kill R,R1;
    7171   if(system("with","Namespaces")) {
    72       kill Top::R,Top::R1;
     72      if( nameof(Current) == "Ring" ) {
     73        kill Top::R,Top::R1;
     74      } else {
     75        kill Ring::R,Ring::R1;
     76      }
    7377   }
    7478}
     
    120124   kill R,Q,Q';
    121125   if(system("with","Namespaces")) {
    122       kill Top::R,Top::Q';
     126      if( nameof(Current) == "Ring" ) {
     127        kill Top::R,Top::Q';
     128      } else {
     129        kill Ring::R,Ring::Q';
     130      }
    123131   }
    124132}
     
    181189   kill R,Q,Q';
    182190   if(system("with","Namespaces")) {
    183       kill Top::R,Top::Q';
     191      if( nameof(Current) == "Ring" ) {
     192        kill Top::R,Top::Q';
     193      } else {
     194        kill Ring::R,Ring::Q';
     195      }
    184196   }
    185197}
     
    218230   kill r,R;
    219231   if(system("with","Namespaces")) {
    220       kill Top::r,Top::R;
     232      if( nameof(Current) == "Ring" ) {
     233        kill Top::r,Top::R;
     234      } else {
     235        kill Ring::r,Ring::R;
     236      }
    221237   }
    222238}
     
    254270   kill S5, S30;
    255271   if(system("with","Namespaces")) {
    256       kill Top::S5,Top::S30;
     272      if( nameof(Current) == "Ring" ) {
     273        kill Top::S5,Top::S30;
     274      } else {
     275        kill Ring::S5,Ring::S30;
     276      }
    257277   }
    258278}
     
    291311   kill P5, P30;
    292312   if(system("with","Namespaces")) {
    293       kill Top::P5,Top::P30;
     313      if( nameof(Current) == "Ring" ) {
     314        kill Top::P5,Top::P30;
     315      } else {
     316        kill Ring::P5,Ring::P30;
     317      }
    294318   }
    295319}
     
    448472   kill r,R1,R2,R3,R4;
    449473   if(system("with","Namespaces")) {
    450       kill Top::R1,Top::R2,Top::R3,Top::R4;
     474      if( nameof(Current) == "Ring" ) {
     475        kill Top::R1,Top::R2,Top::R3,Top::R4;
     476      } else {
     477        kill Ring::R1,Ring::R2,Ring::R3,Ring::R4;
     478      }
    451479   }
    452480}
     
    679707   kill R,Q,S,T;
    680708   if(system("with","Namespaces")) {
    681       kill Top::R,Top::Q,Top::S,Top::T;
    682    }
    683 }
    684 ///////////////////////////////////////////////////////////////////////////////
     709      if( nameof(Current) == "Ring" ) {
     710        kill Top::R,Top::Q,Top::S,Top::T;
     711      } else {
     712        kill Ring::R,Ring::Q,Ring::S,Ring::T;
     713      }
     714   }
     715}
     716///////////////////////////////////////////////////////////////////////////////
  • Singular/LIB/solve.lib

    rfa1af6 r38c165  
    11///////////////////////////////////////////////////////////////////////////////
    22
    3 version="$Id: solve.lib,v 1.14 1999-12-02 23:03:52 wenk Exp $";
     3version="$Id: solve.lib,v 1.15 2000-05-12 12:17:18 krueger Exp $";
    44info="
    55LIBRARY: solve.lib     PROCEDURES TO SOLVE POLYNOMIAL SYSTEMS
     
    565565    string nrings= "ring "+orings+"C=(real,"+string(prec)
    566566        +",I),("+varstr(basering)+"),lp;";
    567     execute nrings;
     567    execute(nrings);
    568568
    569569    if ( pdebug>=0 )
     
    786786    string nrings= "ring "+orings+"C=(real,"+string(prec)
    787787        +",I),("+varstr(basering)+"),lp;";
    788     execute nrings;
     788    execute(nrings);
    789789
    790790    if ( pdebug>=0 )
  • Singular/LIB/spcurve.lib

    rfa1af6 r38c165  
    1 // $Id: spcurve.lib,v 1.8 1999-07-21 10:10:36 Singular Exp $
     1// $Id: spcurve.lib,v 1.9 2000-05-12 12:17:18 krueger Exp $
    22// (anne, last modified 31.5.99)
    33/////////////////////////////////////////////////////////////////////////////
    44
    5 version="$Id: spcurve.lib,v 1.8 1999-07-21 10:10:36 Singular Exp $";
     5version="$Id: spcurve.lib,v 1.9 2000-05-12 12:17:18 krueger Exp $";
    66info="
    77LIBRARY:  spcurve.lib    PROCEDURES FOR CM CODIMENSION 2 SINGULARITIES
     
    817817  }
    818818  string ringre=" ring r=" + charstr(rt) + ",(x,y,z), Ws(" + string(wl[1]) + ");";
    819   execute ringre;
     819  execute(ringre);
    820820  matrix M=imap(rt,M);
    821821  int ne=size(M);
     
    874874                        + string(wl[1]) + ");";
    875875  }
    876   execute ringre;
     876  execute(ringre);
    877877  module temp=imap(r,t1qh);
    878878  ideal t1qh=mod2id(temp,iv);
     
    12871287// do the interreduction and convert back
    12881288//----------------------------------------------------------------------
    1289   execute tempstr;
     1289  execute(tempstr);
    12901290  def motemp=imap(r,motemp);
    12911291  motemp=interred(motemp);
  • Singular/LIB/standard.lib

    rfa1af6 r38c165  
    1 // $Id: standard.lib,v 1.47 1999-10-19 12:42:51 obachman Exp $
     1// $Id: standard.lib,v 1.48 2000-05-12 12:17:18 krueger Exp $
    22//////////////////////////////////////////////////////////////////////////////
    33
    4 version="$Id: standard.lib,v 1.47 1999-10-19 12:42:51 obachman Exp $";
     4version="$Id: standard.lib,v 1.48 2000-05-12 12:17:18 krueger Exp $";
    55info="
    66LIBRARY: standard.lib   PROCEDURES WHICH ARE ALWAYS LOADED AT START-UP
     
    4646   }
    4747   else { os = #[1]; }
    48    execute "ring sr=("+charstr(dr)+"),("+varstr(dr)+"),"+os+";";
     48   execute("ring sr=("+charstr(dr)+"),("+varstr(dr)+"),"+os+";");
    4949   ideal i= fetch(dr,i);
    5050   intvec opt= option(get);
     
    8888   }
    8989
    90    execute "ring S = ("+charstr(R)+"),("+varstr(R)+",@t),dp;";
     90   execute("ring S = ("+charstr(R)+"),("+varstr(R)+",@t),dp;");
    9191   ideal i=homog(imap(R,i),@t);
    9292   intvec v=hilb(std(i),1);
    93    execute "ring T = ("+charstr(R)+"),("+varstr(R)+",@t),("+ordstr(R)+");";
     93   execute("ring T = ("+charstr(R)+"),("+varstr(R)+",@t),("+ordstr(R)+");");
    9494   ideal i=fetch(S,i);
    9595   ideal a=std(i,v);
     
    770770           "),("+varstr(basering)+",@t,@w),dp;";
    771771  def @newP=basering;
    772   execute s;
     772  execute(s);
    773773  module b=imap(@newP,b);
    774774  module a=imap(@newP,a);
     
    793793           "),("+varstr(basering)+",@t),dp;";
    794794  def @newP=basering;
    795   execute s;
     795  execute(s);
    796796  module b=imap(@newP,b);
    797797  module a=imap(@newP,a);
     
    817817           "),("+varstr(basering)+",@t),dp;";
    818818  def @newP=basering;
    819   execute s;
     819  execute(s);
    820820  module b=imap(@newP,b);
    821821  module a=imap(@newP,a);
     
    835835{
    836836  def R=basering;
    837   execute "ring gnir = ("+charstr(basering)+"),
    838                        ("+varstr(basering)+",@t),(C,dp);";
     837  execute("ring gnir = ("+charstr(basering)+"),
     838                       ("+varstr(basering)+",@t),(C,dp);");
    839839  ideal i=var(nvars(basering))*imap(R,i)+(var(nvars(basering))-1)*imap(R,j);
    840840  ideal j=eliminate(i,var(nvars(basering)));
  • Singular/LIB/tst.lib

    rfa1af6 r38c165  
    1 // $Id: tst.lib,v 1.22 1999-11-23 14:20:48 obachman Exp $
     1// $Id: tst.lib,v 1.23 2000-05-12 12:17:19 krueger Exp $
    22//(obachman, last modified 6/30/98)
    33/////////////////////////////////////////////////////////////////////////////
    44
    5 version="$Id: tst.lib,v 1.22 1999-11-23 14:20:48 obachman Exp $";
     5version="$Id: tst.lib,v 1.23 2000-05-12 12:17:19 krueger Exp $";
    66info="
    77LIBRARY:  tst.lib      PROCEDURES FOR RUNNING AUTOMATIC TST TESTS
     
    149149  else
    150150  {
    151     execute "int tst_int_timer = " + tst_timer[15,size(tst_timer)] + ";";
     151    execute("int tst_int_timer = " + tst_timer[15,size(tst_timer)] + ";");
    152152    return (tst_int_timer);
    153153  }
Note: See TracChangeset for help on using the changeset viewer.