Changeset cfecd2 in git

Timestamp:

Aug 12, 2011, 5:09:01 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

94a065cc1eef470efefb950abf185f50c06ba20d

Parents:

a374b8bab94e13d254d807da4110c48b626fe5ab

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-12 17:09:01+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:22:43+01:00

Message:

add n_RePart and n_ImPart to coeffs.h

Files:

• Singular/iparith.cc (modified) (24 diffs)
• libpolys/coeffs/coeffs.h (modified) (2 diffs)

Singular/iparith.cc

@@ -3587 +3587 @@
   int dummy;
   poly p=(poly)v->Data();
-  if (p!=NULL) res->data = (char *)pLDeg(p,&dummy,currRing);
+  if (p!=NULL) res->data = (char *)currRing->pLDeg(p,&dummy,currRing);
   else res->data=(char *)-1;
   return FALSE;
@@ -3598 +3598 @@
   int i;
   for(i=IDELEMS(I)-1;i>=0;i--)
-    if (I->m[i]!=NULL) d=si_max(d,(int)pLDeg(I->m[i],&dummy,currRing));
+    if (I->m[i]!=NULL) d=si_max(d,(int)currRing->pLDeg(I->m[i],&dummy,currRing));
   res->data = (char *)(long)d;
   return FALSE;
@@ -3610 +3610 @@
     ring origR = currRing;
     ring tempR = rCopy(origR);
-    tempR->ringtype = 0; tempR->ch = 0;
+    coeffs new_cf=nInitChar(n_Q,NULL);
+    nKillChar(tempR->cf);
+    tempR->cf=new_cf;
     rComplete(tempR);
     ideal vid = (ideal)v->Data();
@@ -3660 +3662 @@
   }
   else
-    p=singclap_det(m);
+    p=singclap_det(m,currRing);
   res ->data = (char *)p;
   return FALSE;
@@ -3670 +3672 @@
   i=m->rows();j=m->cols();
   if(i==j)
