Changeset 1112b76 in git

Timestamp:

Jun 22, 2010, 12:41:01 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

d61b83a9e2debd2805137931b5341399516d2a63

Parents:

d4531110717a559c771df1b82982574879ac0fc5

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2010-06-22 12:41:01+02:00

git-committer:

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

Message:

Bug in rmodulon.cc: nrnSetExp expects some previous initialization but ignores the given parameter

Location:

coeffs

Files:

• numbers.cc (modified) (6 diffs)
• rmodulo2m.cc (modified) (3 diffs)
• rmodulon.cc (modified) (4 diffs)
• test.cc (modified) (6 diffs)

coeffs/numbers.cc

@@ -8 +8 @@
 */
 
-#include <string.h>
-#include <stdlib.h>
+#include "config.h"
+#include <auxiliary.h>
+
+
+
 #include "coeffs.h"
-#include "reporter.h"
-#include "omalloc.h"
+
+#include "numbers.h"
+
+#include <reporter.h>
+#include <omalloc.h>
 #include "numbers.h"
 #include "longrat.h"
@@ -22 +28 @@
 #include "longtrans.h"
 #ifdef HAVE_RINGS
-#include <kernel/rmodulo2m.h>
-#include <kernel/rmodulon.h>
-#include <kernel/rintegers.h>
-
-extern omBin gmp_nrz_bin;
-#endif
-
-#ifndef assume
-#  define assume(a) if(!(a)){ Werror( "Assumption: is wrong: %s\n", #a ); };
-#endif
+#include <rmodulo2m.h>
+#include <rmodulon.h>
+#include <rintegers.h>
+#endif
+#include <string.h>
+#include <stdlib.h>
+
 
 
@@ -111 +114 @@
 {
   n_Procs_s *n=cf_root;
-  while((n!=NULL) && (!n->nCoeffIsEqual(n,t,parameter)))
+
+  while((n!=NULL) && (n->nCoeffIsEqual!=NULL) && (!n->nCoeffIsEqual(n,t,parameter)))
       n=n->next;
+
   if (n==NULL)
   {
@@ -135 +140 @@
     n->cfGcd  = ndGcd;
     n->cfLcm  = ndGcd; /* tricky, isn't it ?*/
+
 #ifdef HAVE_RINGS
     n->cfDivComp = ndDivComp;
@@ -189 +195 @@
      else
        Werror("coeff init missing for %d",(int)t);
+    
     // post init settings:
     if (n->cfRePart==NULL) n->cfRePart=n->cfCopy;
     if (n->cfIntDiv==NULL) n->cfIntDiv=n->cfDiv;
+    
 #ifdef HAVE_RINGS
    if (n->cfGetUnit==NULL) n->cfGetUnit=n->cfCopy;
 #endif
+   
 #ifndef NDEBUG
    assume(n->nCoeffIsEqual!=NULL);
@@ -239 +248 @@
    assume(n->cfInpMult!=NULL);
    assume(n->cfInit_bigint!=NULL);
-   #ifdef LDEBUG
+#ifdef LDEBUG
    assume(n->cfDBTest!=NULL);
-   #endif
+#endif
    assume(n->type==t);
 #endif

coeffs/rmodulo2m.cc

@@ -29 +29 @@
 
 /* for initializing function pointers */
-void nr2mInitChar (coeffs r, void*)
-{
-     nr2mInitExp(r->ch, r);
+void nr2mInitChar (coeffs r, void* p)
+{
+  
+  nr2mInitExp((int)(long)(p), r);
+
      r->cfInit       = nr2mInit;
      r->cfCopy       = ndCopy;
@@ -613 +615 @@
  */
 
-void nr2mSetExp(int m, const coeffs r)
+void nr2mSetExp(int m, coeffs r)
 {
   if (m > 1)
@@ -630 +632 @@
 }
 
-void nr2mInitExp(int m, const coeffs r)
+void nr2mInitExp(int m, coeffs r)
 {
   nr2mSetExp(m, r);

coeffs/rmodulon.cc

@@ -30 +30 @@
 
 /* for initializing function pointers */
-void nrnInitChar (coeffs r, void*)
-{
-     nrnInitExp(r->ch, r);
+void nrnInitChar (coeffs r, void* p)
+{
+  
+  nrnInitExp((int)(long)(p), r);
+  
      r->cfInit       = nrnInit;
      r->cfDelete     = nrnDelete;
@@ -534 +536 @@
  */
 
-void nrnSetExp(int m, const coeffs r)
+void nrnSetExp(int m, coeffs r)
 {
   if ((r->nrnModul != NULL) && (mpz_cmp(r->nrnModul, r->ringflaga) == 0) && (nrnExponent == r->ringflagb)) return;
@@ -546 +548 @@
     mpz_init(nrnMinusOne);
   }
+  // BUG:  r->ringflaga is undefined!
   mpz_set(r->nrnModul, r->ringflaga);
   mpz_pow_ui(r->nrnModul, r->nrnModul, nrnExponent);
@@ -551 +554 @@
 }
 
-void nrnInitExp(int m, const coeffs r)
+void nrnInitExp(int m, coeffs r)
 {
   nrnSetExp(m, r);
 
-  if (mpz_cmp_ui(r->nrnModul,2) <= 0)
+  if (mpz_cmp_ui(r->nrnModul, 2) <= 0) // ???
   {
     WarnS("nrnInitExp failed");
   }
+  
+  r->ch = m; // ???
 }
 

coeffs/test.cc

@@ -2 +2 @@
 
 #include <auxiliary.h>
+
 #include <coeffs.h>
 #include <numbers.h>
@@ -39 +40 @@
 
 
-bool Test(const n_coeffType type)
+bool Test(const n_coeffType type, void* p = NULL)
 {
 
@@ -45 +46 @@
                 "]: -----------------------" << endl;
 
-  const coeffs r = nInitChar( type, NULL );
+  const coeffs r = nInitChar( type, p );
 
   assume( r != NULL );
@@ -143 +144 @@
 #ifdef HAVE_RINGS
   type = nRegister( n_Z2m, nr2mInitChar); assume( type == n_Z2m );
-  if( Test(type) )
+  if( Test(type, (void*) 2) )
     c ++;
 #endif
@@ -150 +151 @@
 #ifdef HAVE_RINGS
   type = nRegister( n_Zn, nrnInitChar); assume( type == n_Zn );
-  if( Test(type) )
+  if( Test(type, (void*) 3) )
     c ++;
 /* BUG: 
@@ -158 +159 @@
 #0  0x00007ffff7b91f1b in __gmpz_set () from /usr/lib/libgmp.so.10
 #1  0x00000000004177a5 in nrnSetExp (m=0, r=0x7ffff7f44ae8) at rmodulon.cc:549
+
 #2  0x0000000000417814 in nrnInitExp (m=0, r=0x7ffff7f44ae8) at rmodulon.cc:556
+
 #3  0x0000000000416122 in nrnInitChar (r=0x7ffff7f44ae8) at rmodulon.cc:34
 #4  0x0000000000413278 in nInitChar (t=n_Zn, parameter=0x0) at numbers.cc:146