Changeset 3e31b2 in git

Timestamp:

Apr 17, 2014, 11:42:03 AM (10 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

2f864fd4d49e100b0c0e759c51665fb14c67c55c

Parents:

4341170a137c82a30b8d5c6007a7c6797c5d3f19

git-author:

Adi Popescu <adi_popescum@yahoo.de>2014-04-17 11:42:03+02:00

git-committer:

Adi Popescu <adi_popescum@yahoo.de>2014-05-05 11:08:44+02:00

Message:

mv: moved the qring constant build into a function

Files:

• Singular/ipassign.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

Singular/ipassign.cc

@@ -748 +748 @@
   ideal id=(ideal)a->CopyD(IDEAL_CMD);
   if((rField_is_Ring(currRing)) && (idPosConstant(id) != -1))
-  {
-// computing over Rings: handle constant generators of id properly
-      if(nCoeff_is_Ring_ModN(currRing->cf) || 
-         nCoeff_is_Ring_PtoM(currRing->cf) || 
-         nCoeff_is_Ring_2toM(currRing->cf))
-      {
-      // already computing mod modNumber: use gcd(modNumber,constant entry of id)
-        mpz_t gcd;
-        mpz_t newConst;
-        mpz_init(newConst);
-        mpz_set_ui(newConst, currRing->cf->cfInt(p_GetCoeff(id->m[idPosConstant(id)], currRing),currRing->cf));
-        mpz_init(gcd);
-        mpz_gcd(gcd, currRing->cf->modNumber, newConst);
-        if(mpz_cmp_ui(gcd, 1) == 0)
-        {
-            WerrorS("constant in q-ideal is coprime to modulus in ground ring");
-            WerrorS("Unable to create qring!");
+    {
+        qr = updateQring(currRing, id, idPosConstant(id));
+        if(qr == NULL)
             return TRUE;
-        }
-        if(nCoeff_is_Ring_PtoM(currRing->cf) || 
-           nCoeff_is_Ring_2toM(currRing->cf))
-        {
-        // modNumber is prime power: set modExponent appropriately
-          int kNew = 1;
-          mpz_t baseTokNew;
-          mpz_init(baseTokNew);
-          mpz_set(baseTokNew, currRing->cf->modBase);
-          while(mpz_cmp(gcd, baseTokNew) > 0)
-          {
-            kNew++;
-            mpz_mul(baseTokNew, baseTokNew, currRing->cf->modBase);
-          }
-          //To Do: currently we stay in case Z/p^n even for n=1
-          //       for performance reasons passing to groundfield Z/p 
-          //       would be more suitable
-          qr = rCopyNewCoeff(currRing, currRing->cf->modBase, kNew, currRing->cf->type);
-          mpz_clear(baseTokNew);
-        }
-        else
-        {
-        // previously over modNumber, now over new modNumber
-          qr = rCopyNewCoeff(currRing, gcd, 1, currRing->cf->type);
-          //printf("\nAfter rCopyNewCoeff: \n");
-          //rWrite(qr);
-        }
-        mpz_clear(gcd);
-        //printf("\nAfter mpz_clear: \n");
-        //rWrite(qr);
-        mpz_clear(newConst);
-      }
-      else
-      {
-      // previously over Z, now over Z/m
-        mpz_t newConst;
-        mpz_init(newConst);
-        mpz_set_ui(newConst, currRing->cf->cfInt(p_GetCoeff(id->m[idPosConstant(id)], currRing),currRing->cf));
-        qr= rCopyNewCoeff( currRing, newConst, 1, n_Zn);
-        mpz_clear(newConst);
-      }
-  }    
+    }
   else
 #endif

libpolys/polys/monomials/ring.cc

@@ -1644 +1644 @@
   //omFreeSize(dummy, sizeof(mpz_t));
   return res;
+}
+
+ring updateQring(ring r, ideal id, int pos)
+{
+    ring qr;
+    // computing over Rings: handle constant generators of id properly
+      if(nCoeff_is_Ring_ModN(r->cf) || 
+         nCoeff_is_Ring_PtoM(r->cf) || 
+         nCoeff_is_Ring_2toM(r->cf))
+      {
+      // already computing mod modNumber: use gcd(modNumber,constant entry of id)
+        mpz_t gcd;
+        mpz_t newConst;
+        mpz_init(newConst);
+        mpz_set_ui(newConst, r->cf->cfInt(p_GetCoeff(id->m[pos], r),r->cf));
+        mpz_init(gcd);
+        mpz_gcd(gcd, r->cf->modNumber, newConst);
+        if(mpz_cmp_ui(gcd, 1) == 0)
+        {
+            WerrorS("constant in q-ideal is coprime to modulus in ground ring");
+            WerrorS("Unable to create qring!");
+            return NULL;
+        }
+        if(nCoeff_is_Ring_PtoM(r->cf) || 
+           nCoeff_is_Ring_2toM(r->cf))
+        {
+        // modNumber is prime power: set modExponent appropriately
+          int kNew = 1;
+          mpz_t baseTokNew;
+          mpz_init(baseTokNew);
+          mpz_set(baseTokNew, r->cf->modBase);
+          while(mpz_cmp(gcd, baseTokNew) > 0)
+          {
+            kNew++;
+            mpz_mul(baseTokNew, baseTokNew, r->cf->modBase);
+          }
+          //To Do: currently we stay in case Z/p^n even for n=1
+          //       for performance reasons passing to groundfield Z/p 
+          //       would be more suitable
+          qr = rCopyNewCoeff(r, r->cf->modBase, kNew, r->cf->type);
+          mpz_clear(baseTokNew);
+        }
+        else
+        {
+        // previously over modNumber, now over new modNumber
+          qr = rCopyNewCoeff(r, gcd, 1, r->cf->type);
+          //printf("\nAfter rCopyNewCoeff: \n");
+          //rWrite(qr);
+        }
+        mpz_clear(gcd);
+        //printf("\nAfter mpz_clear: \n");
+        //rWrite(qr);
+        mpz_clear(newConst);
+      }
+      else
+      {
+      // previously over Z, now over Z/m
+        mpz_t newConst;
+        mpz_init(newConst);
+        mpz_set_ui(newConst, r->cf->cfInt(p_GetCoeff(id->m[pos], r),r->cf));
+        qr= rCopyNewCoeff( r, newConst, 1, n_Zn);
+        mpz_clear(newConst);
+      }
+      return(qr);  
 }
 

libpolys/polys/monomials/ring.h

@@ -347 +347 @@
 ring   rCopy(ring r);
 ring   rCopyNewCoeff(ring r, mpz_t Base, int Exp, n_coeffType typ);
+ring   updateQring(ring r, ideal id, int pos);
 ring   rCopy0(const ring r, BOOLEAN copy_qideal = TRUE, BOOLEAN copy_ordering = TRUE);
 ring rCopy0AndAddA(ring r, int64vec *wv64, BOOLEAN copy_qideal = TRUE,