Changeset e2af3af in git for Singular/LIB/primdec.lib

Timestamp:

Jul 1, 2019, 4:07:30 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

2050058328d464a197ff417b127e85fe08b3a3cd

Parents:

77006ca97061dca7e90bdacf1fbaff76644280a24142c906ad243d17ff54542115db04d9e8264de7

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-07-01 16:07:30+02:00

git-committer:

GitHub <noreply@github.com>2019-07-01 16:07:30+02:00

Message:

Merge pull request #936 from steenpass/execute

replace some occurrences of execute()

File:

• Singular/LIB/primdec.lib (modified) (13 diffs)

Singular/LIB/primdec.lib

@@ -2564 +2564 @@
 
   indep=maxIndependSet(j);
-
-  execute("ring gnir1 = ("+charstr(basering)+"),("+indep[1][1]+"),("
-                              +indep[1][2]+");");
+  ring gnir1 = create_ring(ringlist(basering)[1],"("+indep[1][1]+")","("+indep[1][2]+")","no_minpoly");
   if(homo==1)
   {
@@ -3112 +3110 @@
       newva[size(newva)]=")";
       newma[size(newma)]=";";
-      execute("ring @deirf=("+charstr(gnir)+"),("+newva+",lp;");
+      ring @deirf = create_ring(ringlist(gnir)[1],"("+newva,"lp","no_minpoly");
       execute("map @kappa=gnir,"+newma);
       ideal @j= @kappa(@j);
@@ -3337 +3335 @@
         @j=fetch(@P,i);
       }
-      execute("ring gnir1 = ("+charstr(basering)+"),("+indep[@m][1]+"),("
-                              +indep[@m][2]+");");
+      ring gnir1 = create_ring(ringlist(basering)[1],"("+indep[@m][1]+")","("+indep[@m][2]+")","no_minpoly");
       execute("map phi=gnir,"+@va+";");
       op=option(get);
@@ -3646 +3643 @@
         {
           @va=string(maxideal(1));
-          execute("ring gnir1 = ("+charstr(basering)+"),("+
-                      restindep[@m][1]+"),(" +restindep[@m][2]+");");
+          ring gnir1 = create_ring(ringlist(basering)[1],"("+restindep[@m][1]+")","("+restindep[@m][2]+")","no_minpoly");
           execute("map phi=gnir,"+@va+";");
           op=option(get);
@@ -4614 +4610 @@
   def oldring=basering;
   string n=system("neworder",PS);
-  execute("ring r=("+charstr(oldring)+"),("+n+"),dp;");
+  ring r = create_ring(ringlist(oldring)[1],"("+n+")","dp","no_minpoly");
   ideal PS=imap(oldring,PS);
   matrix m=char_series(PS);  // We compute an irreducible
@@ -4629 +4625 @@
     for(i=1;i<nvars(oldring);i++) { n=n+","+string(var(i)); }
     kill r;
-    execute("ring r=("+charstr(oldring)+"),("+n+"),dp;");
+    ring r = create_ring(ringlist(oldring)[1],"("+n+")","dp","no_minpoly");
     ideal PS=imap(oldring,PS);
     matrix m=char_series(PS);
@@ -5272 +5268 @@
 
       U[size(U)]=")";           // we compute the extractor of I (w.r.t. U)
-      execute("ring RAU=("+charstr(basering)+"),("+A+U+",(dp("+string(a)+"),dp);");
+      ring RAU = create_ring(ringlist(basering)[1],"("+A+U,"(dp("+string(a)+"),dp)","no_minpoly");
       ideal I=imap(R,SI);
       //I=std(I,hv);            // the standard basis in (R[U])[A]
@@ -6763 +6759 @@
       @va = string(maxideal(1));
 
-      execute("ring gnir1 = (" + charstr(basering) + "), (" + indep[@m][1] + "),("
-                              + indep[@m][2] + ");");
+      ring gnir1 = create_ring(ringlist(basering)[1],"(" + indep[@m][1] + ")","(" + indep[@m][2] + ")","no_minpoly");
       execute("map phi = @P," + @va + ";");
       ideal @j = groebner(phi(I));
@@ -7325 +7320 @@
     string(timer-time));
 //---------------- compute characteristic polynomial of matrix --------------
-  execute("ring P1=("+charstr(R)+"),T,dp;");
+  ring P1 = create_ring(ringlist(R)[1],"T","dp","no_minpoly");
   matrix n=imap(R,n);
   time = timer;
@@ -7355 +7350 @@
 //Hence it is better to simultaneously reduce with I. For this we need a new
 //ring.
-    execute("ring P=("+charstr(R)+"),(T,"+varstr(R)+"),(dp(1),dp);");
+    ring P = create_ring(ringlist(R)[1],"(T,"+varstr(R)+")","(dp(1),dp)","no_minpoly");
     list rfac=imap(P1,fac);
     intvec ov=option(get);;
@@ -7652 +7647 @@
       newva[size(newva)]=")";
       newma[size(newma)]=";";
-      execute("ring @deirf=("+charstr(gnir)+"),("+newva+",lp;");
+      ring @deirf = create_ring(ringlist(gnir)[1],"("+newva,"lp","no_minpoly");
       execute("map @kappa=gnir,"+newma);
       ideal @j= @kappa(@j);
@@ -8043 +8038 @@
           {
              @va=string(maxideal(1));
-             execute("ring gnir1 = ("+charstr(basering)+"),("+
-                     restindep[@m][1]+"),(" +restindep[@m][2]+");");
+             ring gnir1 = create_ring(ringlist(basering)[1],"(" +restindep[@m][1]+")","(" +restindep[@m][2]+")","no_minpoly");
              execute("map phi=gnir,"+@va+";");
              op=option(get);
@@ -8387 +8381 @@
      //}
 //=======================
-     execute("ring gnir1 = ("+charstr(basering)+"),("+indepInfo[1]+"),("
-                              +indepInfo[2]+");");
+     ring gnir1 = create_ring(ringlist(basering)[1],"("+indepInfo[1]+")","(" +indepInfo[2]+")","no_minpoly");
      execute("map phi=gnir,"+@va+";");
      op=option(get);