Changeset b728bf in git for factory

Timestamp:

Jul 31, 2013, 5:30:24 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

dd8e726c1c4e5b7410c5a9627c9f52be7b122067

Parents:

091b25018851d6b7049240bf5eb739710e97cb1a

git-author:

Martin Lee <martinlee84@web.de>2013-07-31 17:30:24+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-08-30 13:48:24+02:00

Message:

chg: removed trailing spaces
chg: added decompress for absolute factors

Location:

factory

Files:

• facFqBivarUtil.cc (modified) (1 diff)
• facFqBivarUtil.h (modified) (8 diffs)

factory/facFqBivarUtil.cc

@@ -56 +56 @@
   for (CFFListIterator i= factors; i.hasItem(); i++)
     i.getItem()= CFFactor (N (i.getItem().factor()), i.getItem().exp());
+}
+
+void decompress (CFAFList& factors, const CFMap& N)
+{
+  for (CFAFListIterator i= factors; i.hasItem(); i++)
+    i.getItem()= CFAFactor (N (i.getItem().factor()), i.getItem().minpoly(),
+                            i.getItem().exp());
 }
 

factory/facFqBivarUtil.h

@@ -38 +38 @@
                 );
 
+/// as above
+void decompress (CFAFList& factors, ///< [in,out] a list of factors
+                 const CFMap& N    ///< [in] a map
+                );
+
 /// first swap Variables in @a factors1 if necessary, then append @a factors2
 /// and @a factors3 on @a factors1 and finally decompress @a factors1
@@ -68 +73 @@
                                                  ///< 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
@@ -189 +194 @@
 ///         Variable (2)^l
 CFArray
-logarithmicDerivative (const CanonicalForm& F,   ///< [in] bivariate poly 
+logarithmicDerivative (const CanonicalForm& F,   ///< [in] bivariate poly
                                                  ///< truncated at Variable(2)^l
                        const CanonicalForm& G,   ///< [in] a factor of F
@@ -199 +204 @@
                       );
 
-/// compute bounds for logarithmic derivative as described in K. Belabas, 
-/// M. van Hoeij, J. KlÃŒners, and A. Steel, Factoring polynomials over global 
+/// compute bounds for logarithmic derivative as described in K. Belabas,
+/// M. van Hoeij, J. KlÃŒners, and A. Steel, Factoring polynomials over global
 /// fields
 ///
@@ -225 +230 @@
 /// @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, 
+/// getCoeffs (const CanonicalForm&, const int, const int, const int,
 /// const Variable&, const CanonicalForm&, const mat_zz_p&)}
 CFArray
@@ -237 +242 @@
 /// @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, 
+/// 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 
+getCoeffs (const CanonicalForm& F,///< [in] compressed bivariate poly over
                                   ///< F_p(alpha)
            const int k,           ///< [in] some int
@@ -281 +286 @@
 /// substitute x^d by x in F
 void
-subst (const CanonicalForm& F, ///< [in] a polynomial 
+subst (const CanonicalForm& F, ///< [in] a polynomial
        CanonicalForm& A,       ///< [in,out] returns F with x^d replaced by x
        const int d,            ///< d > 1 such that a substitution x^d -> x
@@ -299 +304 @@
 /// reverse a substitution x^d->x
 void
-reverseSubst (CFList& L,        ///< [in,out] a list of polys, returns the 
+reverseSubst (CFList& L,        ///< [in,out] a list of polys, returns the
                                 ///< given list with x replaced by x^d
               const int d,      ///< [in] an integer > 0