Changeset 628fc3d in git

Timestamp:

Jul 22, 2019, 4:37:47 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

b2359cfe3b7b393982685c8605f2181e5871eeecd4cec6ab781a81162945ff680935242fcccc952adcddf9cfa6c64ce8c0dc05e26e136194af70b1e3

Parents:

8dd7cd8222686ab045ce5be07f1a4d7b6dce1db12fe3fc12e0efceebb8390d13d817178c9e54da9e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-07-22 16:37:47+02:00

git-committer:

GitHub <noreply@github.com>2019-07-22 16:37:47+02:00

Message:

Merge pull request #942 from steenpass/execute

fix call of create_ring() in tropicalNewton.lib

Files:

• Singular/LIB/tropicalNewton.lib (modified) (1 diff)
• factory/facAlgFuncUtil.cc (modified) (1 diff)

Singular/LIB/tropicalNewton.lib

@@ -737 +737 @@
   def origin = basering;
   intvec wOne = oneVector(nvars(origin));
-  ring rInitialIdeal = create_ring(ringlist(origin)[1], "("+varstr(origin)+")", "(a(wOne),wp(w))", "no_minpoly");
+  list ordering = list(list("a", wOne), list("wp", w));
+  ring rInitialIdeal = create_ring(ringlist(origin)[1], "("+varstr(origin)+")", ordering, "no_minpoly");
   ideal I = imap(origin,I);
   int tinI = timer;

factory/facAlgFuncUtil.cc

@@ -372 +372 @@
   if (f.inBaseDomain())
     return 0;
-  if (f.inCoeffDomain())
-  {
-    if (f.level() != 0)
-      return 1;
-    return hasAlgVar(f.LC());
+  if (f.inExtension())
+  {
+    return 1;
   }
   if (f.inPolyDomain())