Changeset 98474f in git

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

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

Location:

libpolys/coeffs

Files:

• Enumerator.h (added)
• Makefile.am (modified) (1 diff)
• coeffs.h (modified) (4 diffs)
• numbers.cc (modified) (3 diffs)

libpolys/coeffs/Makefile.am

@@ -35 +35 @@
 libcoeffs_includedir  =$(includedir)/singular/coeffs
 libcoeffs_include_HEADERS = coeffs.h numbers.h si_gmp.h gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h rintegers.h rmodulo2m.h rmodulon.h shortfl.h mpr_complex.h mpr_global.h \
-  bigintmat.h 
+  bigintmat.h Enumerator.h
 
 

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
+

libpolys/coeffs/numbers.cc

@@ -123 +123 @@
 
 int ndSize(number a, const coeffs r) { return (int)n_IsZero(a,r)==FALSE; }
+
+/// divide by the first (leading) number and return it, i.e. make monic
+static void ndClearContent(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs r)
+{
+  assume(r != NULL);
+
+  // no fractions
+  assume(!(  nCoeff_is_Q(r) || nCoeff_is_Q_a(r) ));
+  // all coeffs are given by integers!!!
+  assume( nCoeff_is_Ring(r) || nCoeff_is_Zp(r) || nCoeff_is_numeric(r) || nCoeff_is_GF(r) || nCoeff_is_Zp_a(r) );
+
+  numberCollectionEnumerator.Reset();
+  
+#ifdef HAVE_RINGS
+  /// TODO: move to a separate implementation 
+  if (nCoeff_is_Ring(r))
+  {
+    if (nCoeff_has_Units(r))
+    {
+      c = n_GetUnit(numberCollectionEnumerator.Current(), r);
+      
+      if (!n_IsOne(c, r))
+      {
+        number inv = n_Invers(c, r);
+
+        do
+        {
+          n_InpMult(numberCollectionEnumerator.Current(), inv, r);
+        }
+        while( numberCollectionEnumerator.MoveNext() );
+
+        n_Delete(&inv, r);        
+      }      
+    } else c = n_Init(1, r);
+    
+    return;
+  }
+#endif
+
+  assume(!nCoeff_is_Ring(r));
+
+  c = numberCollectionEnumerator.Current();
+  
+  n_Normalize(c, r);
+
+  if (!n_IsOne(c, r))
+  {    
+    numberCollectionEnumerator.Current() = n_Init(1, r); // ???
+    
+    number inv = n_Invers(c, r);
+    
+    while( numberCollectionEnumerator.MoveNext() )
+    {
+      number &n = numberCollectionEnumerator.Current();
+      n_Normalize(n, r); // ?
+      n_InpMult(n, inv, r);
+    }
+    
+    n_Delete(&inv, r);
+  }
+}
+
+/// does nothing (just returns a dummy one number)
+static void ndClearDenominators(ICoeffsEnumerator& /*numberCollectionEnumerator*/, number& d, const coeffs r)
+{
+  assume( r != NULL );
+  assume( !(nCoeff_is_Q(r) || nCoeff_is_transExt(r)) );
+  assume( nCoeff_is_Ring(r) || nCoeff_is_Zp(r) || nCoeff_is_numeric(r) || nCoeff_is_GF(r) || (getCoeffType(r)==n_algExt) );
+
+  d = n_Init(1, r);
+}
 
 number ndCopy(number a, const coeffs) { return a; }
@@ -262 +333 @@
     n->cfParameter = ndParameter;
 
+    n->cfClearContent = ndClearContent;
+    n->cfClearDenominators = ndClearDenominators;
+
 #ifdef HAVE_RINGS
     n->cfDivComp = ndDivComp;
@@ -352 +426 @@
 //    assume(n->cfInit_bigint!=NULL);
     assume(n->cfCoeffWrite != NULL);
+
+    assume(n->cfClearContent != NULL);
+    assume(n->cfClearDenominators != NULL);
+    
 #ifdef LDEBUG
     assume(n->cfDBTest!=NULL);