Changeset d2cf18 in git

Timestamp:

May 19, 2010, 2:16:14 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bcfa2000ff3ca226cf5d9db48e56d15b0857ffa3

Parents:

719c71a80093859b748e9f65da9029c763e2f8d6

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-05-19 14:16:14+02:00

git-committer:

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

Message:

nit for Zp

Location:

coeffs

Files:

• modulop.cc (modified) (2 diffs)
• numbers.cc (modified) (6 diffs)

coeffs/modulop.cc

@@ -312 +312 @@
 }
 
+static BOOLEAN npCoeffsEqual(const coeffs r, n_coeffType n, int parameter)
+{
+  /* test, if r is an instance of nInitCoeffs(n,parameter) */
+  return (n==n_Zp) && (r->ch==parameter);
+}
+
 void npInitChar(coeffs r, int c)
 {
   int i, w;
 
-  if ((c>1) || (c<(-1)))
-  {
-    if (c>1) r->npPrimeM = c;
-    else     r->npPrimeM = -c;
-    r->npPminus1M = r->npPrimeM - 1;
+  r->npPrimeM = c;
+  r->npPminus1M = c /*r->npPrimeM*/ - 1;
+
+  //r->cfInitChar=npInitChar;
+  r->cfKillChar=npKillChar;
+  r->cfSetChar=npSetChar;
+  r->nCoeffIsEqual=npCoeffsEqual;
+
+  r->nMult  = npMult;
+  r->nSub   = npSub;
+  r->nAdd   = npAdd;
+  r->nDiv   = npDiv;
+  r->nIntDiv= npDiv;
+  r->nIntMod= ndIntMod;
+  r->nExactDiv= npDiv;
+  r->cfInit = npInit;
+  r->nPar = ndPar;
+  r->nParDeg = ndParDeg;
+  r->nSize  = ndSize;
+  r->n_Int  = npInt;
+  #ifdef HAVE_RINGS
+  r->nDivComp = NULL; // only for ring stuff
+  r->nIsUnit = NULL; // only for ring stuff
+  r->nGetUnit = NULL; // only for ring stuff
+  r->nExtGcd = NULL; // only for ring stuff
+  #endif
+  r->nNeg   = npNeg;
+  r->nInvers= npInvers;
+  r->cfCopy  = ndCopy;
+  r->nRePart = ndCopy;
+  r->nImPart = ndReturn0;
+  r->cfWrite = npWrite;
+  r->nRead = npRead;
+  r->nNormalize=ndNormalize;
+  r->nGreater = npGreater;
+  #ifdef HAVE_RINGS
+  r->nDivBy = NULL; // only for ring stuff
+  #endif
+  r->nEqual = npEqual;
+  r->nIsZero = npIsZero;
+  r->nIsOne = npIsOne;
+  r->nIsMOne = npIsMOne;
+  r->nGreaterZero = npGreaterZero;
+  r->nPower = npPower;
+  r->cfGetDenom = ndGetDenom;
+  r->cfGetNumerator = ndGetNumerator;
+  r->nGcd  = ndGcd;
+  r->nLcm  = ndGcd;
+  r->cfDelete= ndDelete;
+  r->cfSetMap = npSetMap;
+  r->nName = ndName;
+  r->nInpMult=ndInpMult;
+  r->nInit_bigint= npMap0;
 #ifdef NV_OPS
-    if (r->npPrimeM <=NV_MAX_PRIME)
+  if (c>NV_MAX_PRIME)
+  {
+    r->nMult  = nvMult;
+    r->nDiv   = nvDiv;
+    r->nExactDiv= nvDiv;
+    r->nInvers= nvInvers;
+    r->nPower= nvPower;
+  }
+#endif
+#ifdef LDEBUG
+  // debug stuff
+  r->nDBTest=npDBTest;
+#endif
+  
+  // the variables:
+  r->nNULL = (number)0;
+  r->type = n_Zp;
+  r->ch = c;
+  r->has_simple_Alloc=TRUE;
+  r->has_simple_Inverse=TRUE;
+
+  // the tables
+#ifdef NV_OPS
+  if (r->npPrimeM <=NV_MAX_PRIME)
 #endif
     {
@@ -361 +438 @@
 #endif
     }
-    r->type=n_Zp;
-    //r->cfInitChar=npInitChar;
-    r->cfKillChar=npKillChar;
-    r->cfSetChar=npSetChar;
-    npSetChar(r);
-    // dummy stuff
-    r->nPar  = ndPar;
-    r->nParDeg=ndParDeg;
-    r->cfGetDenom= ndGetDenom;
-    r->cfGetNumerator= ndGetNumerator;
-    r->nImPart=ndReturn0;
-    r->nInpMult=ndInpMult;
-    r->nIntMod=ndIntMod;
-    r->nNormalize=ndNormalize;
-    r->nGcd  = ndGcd;
-    r->nLcm  = ndGcd; /* tricky, isn't it ?*/
-    // the real stuff
-    r->cfInit = npInit;
-    r->nInit_bigint=npMap0;
-    r->n_Int  = npInt;
-    r->nAdd   = npAdd;
-    r->nSub   = npSub;
-    r->nMult  = npMult;
-    r->nDiv   = npDiv;
-    r->nExactDiv= npDiv;
-    r->nNeg   = npNeg;
-    r->nInvers= npInvers;
-    r->cfCopy  = ndCopy;
-    r->nGreater = npGreater;
-    r->nEqual = npEqual;
-    r->nIsZero = npIsZero;
-    r->nIsOne = npIsOne;
-    r->nIsMOne = npIsMOne;
-    r->nGreaterZero = npGreaterZero;
-    r->cfWrite = npWrite;
-    r->nRead = npRead;
-    r->nPower = npPower;
-    r->cfSetMap = npSetMap;
-    r->nName= ndName; 
-    r->nSize  = ndSize;
-#ifdef LDEBUG
-    r->nDBTest=npDBTest;
-#endif
-#ifdef NV_OPS
-    if (c>NV_MAX_PRIME)
-    {
-      r->nMult  = nvMult;
-      r->nDiv   = nvDiv;
-      r->nExactDiv= nvDiv;
-      r->nInvers= nvInvers;
-      r->nPower= nvPower;
-    }
-#endif
-  }
-  else
-  {
-    WarnS("nInitChar failed");
-  }
 }
 

