Changeset 6f25ae in git

Timestamp:

Jun 3, 2020, 3:41:26 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

fac3ec6af3bb2d637de4cd4122d461470014c799

Parents:

ae2e290177fd5de77a3afac81e53b9da8977da9a

Message:

add: jj_NormalizeQRingP

Location:

Singular

Files:

• ipassign.cc (modified) (4 diffs)
• ipid.h (modified) (1 diff)
• subexpr.cc (modified) (2 diffs)

Singular/ipassign.cc

@@ -618 +618 @@
     && (!hasFlag(a,FLAG_QRING)))
     {
-      jjNormalizeQRingP(p);
+      p=jjNormalizeQRingP(p);
       setFlag(res,FLAG_QRING);
     }
@@ -656 +656 @@
     if ((p!=NULL) && TEST_V_QRING && (currRing->qideal!=NULL))
     {
-      jjNormalizeQRingP(p);
+      p=jjNormalizeQRingP(p);
     }
     if (res->rtyp==SMATRIX_CMD)
@@ -1406 +1406 @@
   l1->CleanUp();
   r->CleanUp();
-  //if (TEST_V_QRING && (currRing->qideal!=NULL)) jjNormalizeQRingP(l);
+  //if (TEST_V_QRING && (currRing->qideal!=NULL)) l=jjNormalizeQRingP(l);
   return FALSE;
 }
@@ -2200 +2200 @@
   }
 }
-void jjNormalizeQRingP(poly &p)
-{
-  if((p!=NULL) && (currRing->qideal!=NULL))
-  {
+poly jj_NormalizeQRingP(poly p, const ring r)
+{
+  if((p!=NULL) && (r->qideal!=NULL))
+  {
+    ring save=currRing;
+    if (r!=currRing) rChangeCurrRing(r);
     ideal F=idInit(1,1);
-    poly p2=kNF(F,currRing->qideal,p);
-    pNormalize(p2);
-    idDelete(&F);
-    pDelete(&p);
+    poly p2=kNF(F,r->qideal,p);
+    p_Normalize(p2,r);
+    id_Delete(&F,r);
+    p_Delete(&p,r);
     p=p2;
-  }
+    if (r!=save) rChangeCurrRing(save);
+  }
+  return p;
 }
 BOOLEAN jjIMPORTFROM(leftv, leftv u, leftv v)

Singular/ipid.h

@@ -98 +98 @@
 BOOLEAN checkPackage(package pack);
 idhdl packFindHdl(package r);
-void jjNormalizeQRingP(poly &p);
+poly jj_NormalizeQRingP(poly p, const ring r);
 void jjNormalizeQRingId(leftv I);
+#define jjNormalizeQRingP(p) jj_NormalizeQRingP(p,currRing)
 void *idrecDataInit(int t);
 

Singular/subexpr.cc

@@ -119 +119 @@
             {
               poly p=pCopy(sBucketPeek(b));
-              jjNormalizeQRingP(p);
+              p=jjNormalizeQRingP(p);
               PrintNSpaces(spaces);
               pWrite0(p);
@@ -183 +183 @@
             setFlag(this,FLAG_QRING);
             poly p=(poly)d;
-            jjNormalizeQRingP(p);
+            p=jjNormalizeQRingP(p);
             if (p!=(poly)d)
             {