Changeset cd6f8d2 in git

Timestamp:

Jan 25, 2017, 11:49:23 AM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

f71c1a2f42ee67a91fc918c338ef04f7d9b92c3f

Parents:

90753b3fa39cebd34e9770d6afb4e740c0f3893546174ab389855153a9b0fc8799d070388467c4d1

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-01-25 11:49:23+01:00

git-committer:

GitHub <noreply@github.com>2017-01-25 11:49:23+01:00

Message:

Merge pull request #813 from sebasguts/spielwiese

Fixed wrong call of surf execute script

Files:

• Singular/LIB/classify_aeq.lib (modified) (2 diffs)
• Singular/LIB/surf_jupyter.lib (modified) (1 diff)
• kernel/GBEngine/kstd2.cc (modified) (1 diff)

Singular/LIB/classify_aeq.lib

@@ -1322 +1322 @@
 //computes the Sagbi normal form
    list L=1;
+   poly re;
    map psi;
    f=jet(f,b);
    if(f==0){return(f);}
-   while((f!=0) && (L[1]!=0))
+   while(f!=0)
    {
      L= algebra_containment(lead(f),lead(I),1);
@@ -1335 +1336 @@
         kill S;
      }
-   }
-   return (lead(f)+sagbiNF(f-lead(f),I,b));
+     else
+     {
+        re=re+lead(f);
+        f=f-lead(f);
+     }
+   }
+   return (re);
 }
 

Singular/LIB/surf_jupyter.lib

@@ -143 +143 @@
 
     surf_call = "singularsurf_jupyter ";
-    surf_call = surf_call + l + " " + current_pid + " >/dev/null 2>&1";
+    surf_call = surf_call + l + " " + current_pid + " 2>&1";
     i = system("sh", surf_call);
     if (i != 0)

kernel/GBEngine/kstd2.cc

@@ -1752 +1752 @@
       if (cnt==0)
       {
+        kBucketCanonicalize(P.bucket);
         cnt=REDNF_CANONICALIZE;
-        kBucketCanonicalize(P.bucket);
       }
       h = kBucketGetLm(P.bucket);   // FRAGE OLIVER