Changeset b56249 in git for libpolys

Timestamp:

Apr 23, 2013, 5:00:16 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5782e2d7947412c3820f7bd158d09b128c888ca9

Parents:

888b45777bfde99aa51caf2645601ffcc66fa35e

Message:

Misc fixes due to building on Mac OS X 10.6

fix: no  pyobject-building if configured without dynamic loading
chg: minor include reordering + forward declarations + cosmetics
fix: AM_COND_IF may be undefined in older automake/autoconf
fix: distribute ALL tested tests
fix: no double definition of NATNUMBER/int_number in structs.h
fix: n_ExtGcd is not always related to HAVE_RINGS

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (5 diffs)
• polys/nc/gb_hack.h (modified) (1 diff)
• polys/prCopy.h (modified) (1 diff)

libpolys/coeffs/coeffs.h

@@ -139 +139 @@
    void     (*cfMPZ)(mpz_t result, number &n, const coeffs r);
    
-#ifdef HAVE_RINGS
-   int     (*cfDivComp)(number a,number b,const coeffs r);
-   BOOLEAN (*cfIsUnit)(number a,const coeffs r);
-   number  (*cfGetUnit)(number a,const coeffs r);
-#endif
-
    /// changes argument  inline: a:= -a
    /// return -a! (no copy is returned)
@@ -165 +159 @@
    const char *  (*cfRead)(const char * s, number * a, const coeffs r);
    void    (*cfNormalize)(number &a, const coeffs r);
+   
+#ifdef HAVE_RINGS
+   int     (*cfDivComp)(number a,number b,const coeffs r);
+   BOOLEAN (*cfIsUnit)(number a,const coeffs r);
+   number  (*cfGetUnit)(number a,const coeffs r);
+   BOOLEAN (*cfDivBy)(number a, number b, const coeffs r);
+#endif
+
+   
    BOOLEAN (*cfGreater)(number a,number b, const coeffs r),
-#ifdef HAVE_RINGS
-           (*cfDivBy)(number a, number b, const coeffs r),
-#endif
             /// tests
            (*cfEqual)(number a,number b, const coeffs r),
@@ -428 +428 @@
 
 #ifdef HAVE_RINGS
+static inline int n_DivComp(number a, number b, const coeffs r)
+{ assume(r != NULL); assume(r->cfDivComp!=NULL); return r->cfDivComp (a,b,r); }
+
 /// TRUE iff n has a multiplicative inverse in the given coeff field/ring r
 static inline BOOLEAN n_IsUnit(number n, const coeffs r)
 { assume(r != NULL); assume(r->cfIsUnit!=NULL); return r->cfIsUnit(n,r); }
-
-static inline number n_ExtGcd(number a, number b, number *s, number *t, const coeffs r)
-{ assume(r != NULL); assume(r->cfExtGcd!=NULL); return r->cfExtGcd (a,b,s,t,r); }
-
-static inline int n_DivComp(number a, number b, const coeffs r)
-{ assume(r != NULL); assume(r->cfDivComp!=NULL); return r->cfDivComp (a,b,r); }
 
 /// in Z: 1
@@ -577 +574 @@
 { assume(r != NULL); assume(r->cfGcd!=NULL); return r->cfGcd(a,b,r); }
 
+/// beware that ExtGCD is only relevant for a few chosen coeff. domains
+/// and may perform something unexpected in some cases...
+static inline number n_ExtGcd(number a, number b, number *s, number *t, const coeffs r)
+{ assume(r != NULL); assume(r->cfExtGcd!=NULL); return r->cfExtGcd (a,b,s,t,r); }
+
 /// in Z: return the lcm of 'a' and 'b'
 /// in Z/nZ, Z/2^kZ: computed as in the case Z
@@ -819 +821 @@
 // Missing wrappers for: (TODO: review this?)
 // cfIntMod, cfRead, cfName, cfInit_bigint
-// HAVE_RINGS: cfDivComp, cfExtGcd... 
+
+// HAVE_RINGS: cfDivComp, cfIsUnit, cfGetUnit, cfDivBy
+// BUT NOT cfExtGcd...!
 
 

libpolys/polys/nc/gb_hack.h

@@ -6 +6 @@
 #ifdef PLURAL_INTERNAL_DECLARATIONS
 
-struct  spolyrec;
-typedef struct spolyrec    polyrec;
-typedef polyrec *          poly;
-
-struct ip_sring;
-typedef struct ip_sring *         ring;
+struct  spolyrec; typedef struct spolyrec    polyrec; typedef polyrec *          poly;
+struct ip_sring; typedef struct ip_sring *         ring;
+struct sip_sideal; typedef struct sip_sideal *       ideal;
 
 class intvec;
-
-struct sip_sideal;
-typedef struct sip_sideal *       ideal;
 
 class skStrategy; typedef skStrategy * kStrategy;

libpolys/polys/prCopy.h

@@ -8 +8 @@
 */
 
+struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
+struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
+struct sip_sideal; typedef struct sip_sideal *ideal;
 
 /*************************************************************************