Changeset 8ca38a7 in git

Timestamp:

Mar 10, 2014, 5:32:27 PM (10 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

8f47949874e10c5d14cca8f14dd3bb2c3fe95b05

Parents:

ab8e53db4813d82dce3f72da11ab590ecce8a4e7

git-author:

Adi Popescu <adi_popescum@yahoo.de>2014-03-10 17:32:27+01:00

git-committer:

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

Message:

Added qrings feature for constant in ideal

Files:

• Singular/ipassign.cc (modified) (7 diffs)
• Tst/New.lst (modified) (1 diff)
• Tst/New/bug_std_qring_559.res.gz.uu (added)
• Tst/New/bug_std_qring_559.stat (added)
• Tst/New/bug_std_qring_559.tst (added)
• Tst/New/qring_2tom.res.gz.uu (added)
• Tst/New/qring_2tom.stat (added)
• Tst/New/qring_2tom.tst (added)
• Tst/New/qring_ZmtoZmn.res.gz.uu (added)
• Tst/New/qring_ZmtoZmn.stat (added)
• Tst/New/qring_ZmtoZmn.tst (added)
• Tst/New/qring_ZmtoZmn_errorCoprime.res.gz.uu (added)
• Tst/New/qring_ZmtoZmn_errorCoprime.stat (added)
• Tst/New/qring_ZmtoZmn_errorCoprime.tst (added)
• Tst/New/qring_ZtoZm.res.gz.uu (added)
• Tst/New/qring_ZtoZm.stat (added)
• Tst/New/qring_ZtoZm.tst (added)
• Tst/New/qring_ntom.res.gz.uu (added)
• Tst/New/qring_ntom.stat (added)
• Tst/New/qring_ntom.tst (added)
• libpolys/coeffs/rmodulo2m.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

Singular/ipassign.cc

@@ -36 +36 @@
 #include <polys/nc/nc.h>
 #include <polys/nc/sca.h>
+#include <polys/prCopy.h>
 
 #include <kernel/polys.h>
@@ -738 +739 @@
   }
 
-  ring qr;
+  ring qr,origr;
   //qr=(ring)res->Data();
   //if (qr!=NULL) omFreeBin((ADDRESS)qr, ip_sring_bin);
   assume(res->Data()==NULL);
-  qr=rCopy(currRing);
-                 // we have to fill it, but the copy also allocates space
-  idhdl h=(idhdl)res->data; // we have res->rtyp==IDHDL
-  IDRING(h)=qr;
-
+  origr = rCopy(currRing);
+
+#ifdef HAVE_RINGS
   ideal id=(ideal)a->CopyD(IDEAL_CMD);
-
-  if ((idElem(id)>1) || rIsSCA(currRing) || (currRing->qideal!=NULL))
-    assumeStdFlag(a);
-
-#ifdef HAVE_RINGS
-  if (rField_is_Ring(currRing))
+  if((rField_is_Ring(currRing)) && (idPosConstant(id) != -1))
   {
 // computing over Rings: handle constant generators of id properly
-    if (idPosConstant(id) != -1)
-    {
-      mpz_t gcd;
       if(nCoeff_is_Ring_ModN(currRing->cf) || 
          nCoeff_is_Ring_PtoM(currRing->cf) || 
@@ -764 +755 @@
       {
       // already computing mod modNumber: use gcd(modNumber,constant entry of id)
+        mpz_t gcd;
         mpz_t newConst;
         mpz_init(newConst);
@@ -788 +780 @@
             mpz_mul(baseTokNew, baseTokNew, currRing->cf->modBase);
           }
-          currRing->cf->modExponent = kNew;
-          mpz_set(currRing->cf->modNumber, gcd);
-          mpz_sub_ui(baseTokNew, baseTokNew, 1);
-          mpz_t dummy;
-          mpz_init(dummy);
-          mpz_set_si(dummy, sizeof(unsigned long));
-          printf("\nmod2mMask = %i \n", currRing->cf->mod2mMask);
-          #if 0
-          if(nCoeff_is_Ring_2toM(currRing->cf))
-          {
-          // handle shortcut for 2^m appropriately
-            if(mpz_cmp(dummy, baseTokNew) > 0)
-            {
-              idPrint(id);
-              currRing->cf->mod2mMask = mpz_get_ui(baseTokNew);
-              idPrint(id);
-            }
-          }
-          #endif
-          mpz_clear(dummy);
+          qr = rCopyNewCoeff(currRing, currRing->cf->modBase, kNew, currRing->cf->type);
           mpz_clear(baseTokNew);
         }
@@ -813 +786 @@
         {
         // previously over modNumber, now over new modNumber
-          mpz_set(currRing->cf->modBase, gcd);
-          mpz_set(currRing->cf->modNumber, gcd);
-        }
-        currRing->cf->ch = mpz_get_ui(gcd);
+          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);
       }
@@ -825 +800 @@
         mpz_t newConst;
         mpz_init(newConst);
-        mpz_set_ui(newConst, currRing->cf->cfInt(p_GetCoeff(id->m[idPosConstant(id)], currRing), currRing->cf));
-        currRing->cf->modExponent = 1;
-        mpz_set(currRing->cf->modBase, newConst);
-        mpz_set(currRing->cf->modNumber, newConst);
-        currRing->cf->ch = mpz_get_ui(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);
-        currRing->cf->type = n_Zn;
-      }
-    }
-  }
+      }
+  }    
+  else
 #endif
