Changeset f876a66 in git for factory/facFqBivarUtil.h

Timestamp:

May 24, 2011, 5:48:25 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

11bf82dfd2d328940589f0fb6131155b53e10f7a

Parents:

0415f923fdb78a69504a400113e65cd371cb2150

Message:

added convex dense factorization to bivariate factorization
added logarithmic derivative computation to facFqBivarUtil
changes to in extension test


git-svn-id: file:///usr/local/Singular/svn/trunk@14242 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/facFqBivarUtil.h (modified) (5 diffs)

factory/facFqBivarUtil.h

@@ -21 +21 @@
 #include "ExtensionInfo.h"
 
+#ifdef HAVE_NTL
+#include "NTLconvert.h"
+#endif
+
 /// append @a factors2 on @a factors1
 void append (CFList& factors1,       ///< [in,out] a list of polys
@@ -29 +33 @@
 void decompress (CFList& factors, ///< [in,out] a list of polys
                  const CFMap& N   ///< [in] a map
+                );
+
+/// as above
+void decompress (CFFList& factors, ///< [in,out] a list of factors
+                 const CFMap& N    ///< [in] a map
                 );
 
@@ -61 +70 @@
                                                  ///< Fq if we are not over some
                                                  ///< GF
-                    const int k                  ///< some int k such that k
+                    const int k,                 ///< some int k such that k 
                                                  ///< divides l if we are not
                                                  ///< over some Fq
+                    const CanonicalForm& delta,  ///< [in] image of gamma
+                    CFList& source,              ///< [in,out] list of preimages
+                    CFList& dest                 ///< [in,out] list of images
                    );
 
@@ -111 +123 @@
                );
 
+/// as above
+void normalize (CFFList& factors ///< [in,out] a list of factors
+               );
+
 /// extract a subset given by @a index of size @a s from @a elements, if there
 /// is no subset we have not yet considered noSubset is set to true. @a index
@@ -158 +174 @@
                      );
 
+/// compute the coefficients of the logarithmic derivative of G mod
+/// Variable (2)^l over Fq
+///
+/// @return an array of coefficients of the logarithmic derivative of G mod
+///         Variable (2)^l
+CFArray logarithmicDerivative (const CanonicalForm& F,///<[in] a bivariate poly
+                              const CanonicalForm& G, ///<[in] a factor of F
+                              int l,                  ///<[in] lifting precision
+                              CanonicalForm& Q        ///<[in,out] F/G
+                              );
+
+/// compute the coefficients of the logarithmic derivative of G mod
+/// Variable (2)^l over Fq with oldQ= F/G mod Variable (2)^oldL
+///
+/// @return an array of coefficients of the logarithmic derivative of G mod
+///         Variable (2)^l
+CFArray
+logarithmicDerivative (const CanonicalForm& F,   ///< [in] bivariate poly
+                       const CanonicalForm& G,   ///< [in] a factor of F
+                       int l,                    ///< [in] lifting precision
+                       int oldL,                 ///< [in] old precision
+                       const CanonicalForm& oldQ,///< [in] F/G mod
+                                                 ///< Variable(2)^oldL
+                       CanonicalForm& Q          ///< [in, out] F/G
+                      );
+
+/// compute bounds for logarithmic derivative as described in K. Belabas, 
+/// M. van Hoeij, J. KlÃŒners, and A. Steel, Factoring polynomials over global 
+/// fields
+///
+/// @return @a computeBounds returns bounds as described above
+int *
+computeBounds (const CanonicalForm& F,///< [in] compressed bivariate polynomial
+               int& n                 ///< [in,out] length of output
+              );
+
+/// extract coefficients of \f$ x^i \f$ for \f$i\geq k\f$ where \f$ x \f$ is
+/// a variable of level 1
+///
+/// @return coefficients of \f$ x^i \f$ for \f$i\geq k\f$
+/// @sa {getCoeffs (const CanonicalForm&, const int, const Variable&),
+/// getCoeffs (const CanonicalForm&, const int, const int, const int, 
+/// const Variable&, const CanonicalForm&, const mat_zz_p&)}
+CFArray
+getCoeffs (const CanonicalForm& F,///< [in] compressed bivariate poly over F_p
+           const int k            ///< [in] some int
+          );
+
+/// extract coefficients of \f$ x^i \f$ for \f$i\geq k\f$ where \f$ x \f$ is
+/// a variable of level 1
+///
+/// @return coefficients of \f$ x^i \f$ for \f$i\geq k\f$
+/// @sa {getCoeffs (const CanonicalForm&, const int),
+/// getCoeffs (const CanonicalForm&, const int, const int, const int, 
+/// const Variable&, const CanonicalForm&, const mat_zz_p&)}
+CFArray
+getCoeffs (const CanonicalForm& F,///< [in] compressed bivariate poly over 
+                                  ///< F_p(alpha)
+           const int k,           ///< [in] some int
+           const Variable& alpha  ///< [in] algebraic variable
+          );
+
+#ifdef HAVE_NTL
+/// extract coefficients of \f$ x^i \f$ for \f$i\geq k\f$ where \f$ x \f$ is
+/// a variable of level 1
+///
+/// @return coefficients of \f$ x^i \f$ for \f$i\geq k\f$
+/// @sa {getCoeffs (const CanonicalForm&, const int, const Variable& alpha),
+/// getCoeffs (const CanonicalForm&, const int)}
+CFArray
+getCoeffs (const CanonicalForm& F,         ///< [in] compressed bivariate poly
+           const int k,                    ///< [in] some int
+           const int l,                    ///< [in] precision
+           const int degMipo,              ///< [in] degree of minimal poly
+           const Variable& alpha,          ///< [in] algebraic variable
+           const CanonicalForm& evaluation,///< [in] evaluation point
+           const mat_zz_p& M               ///< [in] bases change matrix
+          );
+#endif
+
+/// write A into M starting at row startIndex
+void
+writeInMatrix (CFMatrix& M,        ///< [in,out] some matrix
+               const CFArray& A,   ///< [in] array of polys
+               const int column,   ///< [in] column in which A is written
+               const int startIndex///< [in] row in which to start
+              );
+
 /// checks if a substitution x^n->x is possible
 ///