Changeset d5122e in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

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

Files:

• Singular/LIB/surfacesignature.lib (modified) (1 diff)
• Singular/LIB/tropical.lib (modified) (7 diffs)
• Singular/subexpr.cc (modified) (4 diffs)
• Tst/Short/bug_normalize.res.gz.uu (added)
• Tst/Short/bug_normalize.stat (added)
• Tst/Short/bug_normalize.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (1 diff)
• libpolys/coeffs/longrat.cc (modified) (13 diffs)
• libpolys/coeffs/longrat0.cc (modified) (2 diffs)
• libpolys/reporter/reporter.cc (modified) (1 diff)
• omalloc/omBinPage.h (modified) (1 diff)

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 ? ")" : ""));

Tst/Short/ok_s.lst

@@ -5 +5 @@
 bug_minpoly
 bug_newstruct
+bug_normalize
 bug_qring2
 bug_ring

libpolys/coeffs/coeffs.h

@@ -585 +585 @@
 /// write to the output buffer of the currently used reporter
 //CF: the "&" should be removed, as one wants to write constants as well
-static FORCE_INLINE void   n_WriteLong(number& n,  const coeffs r)
+static FORCE_INLINE void   n_WriteLong(number n,  const coeffs r)
 { STATISTIC(n_WriteLong); assume(r != NULL); assume(r->cfWriteLong!=NULL); r->cfWriteLong(n,r); }
 
 /// write to the output buffer of the currently used reporter
 /// in a shortest possible way, e.g. in K(a): a2 instead of a^2
-static FORCE_INLINE void   n_WriteShort(number& n,  const coeffs r)
+static FORCE_INLINE void   n_WriteShort(number n,  const coeffs r)
 { STATISTIC(n_WriteShort); assume(r != NULL); assume(r->cfWriteShort!=NULL); r->cfWriteShort(n,r); }
 
-static FORCE_INLINE void   n_Write(number& n,  const coeffs r, const BOOLEAN bShortOut = TRUE)
+static FORCE_INLINE void   n_Write(number n,  const coeffs r, const BOOLEAN bShortOut = TRUE)
 { STATISTIC(n_Write); if (bShortOut) n_WriteShort(n, r); else n_WriteLong(n, r); }
 

libpolys/coeffs/longrat.cc

@@ -1705 +1705 @@
         }
         mpz_init_set(u->n,b->n);
+        u->s = 0;
         if (GCD_NORM_COND(b,u)) { nlNormalize_Gcd(u); }
-        else u->s = 0;
         break;
       }
@@ -1756 +1756 @@
                return INT_TO_SR(1);
             }
+            u->s = 0;
             if (GCD_NORM_COND(b,u)) { nlNormalize_Gcd(u); }
-            else u->s = 0;
             break;
           }
@@ -1777 +1777 @@
             }
             mpz_init_set(u->n,a->n);
+            u->s = 0;
             if (GCD_NORM_COND(a,u)) { nlNormalize_Gcd(u); }
-            else u->s = 0;
             break;
           }
@@ -1806 +1806 @@
             }
             mpz_init_set(u->n,b->n);
+            u->s = 0;
             if (GCD_NORM_COND(b,u)) { nlNormalize_Gcd(u); }
-            else u->s = 0;
             break;
           }
@@ -1875 +1875 @@
         // result cannot be 0, if coeffs are normalized
         mpz_init_set(u->n,b->n);
+        u->s=0;
         if (GCD_NORM_COND(b,u)) { nlNormalize_Gcd(u); }
-        else { u->s = 0; u=nlShort1(u); }
+        else { u=nlShort1(u); }
         break;
       }
@@ -1915 +1916 @@
             mpz_clear(y);
             mpz_mul(a->n,a->n,b->n);
+            a->s=0;
             if (GCD_NORM_COND(b,a)) { nlNormalize_Gcd(a); }
-            else { a->s = 0;a=nlShort1(a);}
+            else { a=nlShort1(a);}
             break;
           }
