Changeset de88371 in git for libpolys/polys

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

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/polys/ext_fields

Files:

• algext.cc (modified) (2 diffs)
• transext.cc (modified) (2 diffs)

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;