Changeset 972221 in git

Timestamp:

Sep 17, 2019, 3:06:13 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7d7d24afc1aacc8696e95ad686d45427dc4a8516

Parents:

8f5259270995467397bb2f930d7ccf6f7e0688f7d08c429701793a3ea40aacddaa1284f49fbf6167

Message:

Merge branch 'execute' of https://github.com/sachinkm308/Sources into sachinkm308-execute

Location:

Singular

Files:

• LIB/arcpoint.lib (modified) (1 diff)
• LIB/control.lib (modified) (2 diffs)
• LIB/dmodvar.lib (modified) (1 diff)
• LIB/ehv.lib (modified) (1 diff)
• LIB/equising.lib (modified) (5 diffs)
• LIB/graal.lib (modified) (2 diffs)
• LIB/hnoether.lib (modified) (1 diff)
• LIB/mprimdec.lib (modified) (2 diffs)
• LIB/ncalg.lib (modified) (3 diffs)
• LIB/primdec.lib (modified) (1 diff)
• LIB/resolve.lib (modified) (3 diffs)
• table.h (modified) (1 diff)

Singular/LIB/arcpoint.lib

@@ -327 +327 @@
 RETURN:  string, the nth letter of the alphabet"
 {
- string s="ring r=0,("+A_Z("a",n)+"),ds;";
- execute(s);
+ ring r = create_ring(0, "("+A_Z("a",n)+")", "ds");
  return (string(var(n)));
 }

Singular/LIB/control.lib

@@ -774 +774 @@
   string newvars = parstr(basering);
   def save = basering;
-  string NewRing = "ring @NR =" +string(char(basering))+",("+newvars+"),Dp;";
-  execute(NewRing);
+  ring @NR = create_ring("string(char(basering))", "("+newvars+")", "Dp");
   // get params as variables
   // create a list of non-monomials
@@ -838 +837 @@
   string newvars = parstr(basering);
   def save = basering;
-  string NewRing = "ring @NR =(" +string(char(basering))+"),("+newvars+"),Dp;";
-  execute(NewRing);
+  ring @NR = create_ring("("+string(char(basering))+")", "("+newvars+")", "Dp");
   ideal F;
   ideal Den = imap(save,Den);

Singular/LIB/dmodvar.lib

@@ -136 +136 @@
   /* convert an ordering defined in NN variables in the  */
   /* string form into the same ordering in the list form */
-  list l2;
-  for (int ii = 1; ii <= NN; ii++)
-  {
-   l2[ii] = "z("+string(ii)+")";
-  }
-  ring @Z = create_ring(0, l2, "ORD");
+  string st;
+  st = "ring @Z = 0,z(1.." + string(NN) + "),";
+  st = st + ORD + ";";
+  execute(st); kill st;
   list L = ringlist(@Z)[3];
   kill @Z;

Singular/LIB/ehv.lib

@@ -821 +821 @@
   def base = basering;
   j = j[1,size(j)-1];
-  ring @r = create_ring(ringlist(basering)[1], "(" + j + ")", "(" + ordstr(basering) + ")", "no_minpoly");
+  j = "ring @r = (" + charstr(basering) + "),(" + j + "),(" + ordstr(basering) + ");";
+  execute(j);
   ideal J = imap(base,J);
 

Singular/LIB/equising.lib

@@ -346 +346 @@
   int i;
   string helpStr;
-  int ii;
   int nDefParams = nvars(r_old)-2;
 
@@ -353 +352 @@
   if ((npars(basering)==0) and (minPolyStr==""))
   {
-   list l2;
-   for (ii = 1; ii<= nDefParams; ii++)
-   {
-    l2[ii] = "t("+string(ii)+")";
-   }
-   l2[nDefParams+1] = "x";
-   l2[nDefParams+2] = "y";
-   ring myRing1 = create_ring("string(chara)", l2, "("+ ordStr +")");
+    helpStr = "ring myRing1 ="
+              + string(chara)+ ", (t(1..nDefParams), x, y),("+ ordStr +");";
+    execute(helpStr);
   }
   else
