Changeset b19ab84 in git

Timestamp:

May 10, 2011, 7:05:58 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

05aa4ba5a9c62c92398b1cd7067b8977ec993bb3

Parents:

bea370bfafc6b719f65e3d21472ecc023533e962

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-05-10 19:05:58+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:34:45+01:00

Message:

add some missing routines to coeffs

Location:

libpolys/coeffs

Files:

• modulop.cc (modified) (2 diffs)
• numbers.cc (modified) (3 diffs)
• rmodulon.cc (modified) (2 diffs)

libpolys/coeffs/modulop.cc

@@ -283 +283 @@
 */
 
-void npSetChar(const coeffs)
-{
-#if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
-//    npGen = npExpTable[1];
-#endif
-}
-
 void npKillChar(coeffs r)
 {
@@ -347 +340 @@
   //r->cfInitChar=npInitChar;
   r->cfKillChar=npKillChar;
-  r->cfSetChar=npSetChar;
   r->nCoeffIsEqual=npCoeffsEqual;
 

libpolys/coeffs/numbers.cc

@@ -110 +110 @@
   return a;
 }
+void ndKillChar(coeffs) {}
 
 number nd_Copy(number a, const coeffs r) { return n_Copy(a, r); }
@@ -170 +171 @@
     n->cfGcd  = ndGcd;
     n->cfLcm  = ndGcd; /* tricky, isn't it ?*/
+    //n->cfKillChar = ndKillChar; /* dummy */
+    // temp. removed to catch all the coeffs which miss to implement this!
 
 #ifdef HAVE_RINGS
@@ -201 +204 @@
     
 #ifdef HAVE_RINGS
-   if (n->cfGetUnit==NULL) n->cfGetUnit=n->cfCopy;
+    if (n->cfGetUnit==NULL) n->cfGetUnit=n->cfCopy;
 #endif
    
 #ifndef NDEBUG
-   assume(n->nCoeffIsEqual!=NULL);
-   if(n->cfKillChar==NULL) Warn("cfKillChar is NULL for coeff %d",t);
-   if(n->cfSetChar!=NULL) Warn("cfSetChar is NOT NULL for coeff %d",t);
-   assume(n->cfMult!=NULL);
-   assume(n->cfSub!=NULL);
-   assume(n->cfAdd!=NULL);
-   assume(n->cfDiv!=NULL);
-   assume(n->cfIntDiv!=NULL);
-   assume(n->cfIntMod!=NULL);
-   assume(n->cfExactDiv!=NULL);
-   assume(n->cfInit!=NULL);
-   assume(n->cfPar!=NULL);
-   assume(n->cfParDeg!=NULL);
-   assume(n->cfSize!=NULL);
-   assume(n->cfInt!=NULL);
-   //assume(n->n->cfDivComp!=NULL);
-   //assume(n->cfIsUnit!=NULL);
-   //assume(n->cfGetUnit!=NULL);
-   //assume(n->cfExtGcd!=NULL);
-   assume(n->cfNeg!=NULL);
-   assume(n->cfCopy!=NULL);
-   assume(n->cfRePart!=NULL);
-   assume(n->cfImPart!=NULL);
-   assume(n->cfWrite!=NULL);
-   assume(n->cfRead!=NULL);
-   assume(n->cfNormalize!=NULL);
-   assume(n->cfGreater!=NULL);
-   //assume(n->cfDivBy!=NULL);
-   assume(n->cfEqual!=NULL);
-   assume(n->cfIsZero!=NULL);
-   assume(n->cfIsOne!=NULL);
-   assume(n->cfIsMOne!=NULL);
-   assume(n->cfGreaterZero!=NULL);
-   assume(n->cfPower!=NULL);
-   assume(n->cfGetDenom!=NULL);
-   assume(n->cfGetNumerator!=NULL);
-   assume(n->cfGcd!=NULL);
-   assume(n->cfLcm!=NULL);
-   assume(n->cfDelete!=NULL);
-   assume(n->cfSetMap!=NULL);
-   assume(n->cfName!=NULL);
-   assume(n->cfInpMult!=NULL);
-   assume(n->cfInit_bigint!=NULL);
-   assume(n->cfCoeffWrite != NULL);
+    assume(n->nCoeffIsEqual!=NULL);
+    if(n->cfKillChar==NULL) Warn("cfKillChar is NULL for coeff %d",t);
+    if(n->cfSetChar!=NULL) Warn("cfSetChar is NOT NULL for coeff %d",t);
+    assume(n->cfMult!=NULL);
+    assume(n->cfSub!=NULL);
+    assume(n->cfAdd!=NULL);
+    assume(n->cfDiv!=NULL);
+    assume(n->cfIntDiv!=NULL);
+    assume(n->cfIntMod!=NULL);
+    assume(n->cfExactDiv!=NULL);
+    assume(n->cfInit!=NULL);
+    assume(n->cfPar!=NULL);
+    assume(n->cfParDeg!=NULL);
+    assume(n->cfSize!=NULL);
+    assume(n->cfInt!=NULL);
+    //assume(n->n->cfDivComp!=NULL);
+    //assume(n->cfIsUnit!=NULL);
+    //assume(n->cfGetUnit!=NULL);
+    //assume(n->cfExtGcd!=NULL);
+    assume(n->cfNeg!=NULL);
+    assume(n->cfCopy!=NULL);
+    assume(n->cfRePart!=NULL);
+    assume(n->cfImPart!=NULL);
+    assume(n->cfWrite!=NULL);
+    assume(n->cfRead!=NULL);
+    assume(n->cfNormalize!=NULL);
+    assume(n->cfGreater!=NULL);
+    //assume(n->cfDivBy!=NULL);
+    assume(n->cfEqual!=NULL);
+    assume(n->cfIsZero!=NULL);
+    assume(n->cfIsOne!=NULL);
+    assume(n->cfIsMOne!=NULL);
+    assume(n->cfGreaterZero!=NULL);
+    assume(n->cfPower!=NULL);
+    assume(n->cfGetDenom!=NULL);
+    assume(n->cfGetNumerator!=NULL);
+    assume(n->cfGcd!=NULL);
+    assume(n->cfLcm!=NULL);
+    assume(n->cfDelete!=NULL);
+    assume(n->cfSetMap!=NULL);
+    assume(n->cfName!=NULL);
+    assume(n->cfInpMult!=NULL);
+    assume(n->cfInit_bigint!=NULL);
+    assume(n->cfCoeffWrite != NULL);
 #ifdef LDEBUG
-   assume(n->cfDBTest!=NULL);
-#endif
-   assume(n->type==t);
+    assume(n->cfDBTest!=NULL);
+#endif
+    assume(n->type==t);
 #endif
   }

libpolys/coeffs/rmodulon.cc

@@ -34 +34 @@
   omFreeSize((ADDRESS)s, l);
 }
+
+static BOOLEAN nrnCoeffsEqual(const coeffs r, n_coeffType n, void * parameter)
+{
+  /* test, if r is an instance of nInitCoeffs(n,parameter) */
+  return (n==n_Zn) && (mpz_cmp(r->modNumber,(mpz_ptr)parameter)==0);
+}
+
 
 /* for initializing function pointers */
@@ -75 +82 @@
   r->cfName        = ndName;
   r->cfCoeffWrite  = nrnCoeffWrite;
+  r->nCoeffIsEqual = nrnCoeffsEqual;
 #ifdef LDEBUG
   r->cfDBTest      = nrnDBTest;