Changeset 75214e in git for Singular/ipassign.cc

Timestamp:

Jan 6, 2016, 3:26:39 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b50cc4fc80fdf2a2005655a08d9229aa4b32d4a5')

Children:

93fcaad3210c79181af79c2a8f13b59cfb097ebd

Parents:

fc62955b6195fba8d9906e461584a2130448be7e

Message:

fix: normalizing in qrings + better error detecting in ring creation

File:

• Singular/ipassign.cc (modified) (4 diffs)

Singular/ipassign.cc

@@ -635 +635 @@
   if (e==NULL)
   {
+    if ((p!=NULL) && TEST_V_QRING && (currRing->qideal!=NULL)
+    && (!hasFlag(a,FLAG_QRING)))
+    {
+      jjNormalizeQRingP(p);
+      setFlag(res,FLAG_QRING);
+    }
     if (res->data!=NULL) pDelete((poly*)&res->data);
     res->data=(void*)p;
     jiAssignAttr(res,a);
-    if (TEST_V_QRING && (currRing->qideal!=NULL) && (!hasFlag(res,FLAG_QRING))) jjNormalizeQRingP(res);
   }
   else
@@ -669 +674 @@
       j=e->next->start;
     }
+    if ((p!=NULL) && TEST_V_QRING && (currRing->qideal!=NULL))
+    {
+      jjNormalizeQRingP(p);
+    }
     pDelete(&MATELEM(m,i,j));
     MATELEM(m,i,j)=p;
@@ -676 +685 @@
       m->rank=si_max(m->rank,pMaxComp(p));
     }
-    if (TEST_V_QRING) jjNormalizeQRingP(res);
   }
   return FALSE;
@@ -2152 +2160 @@
   }
 }
-void jjNormalizeQRingP(leftv I)
-{
-  if ((currRing->qideal!=NULL) && (!hasFlag(I,FLAG_QRING)))
-  {
-    poly p=(poly)I->Data();
-    if ((I->e==NULL) && (p!=NULL))
-    {
-      ideal F=idInit(1,1);
-      poly II=kNF(F,currRing->qideal,p);
-      idDelete(&F);
-      if ((I->rtyp==POLY_CMD)
-      || (I->rtyp==VECTOR_CMD))
-      {
-        pDelete(&p);
-        I->data=II;
-      }
-      else if (I->rtyp==IDHDL)
-      {
-        pDelete(&p);
-        idhdl h=(idhdl)I->data;
-        IDPOLY(h)=II;
-        setFlag(h,FLAG_QRING);
-      }
-      else
-      {
-        pDelete(&II);
-      }
-    }
-    setFlag(I,FLAG_QRING);
+void jjNormalizeQRingP(poly &p)
+{
+  if((p!=NULL) && (currRing->qideal!=NULL))
+  {
+    ideal F=idInit(1,1);
+    poly p2=kNF(F,currRing->qideal,p);
+    pNormalize(p2);
+    idDelete(&F);
+    pDelete(&p);
+    p=p2;
   }
 }