Changeset d9357b in git

Timestamp:

Feb 16, 2012, 3:43:29 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

de222ec7eb2bfb6e75b27248dbeeebb1d1228587

Parents:

64c923912a0fd9eb0092e41e49922c2ec9c5fb4d

git-author:

Martin Lee <martinlee84@web.de>2012-02-16 15:43:29+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:25+02:00

Message:

chg: added coeff bounds to Hensel lifting routines
     added coeff bounds to henselLiftAndEarly

Location:

factory

Files:

• facFqBivar.cc (modified) (3 diffs)
• facFqBivar.h (modified) (3 diffs)
• facHensel.cc (modified) (2 diffs)
• facHensel.h (modified) (3 diffs)

factory/facFqBivar.cc

@@ -450 +450 @@
 factorRecombination (CFList& factors, CanonicalForm& F,
                      const CanonicalForm& N, DegreePattern& degs, int s,
-                     int thres
+                     int thres, const modpk& b
                     )
 {
@@ -639 +639 @@
 earlyFactorDetection (CFList& reconstructedFactors, CanonicalForm& F, CFList&
                       factors, int& adaptedLiftBound, int*& factorsFoundIndex,
-                      DegreePattern& degs, bool& success, int deg)
+                      DegreePattern& degs, bool& success, int deg,
+                      const modpk& b)
 {
   DegreePattern bufDegs1= degs;
@@ -860 +861 @@
                     earlyFactors, DegreePattern& degs, int& liftBound,
                     const CFList& uniFactors, const ExtensionInfo& info,
-                    const CanonicalForm& eval)
+                    const CanonicalForm& eval, const modpk& b)
 {
   Variable alpha= info.getAlpha();

factory/facFqBivar.h

@@ -646 +646 @@
                 int s,                 ///< [in] algorithm starts checking
                                        ///< subsets of size s
-                int thres              ///< [in] threshold for the size of
+                int thres,             ///< [in] threshold for the size of
                                        ///< subsets which are checked, for a
                                        ///< full factor recombination choose
                                        ///< thres= factors.length()/2
+                const modpk& b=modpk() ///< [in] coeff bound
                     );
 
@@ -694 +695 @@
                                    ///< whenever we find a factor
            bool& success,          ///< [in,out] indicating success
-           int deg                 ///< [in] stage of Hensel lifting
+           int deg,                ///< [in] stage of Hensel lifting
+           const modpk& b= modpk() ///< [in] coeff bound
                      );
 
@@ -741 +743 @@
         const CFList& uniFactors,  ///< [in] univariate factors
         const ExtensionInfo& info, ///< [in] information about extension
-        const CanonicalForm& eval  ///< [in] evaluation point
+        const CanonicalForm& eval, ///< [in] evaluation point
+        const modpk& b= modpk()    ///< [in] coeff bound
                   );
 

factory/facHensel.cc

@@ -607 +607 @@
 void
 henselLift12 (const CanonicalForm& F, CFList& factors, int l, CFArray& Pi,
-              CFList& diophant, CFMatrix& M, bool sort)
+              CFList& diophant, CFMatrix& M, bool sort, const modpk& b)
 {
   if (sort)
@@ -647 +647 @@
 void
 henselLiftResume12 (const CanonicalForm& F, CFList& factors, int start, int
-                    end, CFArray& Pi, const CFList& diophant, CFMatrix& M)
+                    end, CFArray& Pi, const CFList& diophant, CFMatrix& M,
+                    const modpk& b)
 {
   CFArray bufFactors= CFArray (factors.length());

factory/facHensel.h

@@ -25 +25 @@
 
 #include "canonicalform.h"
+#include "fac_util.h"
 
 #ifdef HAVE_NTL
@@ -47 +48 @@
               CFList& diophant,       ///< [in,out] result of diophantine()
               CFMatrix& M,            ///< [in,out] stores intermediate results
-              bool sort= true         ///< [in] sort factors by degree in
+              bool sort= true,        ///< [in] sort factors by degree in
                                       ///< Variable(1)
+              const modpk& b= modpk ()///< [in] coeff bound
              );
 
@@ -68 +70 @@
                                             ///< results
                     const CFList& diophant, ///< [in] result of diophantine
-                    CFMatrix& M             ///< [in,out] stores intermediate
+                    CFMatrix& M,            ///< [in,out] stores intermediate
                                             ///< results
+                    const modpk& b= modpk() ///< [in] coeff bound
                    );