Changeset d78356 in git


Ignore:
Timestamp:
Jul 4, 2020, 3:13:10 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
89005e409e564feafbec751f5c65109638c47368
Parents:
7032db2a39319cc0c7a7814003e93cae02793c5e67e34d703a09cd2924973f990bf59c52ba5c4cd2
Message:
Merge branch 'execute' of https://github.com/sachinkm308/Sources into sachinkm308-execute
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/atkins.lib

    r7032db rd78356  
    567567          s3=string(t);
    568568
    569           execute("a1="+s1+";");
    570           execute("b1="+s2+";");
    571           execute("t1="+s3+";");
     569          a1=int(a);
     570          b1=int(b);
     571          t1=int(t);         
    572572          g1=gcd(gcd(a1,b1),t1 div a1);
    573573          setring C;
  • Singular/LIB/chern.lib

    r7032db rd78356  
    201201  }
    202202  ring r@ = create_ring(ringlist(basering)[1], l2, "dp", "no_minpoly");
    203   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
    204   ideal V=F(V);
    205   poly f=F(f);
     203  ideal V=fetch(br@,V);
     204  poly f=fetch(br@,f);
    206205  int i;
    207206  for(i=1; i<=nV; i++)
     
    31693168  l13[size(l13)+1] = "u@";
    31703169  ring r@ = create_ring(ringlist(basering)[1], l13, "dp", "no_minpoly");
    3171   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
    3172   ideal I=F(I); // the ideal generated by I in the new ring
     3170  ideal I=fetch(br@,I); // the ideal generated by I in the new ring
    31733171  ideal J(0..n); // define n+1 ideals J(0), ... , J(n)
    31743172  // compute the ideal of the Rees algebra of the ideal I:
     
    32693267  l14[size(l14)+1] = "u@";
    32703268  ring r@ = create_ring(ringlist(basering)[1], l14, "dp", "no_minpoly");
    3271   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
    3272   ideal I=F(I); // the ideal generated by I in the new ring
     3269  ideal I=fetch(br@,I); // the ideal generated by I in the new ring
    32733270  ideal J(0..n); // define n+1 ideals J(0), ... , J(n)
    32743271  // compute the ideal of the Rees algebra of the ideal I:
     
    34043401  def br@=basering; // remember the base ring
    34053402  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+",homvar@)", "dp", "no_minpoly");
    3406   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
    3407   ideal I=F(I);
     3403  ideal I=fetch(br@,I);
    34083404  ideal J=homog(I, homvar@);
    34093405  ideal JJ=J, homvar@;
     
    39883984  l15[size(l15)+1] = "u@";
    39893985  ring r@ = create_ring(ringlist(basering)[1], l15, "dp", "no_minpoly");
    3990   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
    3991   ideal I=F(I);
     3986  ideal I=fetch(br@,I);
    39923987  ideal J(0..n);
    39933988  for(i=1; i<=sz; i++)
  • Singular/LIB/finvar.lib

    r7032db rd78356  
    717717      else
    718718      { chst=chst[i..size(chst)];
    719         execute
    720         ("ring newring=(0"+chst+"),("+varstr(br)+"),("+ordstr(br)+")");
     719        list rl=ringlist(br);
     720        if (typeof(rl[1]=="int"))
     721        {
     722          rl[1]=0;
     723        }
     724        else
     725        {
     726          rl[1][1]=0;
     727        } 
     728        def newring=ring(rl);
     729        setring newring;
    721730       
    722731      }
     
    726735      minp=minp[2..size(minp)-1];
    727736      chst=chst[i..size(chst)];
    728       execute("ring newring=(0"+chst+"),("+varstr(br)+"),("+ordstr(br)+")");
     737      list rl=ringlist(br);
     738      if (typeof(rl[1]=="int"))
     739      {
     740        rl[1]=0;
     741      }
     742      else
     743      {
     744        rl[1][1]=0;
     745      } 
     746      def newring=ring(rl);
     747      setring newring;
    729748      execute("minpoly="+minp);
    730749    }
     
    11121131    if (minpoly==0)
    11131132    { if (i>size(chst))
    1114       { execute("ring newring=0,("+varstr(br)+"),("+ordstr(br)+")");
     1133      {
     1134         ring newring = create_ring(0, "("+varstr(br)+")", "("+ordstr(br)+")");
    11151135      }
    11161136      else
    11171137      { chst=chst[i..size(chst)];
    1118         execute
    1119         ("ring newring=(0"+chst+"),("+varstr(br)+"),("+ordstr(br)+")");
     1138        list rl=ringlist(br);
     1139        if (typeof(rl[1]=="int"))
     1140        {
     1141          rl[1]=0;
     1142        }
     1143        else
     1144        {
     1145          rl[1][1]=0;
     1146        } 
     1147        def newring=ring(rl);
     1148        setring newring;
    11201149      }
    11211150    }
     
    11241153      minp=minp[2..size(minp)-1];
    11251154      chst=chst[i..size(chst)];
    1126       execute("ring newring=(0"+chst+"),("+varstr(br)+"),("+ordstr(br)+")");
     1155      list rl=ringlist(br);
     1156      if (typeof(rl[1]=="int"))
     1157      {
     1158        rl[1]=0;
     1159      }
     1160      else
     1161      {
     1162        rl[1][1]=0;
     1163      } 
     1164      def newring=ring(rl);
     1165      setring newring; 
    11271166      execute("minpoly="+minp);
    11281167    }
     
    71727211    { I[i]=I[i]-y(i); }
    71737212    I=elim(I,1..n);
    7174     execute("ring newring=("+charstr(br)+"),(y(1..m)),dp(m);");
     7213    list l3;
     7214    for (int zz = 1; zz <= m; zz++)
     7215    {
     7216      l3[zz] = "y("+string(zz)+")";
     7217    }
     7218    ring newring = create_ring(ringlist(br)[1], l3, "dp("+string(m)+")", "no_minpoly");
    71757219    if (mp!="0")
    71767220    { execute("minpoly=number("+mp+");"); }
     
    74177461    }
    74187462    G=compress(G);
    7419     execute("ring newring=("+charstr(br)+"),(y(1..m)),lp;");
     7463    list l4;
     7464    for (int zz = 1; zz <= m; zz++)
     7465    {
     7466      l4[zz] = "y("+string(zz)+")";
     7467    }
     7468    ring newring = create_ring(ringlist(br)[1], l4, "lp", "no_minpoly");
    74207469    if (mp!="0")
    74217470    { execute("minpoly=number("+mp+");"); }
  • Singular/LIB/hnoether.lib

    r7032db rd78356  
    20162016 if (parstr(basering)!="") {
    20172017   if (charstr(basering)!=string(char(basering))+","+parstr(basering)) {
    2018      execute
    2019       ("ring dazu=("+charstr(basering)+"),z(0.."+string(size(v)-1)+"),ls;");
     2018     list l2;
     2019     for (int zz = 0; zz <= size(v)-1; zz++)
     2020     {
     2021       l2[size(l2)+1] = "z("+string(zz)+")";
     2022     }
     2023     ring dazu = create_ring(ringlist(basering)[1], l2, "ls", "no_minpoly");
    20202024   }
    20212025   else { ring dazu=char(altring),z(0..size(v)-1),ls; }
     
    20242028 def displayring=dazu+altring;
    20252029*/
    2026  execute("ring displayring=("+charstr(basering)+"),(z(0.."+string(size(v)-1)+"),"+varstr(basering)+"),(ls("+string(size(v))+"),"+ordstr(basering)+");");
     2030 list l1;
     2031 for (int zz = 0; zz <= size(v)-1; zz++)
     2032 {
     2033   l1[size(l1)+1] = "z("+string(zz)+")";
     2034 }
     2035 list l2=ringlist(basering)[2];
     2036 l1 = l1 + l2;
     2037 ring displayring = create_ring(ringlist(basering)[1], l1, "(ls("+string(size(v))+"),"+ordstr(basering)+")", "no_minpoly");
    20272038 // End change by T. Keilen
    20282039 //////////////////////////////////////////////////////////////
  • factory/facFactorize.cc

    r67e34d rd78356  
    4545TIMING_DEFINE_PRINT(fac_compress)
    4646
    47 #ifdef HAVE_NTL
    4847CFList evalPoints (const CanonicalForm& F, CFList& eval, Evaluation& E)
    4948{
     
    154153}
    155154
     155#ifdef HAVE_NTL // ratBiSqrfFactorize
    156156void
    157157factorizationWRTDifferentSecondVars (const CanonicalForm& A, CFList*& Aeval,
     
    190190  }
    191191}
    192 
     192#endif
     193
     194#ifdef HAVE_NTL // ratBiSqrfFactorize
    193195CFList
    194196multiFactorize (const CanonicalForm& F, const Variable& v)
     
    829831  return factors;
    830832}
    831 
    832833#endif
  • factory/facFqBivar.cc

    r67e34d rd78356  
    155155}
    156156
     157#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    157158CFList
    158159uniFactorizer (const CanonicalForm& A, const Variable& alpha, const bool& GF)
     
    360361  return uniFactors;
    361362}
     363#endif
    362364
    363365#if defined(HAVE_NTL) || defined(HAVE_FLINT)
     
    800802}
    801803
     804#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    802805Variable chooseExtension (const Variable & alpha, const Variable& beta, int k)
    803806{
     
    844847  return rootOf (newMipo);
    845848}
     849#endif
    846850
    847851void
     
    14611465#endif
    14621466
    1463 #ifndef HAVE_FLINT
     1467#ifdef HAVE_NTL
    14641468long isReduced (const mat_zz_p& M)
    14651469{
     
    14991503#endif
    15001504 
    1501 #ifdef HAVE_NTL // mat_zz_pE
     1505#ifdef HAVE_NTL
    15021506long isReduced (const mat_zz_pE& M)
    15031507{
     
    15181522#endif
    15191523
    1520 #ifndef HAVE_FLINT
     1524#ifdef HAVE_NTL
    15211525int * extractZeroOneVecs (const mat_zz_p& M)
    15221526{
     
    15701574#endif
    15711575
    1572 #ifdef HAVE_NTL // mat_zz_pE
     1576#ifdef HAVE_NTL
    15731577int * extractZeroOneVecs (const mat_zz_pE& M)
    15741578{
     
    15961600#endif
    15971601
    1598 #ifdef HAVE_NTL // mat_zz_pE
     1602#ifdef HAVE_NTL
    15991603void
    16001604reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
     
    16801684#endif
    16811685
    1682 #ifndef HAVE_FLINT
     1686#ifdef HAVE_NTL
    16831687void
    16841688reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
     
    18481852#endif
    18491853
    1850 #ifdef HAVE_NTL //mat_zz_pE
     1854#ifdef HAVE_NTL
    18511855CFList
    18521856reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs, int
     
    18991903#endif
    19001904
    1901 #ifdef HAVE_NTL // mat_zz_pE
     1905#ifdef HAVE_NTL
    19021906CFList
    19031907monicReconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs,
     
    19521956#endif
    19531957
    1954 #ifndef HAVE_FLINT
     1958#ifdef HAVE_NTL
    19551959CFList
    19561960extReconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs, int
     
    21142118#endif
    21152119
    2116 #ifndef HAVE_FLINT
     2120#ifdef HAVE_NTL
    21172121CFList
    21182122reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs,
     
    22162220#endif
    22172221
    2218 #ifndef HAVE_FLINT
     2222#ifdef HAVE_NTL
    22192223void
    22202224extReconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const
     
    24762480#endif
    24772481
    2478 #ifndef HAVE_FLINT
    2479 #ifdef HAVE_NTL // logarithmicDerivative
     2482#ifdef HAVE_NTL
    24802483//over Fp
    24812484int
     
    26002603  return l;
    26012604}
    2602 #endif
    26032605#endif
    26042606
     
    27422744#endif
    27432745
    2744 #ifndef HAVE_FLINT
    2745 #ifdef HAVE_NTL //logarithmicDerivative
     2746#ifdef HAVE_NTL
    27462747//over field extension
    27472748int
     
    29392940  return l;
    29402941}
    2941 #endif
    29422942#endif
    29432943
Note: See TracChangeset for help on using the changeset viewer.