Changeset e7a3e4 in git

Timestamp:

Jun 28, 2019, 12:10:53 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

2547a87dad64e60844bcd9668e04b8fb86efdc64

Parents:

a9a5c25b8fcdd11965eb13df8c4dbc1fb5a2d1a63bf60ea4375573ca70d19a1802f43a5e8bb12050

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-06-28 10:10:53+00:00

git-committer:

GitHub <noreply@github.com>2019-06-28 10:10:53+00:00

Message:

Merge pull request #930 from steenpass/create_ring

add support for parameters givien as strings in create_ring()

Files:

• Singular/LIB/ring.lib (modified) (4 diffs)
• Singular/iparith.cc (modified) (2 diffs)
• kernel/GBEngine/kutil.cc (modified) (1 diff)

Singular/LIB/ring.lib

@@ -1381 +1381 @@
 }
 
+/*
+ * parses
+ * "0" and "(0)" to 0,
+ * "32003" and "(32003)" to 32003, and
+ * "(32003,a,b,c)" to
+ *     list(32003, list("a", "b", "c"), list(list("lp", 1:3)), ideal(0))
+ */
+static proc parse_L1(string l1)
+{
+  if (find(l1, "(", 1) == 0)   // no parentheses
+  {
+      return(int(l1));
+  }
+  list tokens = tuple_to_tokens(l1);
+  if (size(tokens) == 1)
+  {
+      return(int(tokens[1]));
+  }
+  list L = int(tokens[1]);
+  L[2] = list(tokens[2..size(tokens)]);
+  L[3] = list(list("lp", 1:(size(tokens)-1)));
+  L[4] = ideal(0);
+  return(L);
+}
+
+/*
+ * parses
+ * "x" to list("x") and
+ * "(x,y,z)" to list("x", "y", "z")
+ */
 static proc parse_L2(string l2)
 {
+  if (find(l2, "(", 1) == 0)   // no parentheses
+  {
+      return(list(l2));
+  }
   list V = tuple_to_tokens(l2);
   return(V);
@@ -1434 +1468 @@
   {
     list L =  parse_ordering(l3, n_vars);
-    return(L);
+    return(list(L));
   }
   // block orderings
@@ -1454 +1488 @@
          ideal(0). If \"no_minpoly\" is given, then the minimal polynomial
          in l1, if present, is set to 0.
-         @* Shortcuts: Strings such as \"(x,y,z)\" can be given as l2.
+         @* Shortcuts: Strings such as \"0\", \"(32003)\" or \"(0,a,b,c)\" can
+         be given as l1. Indexed parameters as in \"(0,a(1..3))\" are
+         not supported. Strings such as \"(x,y,z)\" can be given as l2.
          Indexed variables as in \"(x(1..3),y,z)\" are not supported.
          Strings representing orderings such as \"dp\" or \"(lp(3), ds(2))\"
@@ -1491 +1527 @@
 
   /* L[1] */
-  if (no_minpoly)
-  {
-    if (typeof(l1) == "list")
+  if (typeof(l2) == "list")
+  {
+    if (no_minpoly)
     {
-      if (size(l1) == 4)
+      if (typeof(l1) == "list")
       {
-        if (typeof(l1[4]) == "ideal")
+        if (size(l1) == 4)
         {
-          l1[4] = ideal(0);
+          if (typeof(l1[4]) == "ideal")
+          {
+            l1[4] = ideal(0);
+          }
         }
       }
     }
-  }
-  L[1] = l1;
+    L[1] = l1;
+  }
+  else
+  {
+    L[1] = parse_L1(l1);
+  }
 
   /* L[2] */

Singular/iparith.cc

@@ -1012 +1012 @@
   if (v->next==NULL)
   {
-    a=(poly)u->Data(); // works also for VECTOR_CMD
     if (u->next==NULL)
     {
+      a=(poly)u->Data(); // works also for VECTOR_CMD
       b=(poly)v->Data(); // works also for VECTOR_CMD
       if ((a!=NULL) && (b!=NULL)
@@ -1027 +1027 @@
     }
     // u->next exists: copy v
+    a=(poly)u->CopyD(POLY_CMD); // works also for VECTOR_CMD
     b=pCopy((poly)v->Data());
     if ((a!=NULL) && (b!=NULL)

kernel/GBEngine/kutil.cc

@@ -9154 +9154 @@
         /*puts the elements of S also to T*/
         strat->initEcart(&h);
-        enterT(h,strat);
+        /*if (toT) - already checked*/ enterT(h,strat);
         strat->S_2_R[i] = strat->tl;
 #ifdef HAVE_SHIFTBBA
-        if (currRing->isLPring)
+        if (/*(toT) && */(currRing->isLPring))
           enterTShift(h, strat);
 #endif