Changeset d0a51ee in git

Timestamp:

May 5, 2010, 4:42:53 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

371bc5f2b1adfa76d36a0242eb9c7d7cb44b9b92

Parents:

3510a61a2a6264c7487502f0c82c410e2f92369f

git-author:

Martin Lee <martinlee84@web.de>2010-05-05 16:42:53+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:51:40+01:00

Message:

more changes to ffields.cc and coeffs.h

Location:

coeffs

Files:

• coeffs.h (modified) (1 diff)
• ffields.cc (modified) (10 diffs)

coeffs/coeffs.h

@@ -154 +154 @@
   short      float_len; /* additional char-flags, rInit */
   short      float_len2; /* additional char-flags, rInit */
+
+  BOOLEAN   ShortOut; /// ffields need this. 
+
 };
 

coeffs/ffields.cc

@@ -14 +14 @@
 #include "numbers.h"
 #include "ffields.h"
+
+
+typedef void* ADDRESS;
+
+#define MAX_INT_LEN 11
 
 int nfCharQ=0;  /* the number of elemts: q*/
@@ -106 +111 @@
         s-=l;
         Werror("`%s` greater than %d(max. integer representation)",
-                s,MAX_INT_VAL);
+                s,INT_MAX);
         return s;
       }
@@ -484 +489 @@
       *i *= 10;
       *i += *s++ - '0';
-      if (*i > (MAX_INT_VAL / 10)) *i = *i % nfCharP;
+      if (*i > (INT_MAX / 10)) *i = *i % nfCharP;
     }
     while (*s >= '0' && *s <= '9');
@@ -564 +569 @@
 int nfMinPoly[16];
 
-void nfShowMipo()
+void nfShowMipo(const coeffs r)
 {
   int i=nfMinPoly[0];
@@ -572 +577 @@
     j++;
     if (nfMinPoly[j]!=0)
-      StringAppend("%d*%s^%d",nfMinPoly[j],currRing->parameter[0],i);
+      StringAppend("%d*%s^%d",nfMinPoly[j],r->parameter[0],i);
     i--;
     if(i<0) break;
@@ -692 +697 @@
 * map Z/p -> GF(p,n)
 */
-number nfMapP(number c)
-{
-  return nfInit((int)((long)c), currRing);
+number nfMapP(number c, const coeffs src, const coeffs dst)
+{
+  return nfInit((int)((long)c), dst);
 }
 
@@ -701 +706 @@
 */
 int nfMapGG_factor;
-number nfMapGG(number c)
+number nfMapGG(number c, const coeffs src, const coeffs dst)
 {
   int i=(long)c;
@@ -711 +716 @@
 * map GF(p,n1) -> GF(p,n2), n1 > n2, n2 | n1
 */
-number nfMapGGrev(number c)
+number nfMapGGrev(number c, const coeffs src, const coeffs dst)
 {
   int ex=(int)((long)c);
@@ -723 +728 @@
 * set map function nMap ... -> GF(p,n)
 */
-nMapFunc nfSetMap(const ring src, const ring dst)
+nMapFunc nfSetMap(const coeffs r, const coeffs src, const coeffs dst)
 {
   if (nField_is_GF(src,nfCharQ))
   {
-    return ndCopy;   /* GF(p,n) -> GF(p,n) */
+    return ndCopyMap;   /* GF(p,n) -> GF(p,n) */
   }
   if (nField_is_GF(src))
@@ -744 +749 @@
       if ((n2 % n1)==0)
       {
-        int save_ch=currRing->ch;
-        char **save_par=currRing->parameter;
+        int save_ch=r->ch;
+        char **save_par=r->parameter;
         nfSetChar(src->ch,src->parameter);
         int nn=nfPlus1Table[0];