Changeset 393c47 in git


Ignore:
Timestamp:
Mar 23, 2012, 8:26:47 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '45e267b9942dec9429fe249ce3e5e44ab80a6a3a')
Children:
a10fdfe4d442bc04f32d34fcfb152911e9097218
Parents:
faf3505e224504555fe6aa79ecfdd54ec0888beb
Message:
fix the usage of minpoly in *.lib: only to string may be used
Location:
Singular/LIB
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/hnoether.lib

    rfaf350 r393c47  
    39143914       // ----- fuer aktuelle Kante war Koerpererweiterung erforderlich -------
    39153915       EXTHNEnumber++;
    3916        if (not(defined(minPol))) { poly miniPol; }
    3917        miniPol=minpoly;
     3916       string @miniPol_EXTHNEring(EXTHNEnumber-1) = string(minpoly);
    39183917       setring SaveRing;
    3919        if (not(defined(miniPol))) { poly miniPol; }
    3920        miniPol=minpoly;
     3918       string @miniPol_SaveRing = string(minpoly);
    39213919       setring HNE_noparam;
    39223920       if (not(defined(a_x))){ map a_x,a_y; poly mp_save, mp_new; }
    3923        mp_save=imap(SaveRing,miniPol);
    3924        mp_new=imap(EXTHNEring(EXTHNEnumber-1),miniPol);
     3921       execute("mp_save= " + @miniPol_SaveRing + ";");
     3922       execute("mp_new = " + @miniPol_EXTHNEring(EXTHNEnumber-1) + ";" );;
    39253923       if (mp_save==mp_new) { // Sonderfall: wieder gleicher Ring
    39263924         def EXTHNEring(EXTHNEnumber)=SaveRing;
  • Singular/LIB/qhmoduli.lib

    rfaf350 r393c47  
    130130    def RME4 = QuotientEquations(G, actionid, variety, opt);
    131131    setring RME4;
    132     poly mPoly = minpoly;
     132    string @mPoly = string(minpoly);
    133133    kill RME3;
    134134    export(RME4);
     
    143143      ringSTR = "ring RME5 = (" + charstr(basering) + "), (Y(1.." + string(size(sList[3])) + ")),dp;";
    144144      execute(ringSTR);
    145       minpoly = number(imap(RME4, mPoly));
     145      execute("minpoly = number(" + @mPoly + ");");
    146146      ideal modid = imap(RME4, newid);
    147147    }
     
    329329
    330330  setring STR1;
    331   poly mPoly = minpoly;
     331  string @mPoly = string(minpoly);
    332332  setring RAAB;
    333333
     
    351351  execute(ringSTR1);
    352352  export(RAAR);
    353   ideal upperBasis, stabaction, action, mPoly, reduceIdeal;
     353  ideal upperBasis, stabaction, action, reduceIdeal;
    354354  poly f, F, monos, h;
    355355
    356   reduceIdeal = imap(STR1, mPoly), imap(STR1, stabid);
     356  execute("reduceIdeal = " + @mPoly + ";"); reduceIdeal = reduceIdeal, imap(STR1, stabid);
    357357  f = imap(RAAB, f);
    358358  F = f;
     
    380380  }
    381381  execute(ringSTR2);
    382   minpoly = number(imap(STR1, mPoly));
     382  execute("minpoly = number(" + @mPoly + ");");
    383383  ideal actionid = imap(RAAR, action);
    384384  ideal stabid = imap(STR1, stabid);
     
    482482  int i, j, c, k, r, nrVars, offset, n, sln, dbPrt;
    483483  list Variables, rd, temp, sList, varSubsList;
    484   poly mPoly;
    485484  string ringSTR, ringSTR1, varString, parString;
    486485
     
    507506
    508507  def RSTB = basering;
    509   mPoly = minpoly;
     508  string @mPoly = string(minpoly);
    510509  ringSTR = "ring RSTR = " + parString + ", (" + varstr(basering) + ", " + varString + "), dp;";  // dp
    511510        ringSTR1 = "ring RSTT = " + parString + ", (" + varString + ", " + varstr(basering) + "), dp;";
     
    515514        execute(ringSTR1);      // this ring is only used for the result, where the variables
    516515  export(RSTT);           // are s(1..m),t(1..n), as needed for Derksens algorithm (NullCone)
    517   minpoly = number(imap(RSTB, mPoly));
     516  execute("minpoly = number(" + @mPoly + ");");
    518517
    519518  execute(ringSTR);
    520519  export(RSTR);
    521   minpoly = number(imap(RSTB, mPoly));
     520  execute("minpoly = number(" + @mPoly + ");");
    522521  poly f, f1, g, h, vars, pp;      // f1 is the polynomial after subs,
    523522  ideal allEqns, qhsubs, actionid, stabid, J;
     
    612611  ringSTR = "ring RSTS = " + parString + ", (" + varString + "), dp;";
    613612  execute(ringSTR);
    614   minpoly = number(imap(RSTB, mPoly));
     613  execute("minpoly = number(" + @mPoly + ");");
    615614  ideal stabid = std(imap(RSTR, stabid));
    616615  export(stabid);
  • Singular/LIB/rinvar.lib

    rfaf350 r393c47  
    9191  ideal matrixEntries;
    9292  matrix coMx;
    93   poly tVars, mPoly;
     93  poly tVars;
    9494  string ringSTR1, ringSTR2, order;
    9595
     
    9898                                   + string(Gaction));
    9999  def RIGB = basering;
    100   mPoly = minpoly;
     100  string @mPoly = string(minpoly);
    101101  tVars = 1;
    102102  k = 0;
     
    130130                             + ", z(1.." + string(newVars) + "))," + order;
    131131  execute(ringSTR1);
    132   minpoly = number(imap(RIGB, mPoly));
     132  execute("minpoly = number(" + @mPoly + ");");
    133133  ideal I1, I2, Gn, G, F, mEntries, newGaction;
    134134  G = imap(RIGB, Grp);
     
    155155                     + string(newVars) + "), t(1.." + string(nrt) + ")), lp;";
    156156  execute(ringSTR2);
    157   minpoly = number(imap(RIGB, mPoly));
     157  execute("minpoly = number(" + @mPoly + ");");
    158158  ideal mapIdeal, groupid, actionid;
    159159  int offset;
     
    298298  // create new ring for elimination, Y(1),...,Y(m) are slack variables.
    299299
    300   poly mPoly = minpoly;
     300  string @mPoly = string(minpoly);
    301301  order = "(dp(" + string(nvars(basering)) + "), dp);";
    302302  ringSTR1 = "ring RAR1 = (" + charstr(basering) + "), (" + varstr(basering) + ", Y(1.." + string(nrNewVars) + ")), " + order;
    303303  ringSTR2 = "ring RAR2 = (" + charstr(basering) + "), Y(1.." + string(nrNewVars) + "), dp;";
    304304  execute(ringSTR1);
    305   minpoly = number(imap(RARB, mPoly));
     305  execute("minpoly = number(" + @mPoly + ");");
    306306
    307307  ideal I, J1, J2, Fm;
     
    331331
    332332  execute(ringSTR2);
    333   minpoly = number(imap(RARB, mPoly));
     333  execute("minpoly = number(" + @mPoly + ");");
    334334  ideal imageid = imap(RAR1, J2);
    335335  export(imageid);
     
    376376  matrix decompMx;
    377377  poly actCoeff;
    378   string str, order, mPoly;
     378  string str, order;
    379379
    380380  dbPrt = printlevel-voice+2;
    381381  dbprint(dbPrt, "LinearizeAction " + string(Gaction));
    382382  def RLAR = basering;
    383   mPoly = "minpoly = " + string(minpoly) + ";";
     383  string @mPoly = string(minpoly);
    384384  order = ordstr(basering);
    385385  nrt = ncols(Gaction);
     
    431431        if(defined(RLAR)) { kill RLAR;}
    432432        execute("ring RLAR = " + str + "(" + order + ");");
    433         execute(mPoly);
     433        execute("minpoly = number(" + @mPoly + ");");
    434434
    435435        ideal basis, action, G, reduceIdeal;
     
    862862{
    863863  int i, nt, dbPrt, offset, groupVars;
    864   poly minPoly;
    865864  string ringSTR, vars, order;
    866865  def RNCB = basering;
     
    878877  // ring for the computation
    879878
    880   minPoly = minpoly;
     879  string @minPoly = string(minpoly);
    881880  offset =  size(G) + nt;
    882881  execute(ringSTR);
    883   def aaa=imap(RNCB, minPoly);
     882  execute("poly aaa = number(" + @minPoly + ");");
    884883  if (aaa!=0) { minpoly = number(aaa); }
    885884  ideal action, G, I, J, N, generators;
  • Singular/LIB/standard.lib

    rfaf350 r393c47  
    492492  list parlist = rlist[1];
    493493  rlist[1] = parlist[1];
    494   poly Minpoly = minpoly;     //check for minpoly:
    495   int sm = size(Minpoly);
    496 
     494
     495  string @Minpoly = string(minpoly);     //check for minpoly:
     496  int sm = size(minpoly);
    497497  //now create new ring
    498498  for( ii = 1; ii <= s; ii++)
     
    534534  {
    535535    if( find(option(),"prot") ){"//add minpoly to input";}
    536     poly Minpoly = imap(P,Minpoly);
     536    execute("poly Minpoly = " + @Minpoly + " ;");
    537537    for( ii = 1; ii <= s; ii++)
    538538    {
     
    987987
    988988//--------------------- save data from basering ---------------------------
    989   poly Minpoly = minpoly;      //minimal polynomial
     989  string @Minpoly = string(minpoly);      //minimal polynomial
    990990  int was_minpoly;             //remembers if there was a minpoly in P
    991   if (size(Minpoly) > 0)
     991  if (size(minpoly) > 0)
    992992  {
    993993     was_minpoly = 1;
     
    12431243  if (was_minpoly)
    12441244  {
    1245     ideal Minpoly = imap(P,Minpoly);
     1245    execute("ideal Minpoly = " + @Minpoly + ";");
    12461246    attrib(Minpoly,"isSB",1);
    12471247    i = simplify(NF(i,Minpoly),2);
  • Singular/LIB/tropical.lib

    rfaf350 r393c47  
    650650          // pass first to a ring where a and @a
    651651          // are variables in order to use maps
    652           poly mp=minpoly;
     652          string @mp= string(minpoly);
    653653          ring INTERRING=char(LIFTRING),(t,@a,a),dp;
    654           poly mp=imap(LIFTRING,mp);
     654          execute("poly mp=" + @mp + ";");
    655655          ideal LIFT=imap(LIFTRING,LIFT);
    656656          kill LIFTRING;
     
    10121012  {
    10131013    def GLOBALRING=basering;
    1014     number mp=minpoly;
     1014    string @mp= string(minpoly);
    10151015    execute("ring LOCALRING=("+charstr(basering)+"),("+varstr(basering)+"),ds;");
     1016    execute("minpoly= " + @mp + ";");
    10161017    poly f=imap(GLOBALRING,f);
    1017     minpoly=imap(GLOBALRING,mp);
    10181018  }
    10191019  // check if a substitution is necessary
     
    10491049    if (minpoly!=0)
    10501050    {
    1051       poly mp=minpoly;
     1051      string @mp= string(minpoly);
    10521052      def OLDRING=basering;
    10531053      execute("ring NEWRING=0,("+varstr(basering)+","+parstr(basering)+"),ds;");
    1054       ideal I=imap(OLDRING,mp),imap(OLDRING,f);
     1054      execute("ideal I = " + @mp + ";");
     1055      I = I,imap(OLDRING,f);
    10551056    }
    10561057    else
     
    11331134    else
    11341135    {
    1135       poly mp=minpoly;
     1136      string @mp= string(minpoly);
    11361137      ring degreering=0,a,dp;
    1137       poly mp=imap(countring,mp);
     1138      execute("poly mp=" + @mp + ";");
    11381139      numberofbranchesfound=numberofbranchesfound+deg(mp);
    11391140      setring countring;
     
    54565457    {
    54575458      setring LIFTRing;
    5458       poly mp=minpoly;
     5459      string @mp= string(minpoly);
    54595460      execute("ring TESTRing=("+charstr(LIFTRing)+"),("+varstr(BASERING)+"),dp;");
    5460       minpoly=number(imap(LIFTRing,mp));
     5461      execute("minpoly= " + @mp + ";");
    54615462      ideal i=imap(BASERING,i);
    54625463    }
     
    58305831        {
    58315832          execute("ring PARARing=("+string(char(basering))+",@a),t,ls;");
    5832           minpoly=number(imap(PREGFANRING,m));
     5833          minpoly=number(imap(PREGFANRING,m)); // ?
    58335834        }
    58345835        else
Note: See TracChangeset for help on using the changeset viewer.