Changeset 3510a6 in git

Timestamp:

May 5, 2010, 4:02:31 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

d0a51ee4394b5f223004bd691b3fd91403cea0a1

Parents:

dc093ce0cffbd8b24b4eb47a678f5b0d90e52231

git-author:

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

git-committer:

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

Message:

initial changes to ffields.cc and ffields.h (not completed yet)

Location:

coeffs

Files:

• ffields.cc (modified) (30 diffs)
• ffields.h (modified) (1 diff)

coeffs/ffields.cc

@@ -8 +8 @@
 
 #include <string.h>
-#include <kernel/mod2.h>
-#include <omalloc/mylimits.h>
-#include <kernel/febase.h>
-#include <omalloc/omalloc.h>
-#include <kernel/numbers.h>
-#include <kernel/ring.h>
-#include <kernel/ffields.h>
+#include "coeffs.h"
+#include <mylimits.h>
+#include <output.h>
+#include <omalloc.h>
+#include "numbers.h"
+#include "ffields.h"
 
 int nfCharQ=0;  /* the number of elemts: q*/
@@ -91 +90 @@
   0 };
 
+const char* eati(const char *s, int *i)
+{
+  int l=0;
+
+  if    (*s >= '0' && *s <= '9')
+  {
+    *i = 0;
+    while (*s >= '0' && *s <= '9')
+    {
+      *i *= 10;
+      *i += *s++ - '0';
+      l++;
+      if ((l>=MAX_INT_LEN)||((*i) <0))
+      {
+        s-=l;
+        Werror("`%s` greater than %d(max. integer representation)",
+                s,MAX_INT_VAL);
+        return s;
+      }
+    }
+  }
+  else *i = 1;
+  return s;
+}
+
 /*1
 * numbers in GF(p^n):
@@ -127 +151 @@
 * k >= 0 ?
 */
-BOOLEAN nfGreaterZero (number k)
+BOOLEAN nfGreaterZero (number k, const coeffs r)
 {
 #ifdef LDEBUG
   nfTest(k);
 #endif
-  return !nfIsZero(k) && !nfIsMOne(k);
+  return !nfIsZero(k, r) && !nfIsMOne(k, r);
 }
 
@@ -138 +162 @@
 * a*b
 */
