Changeset 98474f in git for libpolys/coeffs/coeffs.h

Timestamp:

Jul 17, 2012, 9:09:26 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

975db1808b2b0917d858a9096710abc55c256aec

Parents:

805d0b10ffd62e7ff079f116851129cc4ae8f89d

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-07-17 21:09:26+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-07-17 21:33:55+02:00

Message:

Abstract iterator/enumerator interfaces + dummies for ClearContent and ClearDenominators

File:

• libpolys/coeffs/coeffs.h (modified) (4 diffs)

libpolys/coeffs/coeffs.h

@@ -13 +13 @@
 
 #include <coeffs/si_gmp.h>
+
+#include <coeffs/Enumerator.h>
 
 #ifdef HAVE_FACTORY
@@ -64 +66 @@
 typedef number (*nMapFunc)(number a, const coeffs src, const coeffs dst);
 
+
+/// Abstract interface for an enumerator of number coefficients for an
+/// object, e.g. a polynomial
+typedef IEnumerator<number> ICoeffsEnumerator;
+
+/// goes over coeffs given by the ICoeffsEnumerator and changes them.
+/// Additionally returns a number;
+typedef void (*nCoeffsEnumeratorFunc)(ICoeffsEnumerator& numberCollectionEnumerator, number& output, const coeffs r);
+
+
 /// Creation data needed for finite fields
 typedef struct 
@@ -196 +208 @@
    /// create i^th parameter or NULL if not possible
    number  (*cfParameter)(const int i, const coeffs r);
+       
+   /// function pointer behind n_ClearContent
+   nCoeffsEnumeratorFunc cfClearContent;
+
+   /// function pointer behind n_ClearDenominators
+   nCoeffsEnumeratorFunc cfClearDenominators;
 
 #ifdef HAVE_FACTORY
@@ -793 +811 @@
 
 
-#endif
-
+/// Computes the content and (inplace) divides it out on a collection
+/// of numbers
+/// NOTE/TODO: see the description by Hans
+/// TODO: what exactly is c?
+static inline void n_ClearContent(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs r)
+{
+  assume(r != NULL);
+  r->cfClearContent(numberCollectionEnumerator, c, r);
+}
+
+/// (inplace) Clears denominators on a collection of numbers
+/// NOTE/TODO: see the description by Hans
+/// TODO: what exactly is d?
+static inline void n_ClearDenominators(ICoeffsEnumerator& numberCollectionEnumerator, number& d, const coeffs r)
+{
+  assume(r != NULL);
+  r->cfClearDenominators(numberCollectionEnumerator, d, r);
+}
+
+// convenience helpers (no number returned - but the input enumeration
+// is to be changed
+// TODO: do we need separate hooks for these as our existing code does
+// *different things* there: compare p_Cleardenom (which calls
+// *p_Content) and p_Cleardenom_n (which doesn't)!!!
+
+static inline void n_ClearContent(ICoeffsEnumerator& numberCollectionEnumerator, const coeffs r)
+{
+  number c;
+  n_ClearContent(numberCollectionEnumerator, c, r);
+  n_Delete(&c, r);
+}
+
+static inline void n_ClearDenominators(ICoeffsEnumerator& numberCollectionEnumerator, const coeffs r)
+{
+  assume(r != NULL);
+  number d;
+  n_ClearDenominators(numberCollectionEnumerator, d, r);
+  n_Delete(&d, r);
+}
+
+
+#endif
+