Changeset afdd55 in git

Timestamp:

May 5, 2010, 3:43:04 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

81bff55bd91793d5286706a40319145c80986141

Parents:

2336d0a674d92415a0e20e0b4abf6b1a96ab56e2

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-05-05 15:43:04+02:00

git-committer:

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

Message:

nField_is -> getCoeffType

Files:

• .gitignore (modified) (1 diff)
• coeffs/coeffs.h (modified) (1 diff)
• coeffs/modulop.cc (modified) (1 diff)
• coeffs/numbers.cc (modified) (9 diffs)
• coeffs/numbers.h (modified) (2 diffs)

.gitignore

@@ -6 +6 @@
 *.exe
 depend
+tags
 Makefile
 GNUMakefile

coeffs/coeffs.h

@@ -110 +110 @@
 
    coeffs next;
-   n_coeffType fieldtype;
    unsigned int  ringtype;  /* 0 => coefficient field, 1 => coeffs from Z/2^m */
 

coeffs/modulop.cc

@@ -361 +361 @@
 #endif
     }
+    r->type=n_Zp;
+    r->cfInitChar=npInitChar;
     r->cfKillChar=npKillChar;
     r->cfSetChar=npSetChar;
     npSetChar(r);
-    r->cfSetChar=NULL;
     r->cfInit = npInit;
     r->nInit_bigint=npMap0;

coeffs/numbers.cc

@@ -266 +266 @@
   n->nGetUnit = (nMapFunc)NULL;
 #endif
+  #if 0 /*vertagt*/
   if (nField_is_Extension(r))
   {
@@ -305 +306 @@
 #endif
   }
+  #endif
 #ifdef HAVE_RINGS
   /* -------------- Z/2^m ----------------------- */
@@ -321 +323 @@
      n->cfInit  = nrzInit;
      n->cfDelete= nrzDelete;
-     n->nCopy  = nrzCopy;
+     n->cfCopy  = nrzCopy;
      n->cfCopy = cfrzCopy;
      n->nSize  = nrzSize;
@@ -374 +376 @@
     n->nNeg   = nlNeg;
     n->nInvers= nlInvers;
-    n->nCopy  = nlCopy;
+    n->cfCopy  = nlCopy;
     n->nGreater = nlGreater;
     n->nEqual = nlEqual;
@@ -454 +456 @@
     n->nNeg   = nfNeg;
     n->nInvers= nfInvers;
-    n->nCopy  = ndCopy;
+    n->cfCopy  = ndCopy;
     n->nGreater = nfGreater;
     n->nEqual = nfEqual;
@@ -484 +486 @@
     n->nNeg   = nrNeg;
     n->nInvers= nrInvers;
-    n->nCopy  = ndCopy;
+    n->cfCopy  = ndCopy;
     n->nGreater = nrGreater;
     n->nEqual = nrEqual;
@@ -514 +516 @@
     n->nNeg   = ngfNeg;
     n->nInvers= ngfInvers;
-    n->nCopy  = ngfCopy;
+    n->cfCopy  = ngfCopy;
     n->nGreater = ngfGreater;
     n->nEqual = ngfEqual;
@@ -545 +547 @@
     n->nNeg   = ngcNeg;
     n->nInvers= ngcInvers;
-    n->nCopy  = ngcCopy;
+    n->cfCopy  = ngcCopy;
     n->nGreater = ngcGreater;
     n->nEqual = ngcEqual;
@@ -571 +573 @@
 #endif
 #ifdef HAVE_RINGS
-  if (n->nGetUnit==(nMapFunc)NULL) n->nGetUnit=n->nCopy;
+  if (n->nGetUnit==(nMapFunc)NULL) n->nGetUnit=n->cfCopy;
 #endif
   if (!errorreported)

coeffs/numbers.h

@@ -118 +118 @@
 
 
-static inline n_coeffType nField_is(const coeffs r)
-{ return r->fieldtype; }
 static inline BOOLEAN nField_is_Zp(const coeffs r)
-{ return nField_is(r)==n_Zp; }
+{ return getCoeffType(r)==n_Zp; }
 
 static inline BOOLEAN nField_is_Zp(const coeffs r, int p)
-{ return (nField_is_Zp(r)  && (r->ch == ABS(p))); }
+{ return (getCoeffType(r)  && (r->ch == ABS(p))); }
 
 static inline BOOLEAN nField_is_Q(const coeffs r)
-{ return nField_is(r)==n_Q; }
+{ return getCoeffType(r)==n_Q; }
 
 static inline BOOLEAN nField_is_numeric(const coeffs r) /* R, long R, long C */
-{  return (nField_is(r)==n_R) || (nField_is(r)==n_long_R) || (nField_is(r)==n_long_C); }
+{  return (getCoeffType(r)==n_R) || (getCoeffType(r)==n_long_R) || (getCoeffType(r)==n_long_C); }
 
 static inline BOOLEAN nField_is_R(const coeffs r)
-{ return nField_is(r)==n_R; }
+{ return getCoeffType(r)==n_R; }
 
 static inline BOOLEAN nField_is_GF(const coeffs r)
-{ return nField_is(r)==n_GF; }
+{ return getCoeffType(r)==n_GF; }
 
 static inline BOOLEAN nField_is_GF(const coeffs r, int q)
-{ return (nField_is(r)==n_GF) && (r->ch == q); }
+{ return (getCoeffType(r)==n_GF) && (r->ch == q); }
 
 static inline BOOLEAN nField_is_Zp_a(const coeffs r)
@@ -151 +149 @@
 
 static inline BOOLEAN nField_is_long_R(const coeffs r)
-{ return nField_is(r)==n_long_R; }
+{ return getCoeffType(r)==n_long_R; }
 
 static inline BOOLEAN nField_is_long_C(const coeffs r)
-{ return nField_is(r)==n_long_C; }
+{ return getCoeffType(r)==n_long_C; }
 
 static inline BOOLEAN nField_has_simple_inverse(const coeffs r)