@@ -1926 +1928 @@
             mpz_add(a->z,a->z,x);
             mpz_clear(x);
+            a->s=0;
             if (GCD_NORM_COND(b,a)) { nlNormalize_Gcd(a); }
-            else { a->s = 0; a=nlShort1(a);}
+            else { a=nlShort1(a);}
             break;
           }
@@ -1946 +1949 @@
             mpz_clear(x);
             mpz_init_set(a->n,b->n);
+            a->s=0;
             if (GCD_NORM_COND(b,a)) { nlNormalize_Gcd(a); }
-            else { a->s = 0; a=nlShort1(a);}
+            else { a=nlShort1(a);}
             break;
           }
@@ -1996 +2000 @@
         }
         mpz_init_set(u->n,b->n);
+        u->s=0;
         if (GCD_NORM_COND(b,u)) { nlNormalize_Gcd(u); }
-        else u->s = 0;
         break;
       }
@@ -2043 +2047 @@
         }
         mpz_init_set(u->n,a->n);
+        u->s=0;
         if (GCD_NORM_COND(a,u)) { nlNormalize_Gcd(u); }
-        else u->s = 0;
         break;
       }
@@ -2099 +2103 @@
               return INT_TO_SR(1);
             }
+            u->s=0;
             if (GCD_NORM_COND(a,u)) { nlNormalize_Gcd(u); }
-            else u->s = 0;
             break;
           }
@@ -2123 +2127 @@
             }
             mpz_init_set(u->n,a->n);
+            u->s=0;
             if (GCD_NORM_COND(a,u)) { nlNormalize_Gcd(u); }
-            else u->s = 0;
             break;
           }
@@ -2155 +2159 @@
             }
             mpz_init_set(u->n,b->n);
+            u->s=0;
             if (GCD_NORM_COND(b,u)) { nlNormalize_Gcd(u); }
-            else u->s = 0;
             break;
           }

libpolys/coeffs/longrat0.cc

@@ -127 +127 @@
   else
   {
-    if (a->s==0)
-    {
-      nlNormalize(a,r); // FIXME? TODO? // extern void     nlNormalize(number &x, const coeffs r);
-      nlWrite(a,r);
-      return;
-    }
     int l=mpz_sizeinbase(a->z,10);
     if (a->s<2) l=si_max(l,(int)mpz_sizeinbase(a->n,10));
@@ -149 +143 @@
 }
 
+#if 0
+void nlDebugWrite (number a)
+{
+  char *s,*z;
+  if (SR_HDL(a) & SR_INT)
+  {
+    Print("%ld",SR_TO_INT(a));
+  }
+  else if (a==NULL)
+  {
+    PrintS("o");
+  }
+  else
+  {
+    int l=mpz_sizeinbase(a->z,10);
+    if (a->s<2) l=si_max(l,(int)mpz_sizeinbase(a->n,10));
+    l+=2;
+    s=(char*)omAlloc(l);
+    z=mpz_get_str(s,10,a->z);
+    PrintS(z);
+    if (a->s!=3)
+    {
+      PrintS("/");
+      z=mpz_get_str(s,10,a->n);
+      PrintS(z);
+    }
+    omFreeSize((void *)s,l);
+  }
+}
+#endif
 

libpolys/reporter/reporter.cc

@@ -159 +159 @@
   if (strlen(r)<1024)
   {
-    // if the used buffer is a "smal block",
+    // if the used buffer is a "small block",
     // substitue the "large" initial block by a small one
     char *s=omStrDup(r); omFree(r); r=s;

omalloc/omBinPage.h

@@ -65 +65 @@
 
 
-#if defined(OM_INLINE) || defined(OM_INTERNAL_DEBUG)
+#if !defined(OM_INLINE) || defined(OM_INTERNAL_DEBUG)
 #define omIsBinPageAddr(addr) _omIsBinPageAddr(addr)
 #else