Changeset 3e7095 in git

Timestamp:

Oct 12, 2011, 6:20:44 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

c79a9d3a83d34151b67ba9ac3b63b827a07b792f

Parents:

41072b6ab29c5e0337b0ec5f62dd37acbe4eb0bd

Message:

option(qringNF)

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

Files:

• Singular/ipassign.cc (modified) (9 diffs)
• Singular/subexpr.cc (modified) (2 diffs)
• doc/reference.doc (modified) (previous)

Singular/ipassign.cc

@@ -332 +332 @@
     res->data=(void*)p;
     jiAssignAttr(res,a);
+    if (TEST_V_QRING && (currQuotient!=NULL) && (!hasFlag(res,FLAG_QRING))) jjNormalizeQRingP(res);
   }
   else
@@ -365 +366 @@
       m->rank=si_max(m->rank,pMaxComp(p));
     }
-  }
-  //if ((TEST_V_QRING) && (currQuotient!=NULL)) jjNormalizeQRingP(res);
+    if (TEST_V_QRING) jjNormalizeQRingP(res);
+  }
   return FALSE;
 }
@@ -496 +497 @@
     setFlag(res,FLAG_STD);
   }
-  //if ((TEST_V_QRING) && (currQuotient!=NULL)) jjNormalizeQRingId(res);
+  if (TEST_V_QRING && (currQuotient!=NULL)&& (!hasFlag(res,FLAG_QRING))) jjNormalizeQRingId(res);
   return FALSE;
 }
@@ -514 +515 @@
   pNormalize(I->m[0]);
   res->data=(void *)I;
-  //if ((TEST_V_QRING) && (currQuotient!=NULL)) jjNormalizeQRingId(res);
+  if (TEST_V_QRING && (currQuotient!=NULL))
+  {
+    if (hasFlag(a,FLAG_QRING)) setFlag(res,FLAG_QRING);
+    else                       jjNormalizeQRingId(res);
+  }
   return FALSE;
 }
@@ -526 +531 @@
   idNormalize((ideal)m);
   res->data=(void *)m;
-  //if ((TEST_V_QRING) && (currQuotient!=NULL)) jjNormalizeQRingId(res);
+  if (TEST_V_QRING && (currQuotient!=NULL)) jjNormalizeQRingId(res);
   return FALSE;
 }
@@ -968 +973 @@
   l1->CleanUp();
   r->CleanUp();
-  //if ((TEST_V_QRING) && (currQuotient!=NULL)) jjNormalizeQRingP(l);
+  //if (TEST_V_QRING && (currQuotient!=NULL)) jjNormalizeQRingP(l);
   return FALSE;
 }
@@ -1048 +1053 @@
       {
         Warn("expression list length(%d) does not match intmat size(%d)",
-              iv->length()+exprlist_length(hh),iv->length());
+              iv->length()+exprlist_length(hh),iv->length());
       }
       break;
@@ -1657 +1662 @@
     if (I->e==NULL)
     {
+      ideal I0=(ideal)I->Data();
+      switch (I->Typ())
+      {
+        case IDEAL_CMD:
+        case MODUL_CMD:
+        {
+          ideal F=idInit(1,1);
+          ideal II=kNF(F,currQuotient,I0);
+          idDelete(&F);
+          if (I->rtyp!=IDHDL)
+          {
+            idDelete((ideal*)&(I0));
+            I->data=II;
+          }
+          else
+          {
+            idhdl h=(idhdl)I->data;
+            idDelete((ideal*)&IDIDEAL(h));
+            IDIDEAL(h)=II;
+            setFlag(h,FLAG_QRING);
+          }
+          break;
+        }
+        default: break;
+      }
+      setFlag(I,FLAG_QRING);
+    }
+  }
+}
+void jjNormalizeQRingP(leftv I)
+{
+  if ((currQuotient!=NULL) && (!hasFlag(I,FLAG_QRING)))
+  {
+    poly p=(poly)I->Data();
+    if ((I->e==NULL) && (p!=NULL))
+    {
       ideal F=idInit(1,1);
-      ideal I0=(ideal)I->Data();
-      ideal II=kNF(F,currQuotient,I0);
-      idDelete(&F);
-      if ((I->rtyp==IDEAL_CMD)
-      || (I->rtyp==MODUL_CMD)
-      )
-      {
-        idDelete((ideal*)&(I0));
-        I->data=II;
-      }
-      else if (I->rtyp==IDHDL)
-      {
-        idhdl h=(idhdl)I->data;
-        idDelete((ideal*)&IDIDEAL(h));
-        IDIDEAL(h)=II;
-        setFlag(h,FLAG_QRING);
-      }
-      else
-      {
-        idDelete(&II);
-      }
-      setFlag(I,FLAG_QRING);
-    }
-  }
-}
-void jjNormalizeQRingP(leftv I)
-{
-  if ((currQuotient!=NULL) && (!hasFlag(I,FLAG_QRING)))
-  {
-    if (I->e==NULL)
-    {
-      ideal F=idInit(1,1);
-      poly II=kNF(F,currQuotient,(poly)I->Data());
+      poly II=kNF(F,currQuotient,p);
       idDelete(&F);
       if ((I->rtyp==POLY_CMD)
       || (I->rtyp==VECTOR_CMD))
       {
-        pDelete((poly*)&(I->data));
+        pDelete(&p);
         I->data=II;
       }
       else if (I->rtyp==IDHDL)
       {
+        pDelete(&p);
         idhdl h=(idhdl)I->data;
-        pDelete((poly*)&IDPOLY(h));
         IDPOLY(h)=II;
         setFlag(h,FLAG_QRING);
@@ -1709 +1718 @@
         pDelete(&II);
       }
-      setFlag(I,FLAG_QRING);
-    }
+    }
+    setFlag(I,FLAG_QRING);
   }
 }

Singular/subexpr.cc

@@ -124 +124 @@
         case MODUL_CMD:
         case IDEAL_CMD:
-          if ((TEST_V_QRING)  &&(currQuotient!=NULL))
+          if ((TEST_V_QRING)  &&(currQuotient!=NULL)
+          &&(!hasFlag(this,FLAG_QRING)))
           {
             jjNormalizeQRingId(this);
@@ -135 +136 @@
         case POLY_CMD:
         case VECTOR_CMD:
-          if ((TEST_V_QRING)  &&(currQuotient!=NULL))
+          if ((TEST_V_QRING)  &&(currQuotient!=NULL)
+          &&(!hasFlag(this,FLAG_QRING)))
           {
             jjNormalizeQRingP(this);