Changeset 69fdf90 in git for factory

Timestamp:

Mar 5, 2012, 10:31:58 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

51aa1628bc6d045fbc3a9adf018acd4371a09596

Parents:

47dc5eae8e5fa15711c4af64c3ce91a844425401

git-author:

Martin Lee <martinlee84@web.de>2012-03-05 22:31:58+01:00

git-committer:

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

Message:

chg: do not require coeff bound to be const

Location:

factory

Files:

• facFqBivar.cc (modified) (4 diffs)
• facFqBivar.h (modified) (1 diff)
• facHensel.cc (modified) (5 diffs)
• facHensel.h (modified) (1 diff)

factory/facFqBivar.cc

@@ -882 +882 @@
                     earlyFactors, DegreePattern& degs, int& liftBound,
                     const CFList& uniFactors, const ExtensionInfo& info,
-                    const CanonicalForm& eval, const modpk& b)
+                    const CanonicalForm& eval, modpk& b)
 {
   Variable alpha= info.getAlpha();
@@ -920 +920 @@
 
   if (smallFactorDeg >= liftBound || degree (A,y) <= 4)
-    henselLift12 (A, bufUniFactors, liftBound, Pi, diophant, M, true, b);
+    henselLift12 (A, bufUniFactors, liftBound, Pi, diophant, M, b, true);
   else if (sizeOfLiftPre > 1 && sizeOfLiftPre < 30)
   {
-    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M, true, b);
+    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M, b, true);
     if (!extension)
       earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
@@ -983 +983 @@
   else
   {
-    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M, true, b);
+    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M, b, true);
     if (!extension)
       earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
@@ -1048 +1048 @@
 
   return bufUniFactors;
+}
+
+CFList
+henselLiftAndEarly (CanonicalForm& A, bool& earlySuccess, CFList&
+                    earlyFactors, DegreePattern& degs, int& liftBound,
+                    const CFList& uniFactors, const ExtensionInfo& info,
+                    const CanonicalForm& eval)
+{
+  modpk dummy= modpk();
+  return henselLiftAndEarly (A, earlySuccess, earlyFactors, degs, liftBound,
+                             uniFactors, info, eval, dummy);
 }
 

factory/facFqBivar.h

@@ -744 +744 @@
         const ExtensionInfo& info, ///< [in] information about extension
         const CanonicalForm& eval, ///< [in] evaluation point
-        const modpk& b= modpk()    ///< [in] coeff bound
+        modpk& b                   ///< [in] coeff bound
+                  );
+
+/// hensel Lifting and early factor detection
+///
+/// @return @a henselLiftAndEarly returns monic (wrt Variable (1)) lifted
+///         factors without factors which have been detected at an early stage
+///         of Hensel lifting
+/// @sa earlyFactorDetection(), extEarlyFactorDetection()
+
+CFList
+henselLiftAndEarly (
+        CanonicalForm& A,          ///< [in,out] poly to be factored,
+                                   ///< returns poly divided by detected factors
+                                   ///< in case of success
+        bool& earlySuccess,        ///< [in,out] indicating success
+        CFList& earlyFactors,      ///< [in,out] list of factors detected
+                                   ///< at early stage of Hensel lifting
+        DegreePattern& degs,       ///< [in,out] degree pattern
+        int& liftBound,            ///< [in,out] (adapted) lift bound
+        const CFList& uniFactors,  ///< [in] univariate factors
+        const ExtensionInfo& info, ///< [in] information about extension
+        const CanonicalForm& eval  ///< [in] evaluation point
                   );
 

factory/facHensel.cc

@@ -449 +449 @@
 
 CFList
-diophantine (const CanonicalForm& F, const CFList& factors, const modpk& b)
+diophantine (const CanonicalForm& F, const CanonicalForm& G,
+             const CFList& factors, modpk& b)
 {
   if (getCharacteristic() == 0)
@@ -497 +498 @@
 {
   modpk b= modpk();
-  return diophantine (F, factors, b);
+  return diophantine (F, 1, factors, b);
 }
 
@@ -724 +725 @@
 void
 henselLift12 (const CanonicalForm& F, CFList& factors, int l, CFArray& Pi,
-              CFList& diophant, CFMatrix& M, bool sort, const modpk& b)
+              CFList& diophant, CFMatrix& M, modpk& b, bool sort)
 {
   if (sort)
@@ -730 +731 @@
   Pi= CFArray (factors.length() - 1);
   CFListIterator j= factors;
-  diophant= diophantine (F[0], factors, b);
+  diophant= diophantine (F[0], F, factors, b);
   DEBOUTLN (cerr, "diophant= " << diophant);
   j++;
@@ -759 +760 @@
     k.getItem()= bufFactors[i];
   factors.removeFirst();
-  return;
+}
+
+void
+henselLift12 (const CanonicalForm& F, CFList& factors, int l, CFArray& Pi,
+              CFList& diophant, CFMatrix& M, bool sort)
+{
+  modpk dummy= modpk();
+  henselLift12 (F, factors, l, Pi, diophant, M, dummy, sort);
 }
 

factory/facHensel.h

@@ -48 +48 @@
               CFList& diophant,       ///< [in,out] result of diophantine()
               CFMatrix& M,            ///< [in,out] stores intermediate results
-              bool sort= true,        ///< [in] sort factors by degree in
+              modpk& b,               ///< [in] coeff bound
+              bool sort= true         ///< [in] sort factors by degree in
                                       ///< Variable(1)
-              const modpk& b= modpk ()///< [in] coeff bound
+             );
+
+/// Hensel lift from univariate to bivariate.
+///
+/// @sa henselLiftResume12(), henselLift23(), henselLiftResume(), henselLift()
+void
+henselLift12 (const CanonicalForm& F, ///< [in] compressed, bivariate poly
+              CFList& factors,        ///< [in, out] monic univariate factors of
+                                      ///< F, including leading coefficient as
+                                      ///< first element. Returns monic lifted
+                                      ///< factors without the leading
+                                      ///< coefficient
+              int l,                  ///< [in] lifting precision
+              CFArray& Pi,            ///< [in,out] stores intermediate results
+              CFList& diophant,       ///< [in,out] result of diophantine()
+              CFMatrix& M,            ///< [in,out] stores intermediate results
+              bool sort= true        ///< [in] sort factors by degree in
+                                      ///< Variable(1)
              );