Changeset d5122e in git for Singular

Timestamp:

Oct 5, 2016, 5:36:44 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4aaf5920e25e841ccd0432b72d165b4d869a69bcd5cda0dfd81e6ccd6676b5a7762d696d084d9dad

Parents:

65d6837cb0e0c17ca95e439bb49e5ed0e7fc2e9309cb63f3434835f3538f07adbf3c476e26186d46

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-10-05 17:36:44+02:00

git-committer:

GitHub <noreply@github.com>2016-10-05 17:36:44+02:00

Message:

Merge pull request #797 from markwig/spielwiese

choosegfanvector: Fehler beim Erkennen der Homogenitaet korrigiert

Location:

Singular

Files:

• LIB/surfacesignature.lib (modified) (1 diff)
• LIB/tropical.lib (modified) (7 diffs)
• subexpr.cc (modified) (4 diffs)

Singular/LIB/surfacesignature.lib

@@ -334 +334 @@
 {
    number a,b;
-   int r;
+   bigint r;
    a = numerator(n);
    b = denominator(n);
-   int z = int(number(a));
-   int y = int(number(b));
+   bigint z = bigint(a);
+   bigint y = bigint(b);
    r = z mod y;
-   int q = (z-r) div y;
-   number n1 = q;
-   number n2 = n-n1;
+   bigint q = (z-r) div y;
+   number n1 = number(q);
+   number n2 = number(n-n1);
    return(n2);
 }

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;
           }

Singular/subexpr.cc

@@ -235 +235 @@
           break;
           }
-        case NUMBER_CMD:
         case BIGINT_CMD:
-          if (t==NUMBER_CMD)
-          {
-            number n=(number)d;
-            nNormalize(n);
-            d=n;
-          }
           s=String(d);
           if (s==NULL) return;
@@ -249 +242 @@
           omFree((ADDRESS)s);
           break;
+        case NUMBER_CMD:
+          {
+            number n=(number)d;
+            nNormalize(n);
+            if ((number)d !=n)
+            {
+              d=n;
+              if (rtyp==IDHDL) IDNUMBER(((idhdl)data))=n;
+              else if(rtyp==NUMBER_CMD) data=(void*)n;
+            }
+            s=String(d);
+            if (s==NULL) return;
+            PrintS(s);
+            omFree((ADDRESS)s);
+            break;
+          }
         case LIST_CMD:
         {
@@ -822 +831 @@
         case NUMBER_CMD:
           StringSetS((char*) (typed ? "number(" : ""));
-          if ((rtyp==IDHDL)&&(IDTYP((idhdl)data)==NUMBER_CMD))
-          {
-            nWrite(IDNUMBER((idhdl)data));
-          }
-          else if (rtyp==NUMBER_CMD)
-          {
-            number n=(number)data;
-            nWrite(n);
-            data=(char *)n;
-          }
-          else if((rtyp==VMINPOLY)&&(rField_is_GF(currRing)))
+          if((rtyp==VMINPOLY)&&(rField_is_GF(currRing)))
           {
             nfShowMipo(currRing->cf);
@@ -838 +837 @@
           else
           {
-            number n=nCopy((number)d);
-            nWrite(n);
-            nDelete(&n);
+            nWrite((number)d);
           }
           StringAppendS((char*) (typed ? ")" : ""));