Changeset 09cb63f in git

Timestamp:

Oct 4, 2016, 10:51:10 PM (8 years ago)

Author:

Thomas Markwig <keilen@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d5122e12287fd5f17a9443a21ced8b72679e4b57

Parents:

50a0eb6a06430df83592ea9590c76105f926b5e5

Message:

choosegfanvector: Fehler beim Erkennen der Homogenitaet korrigiert

File:

• Singular/LIB/tropical.lib (modified) (7 diffs)

Singular/LIB/tropical.lib

@@ -4727 +4727 @@
         // which in a later version
         // should be interpreded by Singular
-        intvec wneu=choosegfanvector(read("/tmp/gfanoutput"),0,anzahlvariablen)[1];
+        intvec wneu=choosegfanvector(read("/tmp/gfanoutput"),0,homogentest)[1];
         setring PREGFANRING;
       }
@@ -5450 +5450 @@
 /////////////////////////////////////////////////////////////////////////
 
-static proc choosegfanvector (string s,int findall,int anzahlvariablen)
-"USAGE:   choosegfanvector(s); s string
+static proc choosegfanvector (string s,int findall,int homogentest)
+"USAGE:   choosegfanvector(s,fa,h); s string, fa,h int
 RETURN:   list, the jth entry is the jth integer vector contained in s
 NOTE:     the procedure is called from tropicalparametrise"
@@ -5467 +5467 @@
     // the last entry in ww should correspond to the homogenisation variable
     // (and can be omitted), unless the input to gfan was already homogeneous
-    if (anzahlvariablen==size(ww)-1)
+    if (homogentest==0)
     {
       ww=ww[1..size(ww)-1];
@@ -5497 +5497 @@
       {
         execute("www=intvec("+w+");");
-        if (anzahlvariablen==size(ww)-1)
+        if (homogentest==0)
         {
           ww[i]=intvec(www[1..size(www)-1]);
@@ -5667 +5667 @@
   int numberdeletedvariables;  // the number of deleted variables
   int oldanzahlvariablen=anzahlvariablen; // anzahlvariablen for later reference
+  int homogentest=0;
   list liftings,partliftings;  // the computed liftings (all resp. partly)
   // consider each ring which has been returned when computing the zeros of the
@@ -5718 +5719 @@
           // it suffices to homogenise an arbitrary system of generators
           // II=groebner(II);
+          homogentest=homog(II);
           II=homog(II,maxideal(1)[nvars(PREGFANRING)+1]);
           // if gfan version >= 0.3.0 is used and the characteristic
@@ -5785 +5787 @@
             // which in a later version
             // should be interpreded by Singular
-            wneulist=choosegfanvector(read("/tmp/gfanoutput"),findall,anzahlvariablen);
+            wneulist=choosegfanvector(read("/tmp/gfanoutput"),findall,homogentest);
             setring PREGFANRING;
           }