Changeset f1c465f in git

Timestamp:

Jun 21, 2010, 7:46:24 PM (14 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

abca39190db801f0125cf1a47ca64dcd18437478

Parents:

4d1ae5af2805ed797a6a992f88a4bb83fbc625f8

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2010-06-21 19:46:24+02:00

git-committer:

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

Message:

More ring fixes... rmodulo* are still buggy (TODO: Frank)

Location:

coeffs

Files:

• coeffs.h (modified) (1 prop)
• config.h.in (modified) (1 diff)
• gnumpfl.cc (modified) (1 diff)
• gnumpfl.h (modified) (1 diff)
• longrat.h (modified) (1 diff)
• numbers.cc (modified) (1 prop)
• rintegers.cc (modified) (2 diffs)
• rmodulo2m.cc (modified) (2 diffs, 1 prop)
• rmodulo2m.h (modified) (2 diffs, 1 prop)
• rmodulon.cc (modified) (3 diffs, 1 prop)
• rmodulon.h (modified) (1 prop)
• test.cc (modified) (5 diffs, 1 prop)

coeffs/config.h.in

@@ +1 @@
+#include <auxiliary.h>
+
 // #define assume(x) ((void) 0)
 #define memcpy4 memcpy

coeffs/gnumpfl.cc

@@ -406 +406 @@
 }
 
-static BOOLEAN ngfCoeffsEqual(const coeffs r, n_coeffType n, int)
+static BOOLEAN ngfCoeffsEqual(const coeffs r, n_coeffType n, void*)
 {
   assume( getCoeffType(r) == ID );

coeffs/gnumpfl.h

@@ -17 +17 @@
 
 /// test, whether r is an instance of nInitCoeffs(n, parameter) */
-static BOOLEAN ngfCoeffsEqual(const coeffs r, n_coeffType n, int parameter);
+static BOOLEAN ngfCoeffsEqual(const coeffs r, n_coeffType n, void*);
 
 

coeffs/longrat.h

@@ -69 +69 @@
 int      nlInt(number &n, const coeffs r);
 number   nlBigInt(number &n);
+
 #ifdef HAVE_RINGS
 void     nlGMP(number &i, number n, const coeffs r);
 #endif
+
 BOOLEAN  nlGreaterZero(number za, const coeffs r);
 number   nlInvers(number a, const coeffs r);

coeffs/rintegers.cc

@@ -6 +6 @@
 * ABSTRACT: numbers modulo n
 */
+#include "config.h"
+
+#ifdef HAVE_RINGS
 
 #include <string.h>
@@ -19 +22 @@
 #include <si_gmp.h>
 
-#ifdef HAVE_RINGS
 
 omBin gmp_nrz_bin = omGetSpecBin(sizeof(mpz_t));

coeffs/rmodulo2m.cc

@@ -7 +7 @@
 */
 
-#include <string.h>
 #include "config.h"
 #include <auxiliary.h>
 
 #ifdef HAVE_RINGS
+
 #include <mylimits.h>
 #include "coeffs.h"
@@ -21 +21 @@
 #include "rmodulo2m.h"
 #include "si_gmp.h"
+
+#include <string.h>
 
 int nr2mExp;

coeffs/rmodulo2m.h

@@ -10 +10 @@
 #ifdef HAVE_RINGS
 #include "coeffs.h"
+#include "rintegers.h"
+
+#ifndef NATNUMBER
+#define NATNUMBER unsigned long
+#endif
+
+
+void    nr2mInitChar    (coeffs r, void*);
 
 extern int nr2mExp;
@@ -15 +23 @@
                                bit pattern '11..1' of length m */
 
-void    nr2mInitChar    (coeffs r, void*);
+number  nr2mCopy        (number a, const coeffs r);
 BOOLEAN nr2mGreaterZero (number k, const coeffs r);
 number  nr2mMult        (number a, number b, const coeffs r);

coeffs/rmodulon.cc

@@ -7 +7 @@
 */
 
-#include <string.h>
 #include "config.h"
 #include <auxiliary.h>
 
 #ifdef HAVE_RINGS
+
 #include <mylimits.h>
 #include "coeffs.h"
@@ -21 +21 @@
 #include "rmodulon.h"
 #include "si_gmp.h"
+
+#include <string.h>
 
 extern omBin gmp_nrz_bin;
@@ -446 +448 @@
   int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
-  nlGMP(from, (number) erg, dst);
-  mpz_mod(erg, erg, dst->nrnModul);
+  nlGMP(from, (number) erg, src);
+  mpz_mod(erg, erg, src->nrnModul);
   return (number) erg;
 }

coeffs/test.cc

@@ -11 +11 @@
 #include <gnumpc.h>
 #include <shortfl.h>
+
+
 #include <rmodulon.h>
 #include <rmodulo2m.h>
@@ -40 +42 @@
 {
 
-  cout << "Testing coeffs: [" << type << "]: " << endl;
+  cout  << endl << "----------------------- Testing coeffs: [" << type <<
+                "]: -----------------------" << endl;
 
   const coeffs r = nInitChar( type, NULL );
@@ -84 +87 @@
 //    assume( r->cfDelete == nrDelete ); // No?
   }
+#ifdef HAVE_RINGS
   else if( type == n_Z2m )
   {
@@ -98 +102 @@
     assume( r->cfDelete == nrnDelete );
   }
+#endif  
   else
   {
@@ -135 +140 @@
     c ++;
 
+#ifdef HAVE_RINGS
   type = nRegister( n_Zn, nrnInitChar); assume( type == n_Zn );
   if( Test(type) )
     c ++;
+
   
   type = nRegister( n_Z2m, nr2mInitChar); assume( type == n_Z2m );
   if( Test(type) )
     c ++;
-
+#endif
+  
   return c;