-    res->data = (char *)(long)singclap_det_i(m);
+    res->data = (char *)(long)singclap_det_i(m,currRing);
   else
   {
@@ -3686 +3688 @@
   {
     matrix m=idModule2Matrix(idCopy(I));
-    p=singclap_det(m);
+    p=singclap_det(m,currRing);
     idDelete((ideal *)&m);
   }
@@ -3703 +3705 @@
     ring origR = currRing;
     ring tempR = rCopy(origR);
-    tempR->ringtype = 0; tempR->ch = 0;
+    coeffs new_cf=nInitChar(n_Q,NULL);
+    nKillChar(tempR->cf);
+    tempR->cf=new_cf;
     rComplete(tempR);
     ideal vid = (ideal)v->Data();
     int i = idPosConstant(vid);
-    if ((i != -1) && (nIsUnit(pGetCoeff(vid->m[i]))))
+    if ((i != -1) && (n_IsUnit(pGetCoeff(vid->m[i]),currRing->cf)))
     { /* ideal v contains unit; dim = -1 */
       res->data = (char *)-1;
@@ -3811 +3815 @@
   intvec *v=NULL;
   singclap_factorize_retry=0;
-  ideal f=singclap_factorize((poly)(u->CopyD()), &v, 0);
+  ideal f=singclap_factorize((poly)(u->CopyD()), &v, 0,currRing);
   if (f==NULL) return TRUE;
   ivTest(v);
@@ -3853 +3857 @@
   int i;
   poly p=NULL,po=NULL;
-  int rk=idRankFreeModule(I);
+  int rk=id_RankFreeModule(I,currRing);
   if (w==NULL)
   {
@@ -3875 +3879 @@
     {
       // now po!=NULL, p!=NULL
-      int d=(pFDeg(po,currRing)-(*w)[pGetComp(po)-1] - pFDeg(p,currRing)+(*w)[i-1]);
+      int d=(currRing->pFDeg(po,currRing)-(*w)[pGetComp(po)-1] - currRing->pFDeg(p,currRing)+(*w)[i-1]);
       if (d==0)
         d=pLmCmp(po,p);
@@ -3899 +3903 @@
     ring origR = currRing;
     ring tempR = rCopy(origR);
-    tempR->ringtype = 0; tempR->ch = 0;
+    coeffs new_cf=nInitChar(n_Q,NULL);
+    nKillChar(tempR->cf);
+    tempR->cf=new_cf;
     rComplete(tempR);
     ideal vid = (ideal)v->Data();
@@ -4031 +4037 @@
 static BOOLEAN jjIMPART(leftv res, leftv v)
 {
-  res->data = (char *)nImPart((number)v->Data());
+  res->data = (char *)n_ImPart((number)v->Data(),currRing->cf);
   return FALSE;
 }
@@ -4192 +4198 @@
   else
   {
-#if !defined(OM_NDEBUG) && !defined(NDEBUG)
-    omCheckBin(rnumber_bin);
-#endif
-    number z=(number)omAllocBin(rnumber_bin);
+     struct snumber_dummy
+     {
+      mpz_t z;
+      mpz_t n;
+      #if defined(LDEBUG)
+      int debug;
+      #endif
+      BOOLEAN s;
+    };
+    typedef struct snumber_dummy  *number_dummy;
+ 
+    number_dummy z=(number)omAlloc(sizeof(snumber_dummy));
     #if defined(LDEBUG)
     z->debug=123456;
@@ -4201 +4215 @@
     z->s=3;
     mpz_init_set_si(z->z,d);
-    return z;
+    return (number)z;
   }
 }
@@ -4311 +4325 @@
 {
   number n,i; i=(number)v->Data();
-  if (rField_is_Zp(currRing))
-  {
-    n=n_Init(n_Int(i,currRing->cf),coeffs_BIGINT);
-  }
-  else if (rField_is_Q(currRing)) n=nlBigInt(i);
-#ifdef HAVE_RINGS
-  else if (rField_is_Ring_Z(currRing) || rField_is_Ring_ModN(currRing) || rField_is_Ring_PtoM(currRing)) n=nlMapGMP(i);
-  else if (rField_is_Ring_2toM(currRing)) n=n_Init((unsigned long) i,coeffs_BIGINT);
-#endif
+  nMapFunc nMap=n_SetMap(currRing->cf,coeffs_BIGINT);
+  if (nMap!=NULL)
+    n=nMap(i,currRing->cf,coeffs_BIGINT);
   else goto err;
   res->data=(void *)n;
@@ -4352 +4360 @@
 {
   poly p=(poly)v->Data();
-  res->data=(char *)( p==NULL ? -1 : pFDeg(p,currRing) );
+  res->data=(char *)( p==NULL ? -1 : currRing->pFDeg(p,currRing) );
   return FALSE;
 }
@@ -4405 +4413 @@
   number i=pGetCoeff(p);
   number n;
-  if (rField_is_Zp())
-  {
-    n=n_Init(npInt(i,currRing), coeffs_BIGINT);
-  }
-  else if (rField_is_Q(currRing)) n=nlBigInt(i);
-#ifdef HAVE_RINGS
-  else if (rField_is_Ring_Z() || rField_is_Ring_ModN() || rField_is_Ring_PtoM())
-    n=nlMapGMP(i);
-  else if (rField_is_Ring_2toM())
-    n=n_Init((unsigned long) i, coeffs_BIGINT);
-#endif
+  nMapFunc nMap=n_SetMap(currRing->cf,coeffs_BIGINT);
+  if (nMap!=NULL)
+    n=nMap(i,currRing->cf,coeffs_BIGINT);
   else goto err;
   res->data=(void *)n;
@@ -4521 +4521 @@
 static BOOLEAN jjREPART(leftv res, leftv v)
 {
-  res->data = (char *)nRePart((number)v->Data());
+  res->data = (char *)n_RePart((number)v->Data(),currRing->cf);
   return FALSE;
 }
@@ -4628 +4628 @@
   intvec *v=NULL;
   singclap_factorize_retry=0;
-  ideal f=singclap_sqrfree((poly)(u->CopyD()));
+  ideal f=singclap_sqrfree((poly)(u->CopyD()),currRing);
   if (f==NULL)
     return TRUE;
@@ -5114 +5114 @@
 {
   number n=(number)u->Data();
-  res->data=(char *)(long)n_Int(n,currRing);
+  res->data=(char *)(long)n_Int(n,currRing->cf);
   return FALSE;
 }
@@ -5496 +5496 @@
     ring origR = currRing;
     ring tempR = rCopy(origR);
-    tempR->ringtype = 0; tempR->ch = 0;
+    coeffs new_cf=nInitChar(n_Q,NULL);
+    nKillChar(tempR->cf);
+    tempR->cf=new_cf;
     rComplete(tempR);
     ideal uid = (ideal)u->Data();
@@ -5601 +5603 @@
 static BOOLEAN jjJET_P_IV(leftv res, leftv u, leftv v, leftv w)
 {
-  short *iw=iv2array((intvec *)w->Data());
+  short *iw=iv2array((intvec *)w->Data(),currRing);
   res->data = (char *)ppJetW((poly)u->Data(),(int)(long)v->Data(),iw);
   omFreeSize((ADDRESS)iw,(currRing->N+1)*sizeof(short));
@@ -5636 +5638 @@
 {
   /* true for fields and Z, false otherwise */
-  if (rField_is_Ring_PtoM()) return FALSE;
-  if (rField_is_Ring_2toM()) return FALSE;
-  if (rField_is_Ring_ModN()) return FALSE;
+  if (rField_is_Ring_PtoM(currRing)) return FALSE;
+  if (rField_is_Ring_2toM(currRing)) return FALSE;
+  if (rField_is_Ring_ModN(currRing)) return FALSE;
   return TRUE;
 }
@@ -5965 +5967 @@
       assume(currRing->extRing!=NULL);
       lnumber n=(lnumber)pGetCoeff(p);
-      ringvar=-p_Var(n->z,currRing->extRing);
+      ringvar=-p_Var(n->z,currRing->cf->extRing);
     }
     if(ringvar==0)

libpolys/coeffs/coeffs.h

@@ -601 +601 @@
 }
 
+static inline number  n_RePart(number i, const coeffs cf)
+{
+  assume(cf != NULL); assume(cf->cfRePart!=NULL); 
+  return cf->cfRePart(i,cf);
+}
+static inline number  n_ImPart(number i, const coeffs cf)
+{
+  assume(cf != NULL); assume(cf->cfImPart!=NULL); 
+  return cf->cfImpart(i,cf);
+}
+
 /// returns TRUE, if r is not a field and r has non-trivial units
 static inline BOOLEAN nCoeff_has_Units(const coeffs r)
@@ -702 +713 @@
 
 // Missing wrappers for: (TODO: review this?)
-// cfIntMod, cfRePart, cfImPart, cfRead, cfName, cfInit_bigint
+// cfIntMod, cfRead, cfName, cfInit_bigint
 // HAVE_RINGS: cfDivComp, cfExtGcd...