Changeset 4bbc69 in git

Timestamp:

Jul 14, 2014, 1:11:42 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a7324b6e0b44a1a8ed3fa4d9ca3e2ff210ddd52c')

Children:

b964fa5d35238deded2896075be285d7005717dd

Parents:

43c97c987f6b22c14b6cb512fcaf3df848b37932

Message:

fix: degree test for subst(ideal/module/matrix...)

File:

• Singular/iparith.cc (modified) (1 diff)

Singular/iparith.cc

@@ -6293 +6293 @@
   BOOLEAN nok=jjSUBST_Test(v,w,ringvar,monomexpr);
   if (nok) return TRUE;
+  ideal id=(ideal)u->Data();
   if (ringvar>0)
   {
+    BOOLEAN overflow=FALSE;
+    //if (monomexpr!=NULL)
+    if (0)
+    {
+      long deg_monexp=pTotaldegree(monomexpr);
+      for(int i=IDELEMS(id)-1;i>=0;i--)
+      {
+        poly p=id->m[i];
+        if ((p!=NULL) && (pTotaldegree(p)!=0) &&
+        ((unsigned long)deg_monexp > (currRing->bitmask / (unsigned long)pTotaldegree(p))))
+        {
+          overflow=TRUE;
+          break;
+        }
+      }
+    }
+    if (overflow)
+      Warn("possible OVERFLOW in subst, max exponent is %ld",currRing->bitmask);
     if ((monomexpr==NULL)||(pNext(monomexpr)==NULL))
-      res->data = id_Subst((ideal)u->CopyD(res->rtyp), ringvar, monomexpr, currRing);
+    {
+      if (res->rtyp==MATRIX_CMD) id=(ideal)mp_Copy((matrix)id,currRing);
+      else                       id=id_Copy(id,currRing);
+      res->data = id_Subst(id, ringvar, monomexpr, currRing);
+    }
     else
-      res->data = idSubstPoly((ideal)u->Data(),ringvar,monomexpr);
+      res->data = idSubstPoly(id,ringvar,monomexpr);
   }
   else
   {
-    res->data = idSubstPar((ideal)u->Data(),-ringvar,monomexpr);
+    res->data = idSubstPar(id,-ringvar,monomexpr);
   }
   return FALSE;