-  
+    qr=rCopy(currRing);
+    
+                 // we have to fill it, but the copy also allocates space
+  idhdl h=(idhdl)res->data; // we have res->rtyp==IDHDL
+  IDRING(h)=qr;
+  ideal qid;
+  //rWrite(qr);
+  //printf("\norigr\n");
+  //rWrite(origr);
+  //  printf("\nqr\n");
+  //rWrite(qr);
+  //  printf("\ncurrRing\n");
+  //rWrite(currRing);
+#ifdef HAVE_RINGS
+  if((rField_is_Ring(currRing)) && (idPosConstant(id) != -1))
+    {
+      //rChangeCurrRing(qr);
+      //rWrite(qr);
+      int *perm=NULL;
+      int i;
+      perm=(int *)omAlloc0((qr->N+1)*sizeof(int));
+      for(i=qr->N;i>0;i--) 
+      {
+        perm[i]=i;
+      }
+      nMapFunc nMap = NULL;
+      nMap = n_SetMap(origr->cf, qr->cf);
+      
+      qid = idInit(IDELEMS(id),1);
+      for(i = 0; i<IDELEMS(id); i++)
+      {
+        qid->m[i] = p_PermPoly(id->m[i], perm, origr, qr, nMap, NULL, 0);
+        
+      }
+    }
+    else
+#endif
+      qid = idrCopyR(id,currRing,qr);
+  idSkipZeroes(qid);
+  //idPrint(qid);
+  if ((idElem(qid)>1) || rIsSCA(currRing) || (currRing->qideal!=NULL))
+    assumeStdFlag(a);
+
   if (currRing->qideal!=NULL) /* we are already in a qring! */
   {
-    ideal tmp=idSimpleAdd(id,currRing->qideal);
+    ideal tmp=idSimpleAdd(qid,currRing->qideal);
     // both ideals should be GB, so dSimpleAdd is sufficient
-    idDelete(&id);
-    id=tmp;
+    idDelete(&qid);
+    qid=tmp;
     // delete the qr copy of quotient ideal!!!
     idDelete(&qr->qideal);
   }
-  if (idElem(id)==0)
+  if (idElem(qid)==0)
   {
     qr->qideal = NULL;
-    id_Delete(&id,currRing);
+    id_Delete(&qid,currRing);
     IDTYP(h)=RING_CMD;
   }
   else
-    qr->qideal = id;
+    qr->qideal = qid;
 
   // qr is a copy of currRing with the new qideal!
@@ -870 +883 @@
   }
   #endif
+  //rWrite(qr);
   rSetHdl((idhdl)res->data);
   return FALSE;

Tst/New.lst

@@ -44 +44 @@
 New/bug_541_interred.tst
 New/mstd_integer.tst
+New/bug_std_qring_559.tst
+New/qring_with_constant.tst
+New/qring_2tom.tst
+New/qring_ntom.tst
+New/qring_ZmtoZmn.tst
+New/qring_ZmtoZmn_errorCoprime.tst
+New/qring_ZtoZm.tst

libpolys/coeffs/rmodulo2m.cc

@@ -563 +563 @@
 }
 
+number nr2mMapProject(number from, const coeffs /*src*/, const coeffs dst)
+{
+  NATNUMBER i = ((NATNUMBER)from) % (dst->mod2mMask + 1);
+  return (number)i;
+}
+
 number nr2mMapZp(number from, const coeffs /*src*/, const coeffs dst)
 {
@@ -623 +629 @@
   { /* i.e. map an integer mod 2^s into Z mod 2^t, where t > s */
     // to be done
+    return nr2mMapProject;
   }
   if (nCoeff_is_Ring_Z(src))

libpolys/polys/monomials/ring.cc

@@ -22 +22 @@
 #include <coeffs/numbers.h>
 #include <coeffs/coeffs.h>
+#include <coeffs/rmodulon.h>
 
 #include <polys/monomials/p_polys.h>
@@ -1600 +1601 @@
 #endif
 
+  return res;
+}
+
+/*
+ * create a copy of the ring r, which must be equivalent to currRing
+ * used for qring definition, but allows change of coefficients to
+ * new modulus, e.g. Z to Z/m or Z/n to Z/gcd(m,n)
+ * otherwise identical to rCopy
+ */
+ring rCopyNewCoeff(ring r, mpz_t Base, int Exp, n_coeffType typ)
+{
+  if (r == NULL) return NULL;
+  ring res=rCopy0(r,FALSE,TRUE);
+  int_number dummy;
+  dummy = (int_number) omAlloc(sizeof(mpz_t));
+  mpz_init_set(dummy, Base);
+  ZnmInfo info;
+  info.base = dummy;
+  info.exp = (unsigned long) Exp;
+  nKillChar(res->cf);
+  coeffs cf;
+  if(typ == n_Zn)
+  {
+    cf = nInitChar(n_Zn,(void*) &info);
+  }
+  if(typ == n_Znm)
+  {
+    cf = nInitChar(n_Znm,(void*) &info);
+  }
+  if(typ == n_Z2m)
+  {
+    cf = nInitChar(n_Z2m,(void*)(long)Exp);
+  }
+  res->cf = cf;
+  rComplete(res, 1); // res is purely commutative so far
+  if (r->qideal!=NULL) res->qideal=idrCopyR_NoSort(r->qideal, r, res);
+
+#ifdef HAVE_PLURAL
+  if (rIsPluralRing(r))
+    if( nc_rCopy(res, r, true) ) {}
+#endif
+  //omFreeSize(dummy, sizeof(mpz_t));
   return res;
 }

libpolys/polys/monomials/ring.h

@@ -346 +346 @@
 void   rWrite(ring r, BOOLEAN details = FALSE);
 ring   rCopy(ring r);
+ring   rCopyNewCoeff(ring r, mpz_t Base, int Exp, n_coeffType typ);
 ring   rCopy0(const ring r, BOOLEAN copy_qideal = TRUE, BOOLEAN copy_ordering = TRUE);
 ring rCopy0AndAddA(ring r, int64vec *wv64, BOOLEAN copy_qideal = TRUE,