Changeset f8345d in git

Timestamp:

Jun 16, 2010, 4:42:16 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

742b1246479b6ce19881ee95dc020aeb3a60a75a

Parents:

14fb6ea28019a5bc2663057d3ad5775be697aeca

Message:

64bit fixed for overflow test

git-svn-id: file:///usr/local/Singular/svn/trunk@12869 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/iparith.cc (modified) (3 diffs)

Singular/iparith.cc

@@ -759 +759 @@
   {
     pDelete(&u_p);
-    Werror("OVERFLOW");
+    Werror("OVERFLOW in power(d=%ld, e=%d, max=%ld)",
+                                    pTotaldegree(u_p),v_i,currRing->bitmask);
     return TRUE;
   }
@@ -1044 +1045 @@
       b=(poly)v->CopyD(POLY_CMD); // works also for VECTOR_CMD
       if ((a!=NULL) && (b!=NULL)
-      && (pTotaldegree(a)+pTotaldegree(b)>=si_max(255,currRing->bitmask)))
-      {
+      && (pTotaldegree(a)+pTotaldegree(b)>=si_max((long)rVar(currRing),currRing->bitmask)))
+      {
+        Werror("OVERFLOW in mult(d=%ld, d=%ld, max=%ld)",
+          pTotaldegree(a),pTotaldegree(b),currRing->bitmask);
         pDelete(&a);
         pDelete(&b);
-        WerrorS("OVERFLOW");
         return TRUE;
       }
@@ -1058 +1060 @@
     b=pCopy((poly)v->Data());
     if ((a!=NULL) && (b!=NULL)
-    && (pTotaldegree(a)+pTotaldegree(b)>=si_max(255,currRing->bitmask)))
-    {
+    && (pTotaldegree(a)+pTotaldegree(b)>=si_max((long)rVar(currRing),currRing->bitmask)))
+    {
+      Werror("OVERFLOW in mult(d=%ld, d=%ld, max=%ld)",
+          pTotaldegree(a),pTotaldegree(b),currRing->bitmask);
       pDelete(&a);
       pDelete(&b);
-      WerrorS("OVERFLOW");
       return TRUE;
     }