-number nfMult (number a,number b)
+number nfMult (number a,number b, const coeffs r)
 {
 #ifdef LDEBUG
@@ -158 +182 @@
 * int -> number
 */
-number nfInit (int i, const ring r)
+number nfInit (int i, const coeffs r)
 {
   // Hmm .. this is just to prevent initialization
@@ -181 +205 @@
 * the generating element `z`
 */
-number nfPar (int i)
+number nfPar (int i, const coeffs r)
 {
   return (number)1;
@@ -189 +213 @@
 * the degree of the "alg. number"
 */
-int nfParDeg(number n)
+int nfParDeg(number n, const coeffs r)
 {
 #ifdef LDEBUG
@@ -201 +225 @@
 * number -> int
 */
-int nfInt (number &n, const ring r)
+int nfInt (number &n, const coeffs r)
 {
   return 0;
@@ -209 +233 @@
 * a + b
 */
-number nfAdd (number a, number b)
+number nfAdd (number a, number b, const coeffs R)
 {
 /*4 z^a+z^b=z^b*(z^(a-b)+1), if a>=b; *
@@ -248 +272 @@
 * a - b
 */
-number nfSub (number a, number b)
-{
-  number mb = nfNeg(b);
-  return nfAdd(a,mb);
+number nfSub (number a, number b, const coeffs r)
+{
+  number mb = nfNeg(b, r);
+  return nfAdd(a,mb,r);
 }
 
@@ -257 +281 @@
 * a == 0 ?
 */
-BOOLEAN nfIsZero (number  a)
+BOOLEAN nfIsZero (number  a, const coeffs r)
 {
 #ifdef LDEBUG
@@ -268 +292 @@
 * a == 1 ?
 */
-BOOLEAN nfIsOne (number a)
+BOOLEAN nfIsOne (number a, const coeffs r)
 {
 #ifdef LDEBUG
@@ -279 +303 @@
 * a == -1 ?
 */
-BOOLEAN nfIsMOne (number a)
+BOOLEAN nfIsMOne (number a, const coeffs r)
 {
 #ifdef LDEBUG
@@ -291 +315 @@
 * a / b
 */
-number nfDiv (number a,number b)
+number nfDiv (number a,number b, const coeffs r)
 {
 #ifdef LDEBUG
@@ -319 +343 @@
 * 1 / c
 */
-number  nfInvers (number c)
+number  nfInvers (number c, const coeffs r)
 {
 #ifdef LDEBUG
@@ -338 +362 @@
 * -c
 */
-number nfNeg (number c)
+number nfNeg (number c, const coeffs r)
 {
 /*4 -z^c=z^c*(-1)=z^c*nfM1*/
@@ -356 +380 @@
 * a > b ?
 */
-BOOLEAN nfGreater (number a,number b)
+BOOLEAN nfGreater (number a,number b, const coeffs r)
 {
 #ifdef LDEBUG
@@ -368 +392 @@
 * a == b ?
 */
-BOOLEAN nfEqual (number a,number b)
+BOOLEAN nfEqual (number a,number b, const coeffs r)
 {
 #ifdef LDEBUG
@@ -380 +404 @@
 * write via StringAppend
 */
-void nfWrite (number &a, const ring r)
+void nfWrite (number &a, const coeffs r)
 {
 #ifdef LDEBUG
@@ -387 +411 @@
   if ((long)a==(long)nfCharQ)  StringAppendS("0");
   else if ((long)a==0L)   StringAppendS("1");
-  else if (nfIsMOne(a))   StringAppendS("-1");
+  else if (nfIsMOne(a, r))   StringAppendS("-1");
   else
   {
@@ -402 +426 @@
 *
 */
-char * nfName(number a)
+char * nfName(number a, const coeffs r)
 {
 #ifdef LDEBUG
@@ -408 +432 @@
 #endif
   char *s;
-  char *nfParameter=currRing->parameter[0];
+  char *nfParameter=r->parameter[0];
   if (((long)a==(long)nfCharQ) || ((long)a==0L)) return NULL;
   else if ((long)a==1L)
@@ -424 +448 @@
 * c ^ i with i>=0
 */
-void nfPower (number a, int i, number * result)
+void nfPower (number a, int i, number * result, const coeffs r)
 {
 #ifdef LDEBUG
@@ -440 +464 @@
   else
   {
-    nfPower(a,i-1,result);
-    *result = nfMult(a,*result);
+    nfPower(a,i-1,result, r);
+    *result = nfMult(a,*result, r);
   }
 #ifdef LDEBUG
@@ -472 +496 @@
 * read a number
 */
-const char * nfRead (const char *s, number *a)
+const char * nfRead (const char *s, number *a, const coeffs r)
 {
   int i;
@@ -479 +503 @@
 
   s = nfEati(s, &i);
-  z=nfInit(i, currRing);
+  z=nfInit(i, r);
   *a=z;
   if (*s == '/')
@@ -485 +509 @@
     s++;
     s = nfEati(s, &i);
-    n=nfInit(i, currRing);
-    *a = nfDiv(z,n);
-  }
-  char *nfParameter=currRing->parameter[0];
+    n=nfInit(i, r);
+    *a = nfDiv(z,n,r);
+  }
+  char *nfParameter=r->parameter[0];
   if (strncmp(s,nfParameter,strlen(nfParameter))==0)
   {
@@ -500 +524 @@
       i=1;
     z=(number)(long)i;
-    *a=nfMult(*a,z);
+    *a=nfMult(*a,z,r);
   }
 #ifdef LDEBUG
@@ -701 +725 @@
 nMapFunc nfSetMap(const ring src, const ring dst)
 {
-  if (rField_is_GF(src,nfCharQ))
+  if (nField_is_GF(src,nfCharQ))
   {
     return ndCopy;   /* GF(p,n) -> GF(p,n) */
   }
-  if (rField_is_GF(src))
+  if (nField_is_GF(src))
   {
     int q=src->ch;
@@ -738 +762 @@
     }
   }
-  if (rField_is_Zp(src,nfCharP))
+  if (nField_is_Zp(src,nfCharP))
   {
     return nfMapP;    /* Z/p -> GF(p,n) */

coeffs/ffields.h

@@ -10 +10 @@
 #include "coeffs.h"
 
+// #define MAX_INT_VAL 0x7fffffff
 
 BOOLEAN nfGreaterZero (number k, const coeffs r);