Changeset 8c6ae50 in git

Timestamp:

Aug 12, 2011, 7:27:49 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

3373e328c65970d120c33a699dee0a561bb7b0d2

Parents:

d1433769dfd20e9bf7a4179195d41d4095c91fc7

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-12 19:27:49+02:00

git-committer:

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

Message:

fix iparith.cc

File:

• Singular/iparith.cc (modified) (5 diffs)

Singular/iparith.cc

@@ -3582 +3582 @@
   int elems=-1;
   if (rField_is_Zp(r)||rField_is_GF(r)) elems=r->cf->ch;
-  else if (rField_is_Zp_a(r) && (r->minpoly!=NULL))
+  else if (rField_is_Zp_a(r) && (r->cf->type==n_algExt))
   {
 #ifdef HAVE_FACTORY
     extern int ipower ( int b, int n ); /* factory/cf_util */
-    elems=ipower(r->cf->ch,naParDeg(r->minpoly));
+    elems=ipower(r->cf->ch,r->cf->extRing->pFDeg(r->cf->extRing->qideal->m[0],r->cf->extRing));
 #else
-    elems=(int)pow((double) r->cf->ch,(double)naParDeg(r->minpoly));
+    elems=(int)pow((double) r->cf->ch,(double)r->cf->extRing->pFDeg(r->cf->extRing->qideal->m[0],r->cf->extRing));
 #endif
   }
@@ -4381 +4381 @@
   if ((0<i) && (i<=p))
   {
-    res->data=(char *)nPar(i);
+    res->data=(char *)n_Param(i,currRing);
   }
   else
@@ -4392 +4392 @@
 static BOOLEAN jjPARDEG(leftv res, leftv v)
 {
-  res->data = (char *)(long)nParDeg((number)v->Data());
+  if (rField_is_Extension(currRing))
+  {
+    res->data = (char *)(long)currRing->cf->extRing->pFDeg(
+        currRing->cf->extRing->qideal->m[0],
+        currRing->cf->extRing);
+  }
+  else
+    res->data = (char *)0L;
   return FALSE;
 }
@@ -5928 +5935 @@
     WarnS("preimage in local qring may be wrong: use Ring::preimageLoc instead");
   }
-  res->data=(char *)maGetPreimage(rr,mapping,image);
+  res->data=(char *)maGetPreimage(rr,mapping,image,currRing);
   if (kernel_cmd) idDelete(&image);
   return (res->data==NULL/* is of type ideal, should not be NULL*/);
@@ -6335 +6342 @@
   idDelete((ideal *)&(c->data.uideal));
   idDelete((ideal *)&(m->data.uideal));
-  mpCoef2((poly)v->Data(),(poly)v->next->Data(),
-    (matrix *)&(c->data.umatrix),(matrix *)&(m->data.umatrix));
+  mp_Coef2((poly)v->Data(),(poly)v->next->Data(),
+    (matrix *)&(c->data.umatrix),(matrix *)&(m->data.umatrix),currRing);
   return FALSE;
 }