Changeset de88371 in git for libpolys

Timestamp:

Jul 18, 2012, 3:28:22 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

91ecf187772d8c5893550eabd5abde87d2f29b9c

Parents:

975db1808b2b0917d858a9096710abc55c256aec

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-07-18 15:28:22+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-07-18 15:41:07+02:00

Message:

Added stubs for putting the actual code (TODO!), where required (i.e. described) by Hans

chg: descriptions for the output number (n_ClearContent & n_ClearDenominators)
chg: publicly available default implementations ndClearContent & ndClearDenominators for fallback calls

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (2 diffs)
• coeffs/longrat.cc (modified) (2 diffs)
• coeffs/numbers.cc (modified) (2 diffs)
• coeffs/numbers.h (modified) (1 diff)
• polys/ext_fields/algext.cc (modified) (2 diffs)
• polys/ext_fields/transext.cc (modified) (2 diffs)

libpolys/coeffs/coeffs.h

@@ -813 +813 @@
 /// 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?
+/// number @em c is the content (i.e. the GCD of all the coeffs, which
+/// we divide out inplace)
+/// NOTE: it assumes all coefficient numbers to be integer!!!
+/// NOTE/TODO: see also the description by Hans
+/// TODO: rename into n_ClearIntegerContent
 static inline void n_ClearContent(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs r)
 {
@@ -822 +825 @@
 
 /// (inplace) Clears denominators on a collection of numbers
-/// NOTE/TODO: see the description by Hans
-/// TODO: what exactly is d?
+/// number @em d is the LCM of all the coefficient denominators (i.e. the number
+/// with which all the number coeffs. were multiplied)
+/// NOTE/TODO: see also the description by Hans
 static inline void n_ClearDenominators(ICoeffsEnumerator& numberCollectionEnumerator, number& d, const coeffs r)
 {

libpolys/coeffs/longrat.cc

@@ -2638 +2638 @@
 }
 
+static void nlClearContent(ICoeffsEnumerator& /*numberCollectionEnumerator*/, number& c, const coeffs cf)
+{
+  assume(cf != NULL);
+  assume(getCoeffType(cf) == ID);
+  // all coeffs are given by integers!!!
+
+  c = n_Init(1, cf);
+  assume(FALSE); // TODO: NOT YET IMPLEMENTED!!!
+
+//   numberCollectionEnumerator.Reset();
+// 
+//   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);
+//   }
+}
+
+static void nlClearDenominators(ICoeffsEnumerator& /*numberCollectionEnumerator*/, number& c, const coeffs cf)
+{
+  assume(cf != NULL);
+  assume(getCoeffType(cf) == ID);
+  // all coeffs are given by integers!!!
+
+  c = n_Init(1, cf);
+  assume(FALSE); // TODO: NOT YET IMPLEMENTED!!!
+}
+
 BOOLEAN nlInitChar(coeffs r, void*)
 {
@@ -2695 +2737 @@
   r->cfInit_bigint=nlCopyMap;
   r->cfCoeffWrite=nlCoeffWrite;
+
+  r->cfClearContent = nlClearContent;
+  r->cfClearDenominators = nlClearDenominators;
+  
 #ifdef LDEBUG
   // debug stuff

libpolys/coeffs/numbers.cc

@@ -124 +124 @@
 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)
+void ndClearContent(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs r)
 {
   assume(r != NULL);
@@ -185 +184 @@
 }
 
-/// does nothing (just returns a dummy one number)
-static void ndClearDenominators(ICoeffsEnumerator& /*numberCollectionEnumerator*/, number& d, const coeffs r)
+void ndClearDenominators(ICoeffsEnumerator& /*numberCollectionEnumerator*/, number& d, const coeffs r)
 {
   assume( r != NULL );

libpolys/coeffs/numbers.h

@@ -95 +95 @@
 n_coeffType nRegister(n_coeffType n, cfInitCharProc p);
 
+/// divide by the first (leading) number and return it, i.e. make monic
+void ndClearContent(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs r);
+
+/// does nothing (just returns a dummy one number)
+void ndClearDenominators(ICoeffsEnumerator& numberCollectionEnumerator, number& d, const coeffs r);
+
 #endif

libpolys/polys/ext_fields/algext.cc

@@ -831 +831 @@
 }
 
+static void naClearContent(ICoeffsEnumerator& /*numberCollectionEnumerator*/, number& c, const coeffs cf)
+{
+  assume(cf != NULL);
+  assume(getCoeffType(cf) == ID);
+  assume(nCoeff_is_Q_a(cf)); // only over Q[a]/m(a), while the default impl. is used over Zp[a]/m(a) !
+  // all coeffs are given by integers!!!
+
+  c = n_Init(1, cf);
+  assume(FALSE); // TODO: NOT YET IMPLEMENTED!!!
+
+//   numberCollectionEnumerator.Reset();
+// 
+//   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);
+//   }
+}
+
+
 BOOLEAN naInitChar(coeffs cf, void * infoStruct)
 {
@@ -914 +948 @@
   cf->cfParameter = naParameter;
 
+  if( nCoeff_is_Q(R->cf) )
+    cf->cfClearContent = naClearContent;
+  
   return FALSE;
 }

libpolys/polys/ext_fields/transext.cc

@@ -1405 +1405 @@
 }
 
+static void ntClearContent(ICoeffsEnumerator& /*numberCollectionEnumerator*/, number& c, const coeffs cf)
+{
+  assume(cf != NULL);
+  assume(getCoeffType(cf) == ID);
+  assume(nCoeff_is_Q_a(cf)); // only over Q(a), while the default impl. is used over Zp(a) !
+  // all coeffs are given by integers!!!
+
+  c = n_Init(1, cf);
+  assume(FALSE); // TODO: NOT YET IMPLEMENTED!!!
+
+//   numberCollectionEnumerator.Reset();
+// 
+//   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);
+//   }
+}
+
+static void ntClearDenominators(ICoeffsEnumerator& /*numberCollectionEnumerator*/, number& c, const coeffs cf)
+{
+  assume(cf != NULL);
+  assume(getCoeffType(cf) == ID); // both over Q(a) and Zp(a)!
+  // all coeffs are given by integers!!!
+
+  c = n_Init(1, cf);
+  assume(FALSE); // TODO: NOT YET IMPLEMENTED!!!
+}
+
 BOOLEAN ntInitChar(coeffs cf, void * infoStruct)
 {
@@ -1487 +1530 @@
   cf->cfParameter = ntParameter;
 
+  if( nCoeff_is_Q(R->cf) )
+    cf->cfClearContent = ntClearContent;
+
+  cf->cfClearDenominators = ntClearDenominators;
 
   return FALSE;