@@ -369 +363 @@
       if (minPolyStr<>"")
       {
-        list l3;
-        for (ii = 1; ii<= nDefParams; ii++)
-         {
-          l3[ii] = "t("+string(ii)+")";
-         }
-        l3[nDefParams+1] = "x";
-        l3[nDefParams+2] = "y";
-        ring myRing1 = create_ring("(" + string(chara) + ",a)", l3, "("+ ordStr +")");
+        helpStr = "ring myRing1 =
+                 (" + string(chara) + ",a),
+                 (t(1..nDefParams), x, y),(" + ordStr + ");";
+        execute(helpStr);
 
         execute (minPolyStr);
@@ -382 +372 @@
       else // no minpoly given
       {
-        string l6 = "(" + string(chara) + "";
-        for (ii = 1; ii <= npars(basering); ii++)
-        {
-         l6 = l6+",a("+string(ii)+")";
-        }
-        l6 = l6+")";
-        list l7;
-        for (ii = 1; ii<= nDefParams; ii++)
-        {
-         l7[ii] = "t("+string(ii)+")";
-        }
-        l7[size(l7)+1] = "x";
-        l7[size(l7)+1] = "y";
-        ring myRing1 = create_ring(l6, l7, "(" + ordStr + ")");
+        helpStr = "ring myRing1 =
+                  (" + string(chara) + ",a(1..npars(basering)) ),
+                  (t(1..nDefParams), x, y),(" + ordStr + ");";
+        execute(helpStr);
       }
     }
@@ -419 +399 @@
     {
       ordStr = "(dp("+string(no_b)+"),"+ordStr+")";
-      list l4;
-      for (ii = 1; ii<= no_b; ii++)
-      {
-       l4[ii] = "b("+string(ii)+")";
-      }
-      list l5;
-      for (ii = 1; ii<= nDefParams; ii++)
-      {
-       l5[ii] = "t("+string(ii)+")";
-      }
-      l4 = l4 + l5;
-      l4[size(l4)+1] = "x";
-      l4[size(l4)+1] = "y";
-      ring myRing = create_ring("string(chara)", l4, "ordStr"); 
+      helpStr = "ring myRing ="
+                + string(chara)+ ", (b(1..no_b), t(1..nDefParams), x, y),"
+                + ordStr +";";
+      execute(helpStr);
     }
     else

Singular/LIB/graal.lib

@@ -358 +358 @@
   else
     { string pars; string vars = varstr(basering); }
-  ring Q0 = create_ring("("+charstr(basering)+pars+")", "("+vars+")", "dp");
+  execute("ring Q0 = ("+charstr(basering)+pars+"),("+vars+"),dp;");
   ideal J0 = imap(Q,J);
   Gr.Q0 = Q0;
@@ -410 +410 @@
   }
   l2[s+1] = ringlist(basering)[2];
-  ring Q0y = create_ring(ringlist(basering)[1], l2, "(ds(s),c,"+ostring+")", "no_minpoly");
+  execute("ring Q0y = ("+charstr(basering)+"),(Y(1..s),"+varstr(basering)+"),(ds(s),c,"+ostring+")");
   setring Q0y;
   ideal H = imap(Gr.A,H);

Singular/LIB/hnoether.lib

@@ -2024 +2024 @@
  def displayring=dazu+altring;
 */
- list l2;
-  for (int ii = 0; ii <= (size(v)-1); ii++)
-  {
-   l2[ii] = "z("+string(ii)+")";
-  }
-  l2 = l2 + ringlist(basering)[2];
-  ring displayring = create_ring(ringlist(basering)[1], l2, "(ls("+string(size(v))+"),"+ordstr(basering)+")", "no_minpoly");
+ execute("ring displayring=("+charstr(basering)+"),(z(0.."+string(size(v)-1)+"),"+varstr(basering)+"),(ls("+string(size(v))+"),"+ordstr(basering)+");");
  // End change by T. Keilen
  //////////////////////////////////////////////////////////////

Singular/LIB/mprimdec.lib

@@ -287 +287 @@
                                   // this is also a standard basis in (R[U])[A]
       @A[size(@A)]=")";
-      execute("ring Rloc=("+charstr(basering)+","+@U+",("+@A+",(C,dp);");
+      ring Rloc = create_ring("("+charstr(basering)+","+@U, "("+@A, "(C,dp)");
       module @N=imap(RAU,@N);
       ideal @h;
