Changeset 2336d0 in git

Timestamp:

May 5, 2010, 3:32:25 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

afdd5549fb47d9704dd9bc0d475fe4fb12126213

Parents:

8c484ed8f3ff767d800560901766fe5a4d8eccda

git-author:

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

git-committer:

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

Message:

cfSetChar for Z/p

Location:

coeffs

Files:

• coeffs.h (modified) (2 diffs)
• modulop.cc (modified) (2 diffs)
• modulop.h (modified) (2 diffs)
• numbers.cc (modified) (3 diffs)

coeffs/coeffs.h

@@ -131 +131 @@
    void (*cfKillChar)(coeffs r); //  undo all initialisations
                                 // or NULL
-   void (*cfSetChar)(coeffs r); // initialisations after each ring change
+   void (*cfSetChar)(const coeffs r); // initialisations after each ring change
                                 // or NULL
    // general stuff
@@ -183 +183 @@
    /// Inline: a := b
    void    (*nInpMult)(number &a, number b, const coeffs r);
-   number  (*nInit_bigint)(number i, const coeffs r);
+   number  (*nInit_bigint)(number i, const coeffs src, const coeffs dummy);
 
 #ifdef LDEBUG

coeffs/modulop.cc

@@ -289 +289 @@
 */
 
-void npSetChar(int c, coeffs r)
-{
-
-//  if (c==npPrimeM) return;
-  if ((c>1) || (c<(-1)))
-  {
-    if (c>1) r->npPrimeM = c;
-    else     r->npPrimeM = -c;
-    r->npPminus1M = r->npPrimeM - 1;
-#ifdef NV_OPS
-    if (r->npPrimeM >NV_MAX_PRIME) return;
-#endif
+void npSetChar(const coeffs r)
+{
 #if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
     npGen = npExpTable[1];
 #endif
-  }
 }
 
@@ -373 +362 @@
     }
     r->cfKillChar=npKillChar;
+    r->cfSetChar=npSetChar;
+    npSetChar(r);
     r->cfSetChar=NULL;
     r->cfInit = npInit;
+    r->nInit_bigint=npMap0;
     r->n_Int  = npInt;
     r->nAdd   = npAdd;

coeffs/modulop.h

@@ -23 +23 @@
 
 extern int npGen;
-extern long npMapPrime;
 
 void npInitChar(coeffs r, int ch);
@@ -50 +49 @@
 #define npTest(A,r)     (0)
 #endif
-void    npSetChar(int c, coeffs r);
-void    npInitChar(int c, coeffs r);
 
 //int     npGetChar();
 
 nMapFunc npSetMap(const coeffs src, const coeffs dst);
-number  npMapP(number from, const coeffs r);
-number  npMap0(number from, const coeffs r);
+number  npMapP(number from, const coeffs src, const coeffs r);
+number  npMap0(number from, const coeffs src, const coeffs r);
 /*-------specials for spolys, do NOT use otherwise--------------------------*/
 /* for npMultM, npSubM, npNegM, npEqualM : */

coeffs/numbers.cc

@@ -115 +115 @@
     r->nInit_bigint=nl_Copy;
   }
+  #if 0 /* vertagt*/
   /*--------------------- Q_a/ Zp_a -----------------*/
   else if (nField_is_Extension(r))
@@ -131 +132 @@
     }
   }
+  #endif
 #ifdef HAVE_RINGS
   /*----------------------ring Z / 2^m----------------*/
@@ -161 +163 @@
   {
     npSetChar(c, r);
-    r->nInit_bigint=npMap0;
   }
   /* -------------- GF(p^m) -----------------------*/