coeffs/numbers.cc

@@ -135 +135 @@
   else if (nField_is_Ring_2toM(r))
   {
-    nr2mSetExp(c, r);
-    r->nInit_bigint=nr2mMapQ;
+  //  nr2mSetExp(c, r);
+  //  r->nInit_bigint=nr2mMapQ;
   }
   /*----------------------ring Z ----------------*/
   else if (nField_is_Ring_Z(r))
   {
-    nrzSetExp(c, r);
-    r->nInit_bigint=nrzMapQ;
+  //  nrzSetExp(c, r);
+  //  r->nInit_bigint=nrzMapQ;
   }
   /*----------------------ring Z / n----------------*/
   else if (nField_is_Ring_ModN(r))
   {
-    nrnSetExp(c, r);
-    r->nInit_bigint=nrnMapQ;
+  //  nrnSetExp(c, r);
+  //  r->nInit_bigint=nrnMapQ;
   }
   /*----------------------ring Z / n----------------*/
   else if (nField_is_Ring_PtoM(r))
   {
-    nrnSetExp(c, r);
-    r->nInit_bigint=nrnMapQ;
+  //  nrnSetExp(c, r);
+  //  r->nInit_bigint=nrnMapQ;
   }
 #endif
@@ -160 +160 @@
   else if (nField_is_GF(r))
   {
-    nfSetChar(c,r->parameter);
-    r->nInit_bigint=ndReturn0; // not impl.
+  //  nfSetChar(c,r->parameter);
   }
   /* -------------- R -----------------------*/
@@ -167 +166 @@
   else if (nField_is_R(r))
   {
-    r->nInit_bigint=nrMapQ;
+  //  r->nInit_bigint=nrMapQ;
   }
   /* -------------- long R -----------------------*/
@@ -174 +173 @@
   || (nField_is_long_C(r)))
   {
-    setGMPFloatDigits(r->float_len,r->float_len2);
-    if (nField_is_long_R(r)) r->nInit_bigint=ngfMapQ;
-    else                     r->nInit_bigint=ngcMapQ;
+   // setGMPFloatDigits(r->float_len,r->float_len2);
+   // if (nField_is_long_R(r)) r->nInit_bigint=ngfMapQ;
+   // else                     r->nInit_bigint=ngcMapQ;
   }
 #ifdef TEST
@@ -356 +355 @@
   else
 #endif
-  if (nField_is_Q(r))
-  {
-    r->cfInitChar=nlInitChar;
-    nlInitChar();
-  }
-  else if (nField_is_Zp(r))
+  if (nField_is_Zp(r))
   /*----------------------char. p----------------*/
   {
@@ -403 +397 @@
 #endif
     */
-    r->cfInitChar=npInitChar;
-    npInitChar(r,c);
+    //r->cfInitChar=npInitChar;
   }
   /* -------------- GF(p^m) -----------------------*/