@@ -673 +673 @@
   module @N=std(imap(BAS,@N));  // this is also a standard basis in (R[U])[A]
   @A[size(@A)]=")";
-  execute("ring Rloc=("+charstr(basering)+","+@U+",("+@A+",(C,dp);");
+  ring Rloc = create_ring("("+charstr(basering)+","+@U, "("+@A, "(C,dp)");
   module @N=imap(RAU,@N);
   kill RAU;

Singular/LIB/ncalg.lib

@@ -596 +596 @@
   int n = ncols(A);
   list l2;
-  for (int ii = 1; ii <= n; ii++)
+  int ii;
+  for (ii = 1; ii <= n; ii++)
   {
    l2[ii] = "d("+string(ii)+")";
@@ -619 +620 @@
     }
   }
-  string sord2 = "(a(0:" + string(n) + ")," + sord + ")";
   string l3 = "(0";
-  int ii;
   for (ii = 1; ii <= @d; ii++)
   {
-   l3 = l3+",b("+string(ii)+")";
+    l3 = l3+",b("+string(ii)+")";
   }
   l3 = l3+")";
@@ -630 +629 @@
   for (ii = 1; ii <= n; ii++)
   {
-   l4[ii] = "x("+string(ii)+")";
-   l4[n+ii] = "d("+string(ii)+")";
+    l4[ii] = "x("+string(ii)+")";
+    l4[n+ii] = "d("+string(ii)+")";
   }
+  string sord2 = "(a(0";
+  for (ii = 2; ii <= n; ii++)
+  {
+    sord2 = sord2 + ",0";
+  }
+  sord2 = sord2 + ")," + sord + ")";
   ring GR = create_ring(l3, l4, sord2);
   def W=Weyl(); setring W;

Singular/LIB/primdec.lib

@@ -5273 +5273 @@
       I=std(I);            // the standard basis in (R[U])[A]
       A[size(A)]=")";
-      execute("ring Rloc=("+charstr(basering)+","+U+",("+A+",dp;");
+      ring Rloc = create_ring("("+charstr(basering)+","+U, "("+A, "dp");
       ideal I=imap(RAU,I);
       //"std in lokalisierung:"+newline,I;

Singular/LIB/resolve.lib

@@ -667 +667 @@
 //--- control the names of the variables
    list l2;
-   for (int ii = 1; ii <= n; ii++)
+   int ii;
+   for (ii = 1; ii <= n; ii++)
    {
     l2[ii] = "x("+string(ii)+")";
@@ -711 +712 @@
          //to have the list depending on R in case BO[4] is empty
 
-   list l2 = ringlist(R)[2];
-   for (int ii = 0; ii <= s-1; ii++)
+   l2 = ringlist(R)[2];
+   for (ii = 0; ii <= s-1; ii++)
    {
     l2[size(l2)+1] = "y("+string(ii)+")";
@@ -719 +720 @@
    list resu;
    list B;
-   list l2 = ringlist(R)[2];
-   for (int ii = 0; ii <= s-1; ii++)
+   l2 = ringlist(R)[2];
+   for (ii = 0; ii <= s-1; ii++)
    {
     l2[size(l2)+1] = "y("+string(ii)+")";
    }
    l2[size(l2)+1] = "t";
-   ring S = create_ring(ringlist(R)[1], l2, "dp", "no_minpoly");
+   ring T = create_ring(ringlist(R)[1], l2, "dp", "no_minpoly");
    ideal C=imap(R,C);
    ideal W=imap(R,W);

Singular/table.h

@@ -286 +286 @@
 #if defined(HAVE_PLURAL) || defined(HAVE_SHIFTBBA)
 ,{D(jjTWOSTD),     TWOSTD_CMD,      IDEAL_CMD,      IDEAL_CMD     , ALLOW_NC |NO_RING}
+#endif
+#ifdef HAVE_SHIFTBBA
+,{D(jjTWOSTD),     TWOSTD_CMD,      MODUL_CMD,      MODUL_CMD     , ALLOW_LP |NO_RING}
 #endif
 //,{  jjWRONG ,      TRACE_CMD,       0,              INTVEC_CMD    , ALLOW_NC |ALLOW_RING}