Changeset e5422d in git

Timestamp:

Apr 19, 2011, 6:16:27 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

7f602bf34cba1848ae22dbe21a65ea4f2460604f

Parents:

8c99125adf3766ea3c93c4198e3f4aeed1b29b5f

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-19 18:16:27+02:00

git-committer:

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

Message:

fixed zero divisior issue in Z/2^mZ
coauthor: Frank Seelisch <seelisch@mathematik.uni-kl.de>

Location:

libpolys

Files:

• coeffs/numbers.cc (modified) (1 diff)
• coeffs/numbers.h (modified) (1 diff)
• coeffs/rmodulo2m.cc (modified) (2 diffs)
• tests/coeffs_test.h (modified) (7 diffs)

libpolys/coeffs/numbers.cc

@@ -66 +66 @@
 }
 #endif
+
+
+BOOLEAN ndIsZeroDivisor( number a, const coeffs r)
+{
+  int c = n_GetChar(r);
+  BOOLEAN ret = n_IsZero(a, r);
+  if( (c != 0) && !ret )
+  {
+    number ch = n_Init( c, r ); 
+    number g = n_Gcd( ch, a, r );
+    ret = !n_IsOne (g, r);
+    n_Delete(&ch, r);
+    n_Delete(&g, r);
+  }
+  return ret; 
+}
 
 void   ndNormalize(number& d, const coeffs r) { }

libpolys/coeffs/numbers.h

@@ -70 +70 @@
 void   ndInpAdd(number &a, number b, const coeffs r);
 
+/// Test whether a is a zero divisor in r
+/// i.e. not coprime with char. of r
+BOOLEAN ndIsZeroDivisor( number a, const coeffs r);
+
 #ifdef LDEBUG
 void nDBDummy1(number* d,char *f, int l);

libpolys/coeffs/rmodulo2m.cc

@@ -244 +244 @@
 BOOLEAN nr2mEqual(number a, number b, const coeffs r)
 {
-  return a == b;
+  return (a == b);
 }
 
@@ -623 +623 @@
     r->mod2mMask = 3; /* i.e., '11' in binary representation */
   }
+  r->ch = r->mod2mMask + 1;
 }
 

libpolys/tests/coeffs_test.h

@@ -39 +39 @@
   
   number sum1 = n_Init(ssss, r);
-  clog<< "sum1(int): "; PrintSized(sum1, r);
+  clog<< "N*(N+1)/2 (int: " << ssss << "): "; PrintSized(sum1, r);
 
   number s, ss, i, res;
@@ -48 +48 @@
   n_Delete(&i, r);
   
+  clog<< "N*(N+1): ("<< N*(N+1) << ")"; PrintSized(s, r);  
+  
   i = n_Init(2, r);
+  clog<< "2: "; PrintSized(i, r);  
 
   if( !n_IsZero( i, r) )
@@ -55 +58 @@
     res = n_Div(s, i, r);
   
-    clog<< "res: "; PrintSized(res, r);
-
-    TS_ASSERT( n_Equal(sum1, res, r) );
-    TS_ASSERT( n_Equal(res, sum1, r) );
+    clog<< "N*(N+1)/2: "; PrintSized(res, r);
+    number d = n_Sub(res, sum1, r);
+    
+    TS_ASSERT( ndIsZeroDivisor(d, r) );
+    
+    if( n_GetChar(r) == 0 )
+    {
+      TS_ASSERT( n_Equal(sum1, res, r) );
+      TS_ASSERT( n_Equal(res, sum1, r) );
+    }
   } else
     TS_ASSERT_EQUALS( n_GetChar(r), 2);
@@ -82 +91 @@
 
   ss = n_Neg(ss, r); // ss = -ss
-  
-  
+ 
+  clog<< "real sum    : "; PrintSized(s, r);
+  clog<< "real sum(--): "; PrintSized(ss, r);  
+
   TS_ASSERT( n_Equal(s, ss, r) );
   TS_ASSERT( n_Equal(ss, s, r) );
 
-  clog<< "s: "; PrintSized(s, r);
-  clog<< "ss: "; PrintSized(ss, r);  
-
   n_Delete(&s, r);    
   n_Delete(&ss, r);    
+
+  clog << ( " >>> TEST DONE!" );
+  clog << endl;
+
 }
 
@@ -161 +173 @@
   n_Delete(&aa1, r);
   n_Delete(&aa2, r);
+
+
+  clog << ( " >>> TEST DONE!" );
+  clog << endl;
+
 }
 
@@ -212 +229 @@
       TS_ASSERT(  nCoeff_is_Q( r ));
       TS_ASSERT(  nCoeff_is_Domain( r ));
-      TS_ASSERT(  nCoeff_has_Units( r ));
-      TS_ASSERT(  nCoeff_has_simple_inverse( r ));// ?
-      TS_ASSERT(  nCoeff_has_simple_Alloc( r )); // ?
+
+      TS_ASSERT( !nCoeff_has_Units( r )); // ?
+      TS_ASSERT( !nCoeff_has_simple_inverse( r ));// ?
+      TS_ASSERT( !nCoeff_has_simple_Alloc( r )); // ?
 
       TS_ASSERT( !nCoeff_is_Ring_2toM( r ));
@@ -291 +309 @@
 
   TestArith( r );
+  TestSum( r, 10 );
   TestSum( r, 100 );
-  TestSum( r, 1000 );
+  TestSum( r, 101 );
+  TestSum( r, 1001 );
+  TestSum( r, 9000 );
 
   nKillChar( r );
-
-  clog << ( " >>> TEST DONE!" );
-  clog << endl;
 
   return TRUE;