Changeset b4af1b in git for factory/facBivar.cc

Timestamp:

Mar 9, 2012, 12:47:25 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f9da5e777f690b6f9e44916c1818b0b98c02a70b

Parents:

41fea7e7855abb0fa24d84704ca2690c219670fb

git-author:

Martin Lee <martinlee84@web.de>2012-03-09 12:47:25+01:00

git-committer:

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

Message:

chg: coeff bound for factorization over Q(a), now Hensel
     lifting is done over ZZ_p^k[t]/(f) for suitable p and k

File:

• factory/facBivar.cc (modified) (5 diffs)

factory/facBivar.cc

@@ -106 +106 @@
     int N= degree (mipo);
     CanonicalForm b;
-    b= 2*power (maxNorm (f), N)*power (maxNorm (mipo), 4*N)*K*power (CanonicalForm (2), N)*(CanonicalForm (M+1).sqrt()+1)*power (CanonicalForm (N+1).sqrt()+1, 7*N);
+    b= 2*power (maxNorm (f), N)*power (maxNorm (mipo), 4*N)*K*
+       power (CanonicalForm (2), N)*(CanonicalForm (M+1).sqrt()+1)*
+       power (CanonicalForm (N+1).sqrt()+1, 7*N);
     b /= power (abs (lc (mipo)), N);
 
@@ -358 +360 @@
     A= F;
 
+  CanonicalForm mipo;
+  if (extension)
+    mipo= getMipo (v);
+
   if (A.isUnivariate())
   {
@@ -612 +618 @@
   }
 
-
   if (degs.getLength() == 1) // A is irreducible
   {
@@ -645 +650 @@
     if (bb.getk() > b.getk() ) b=bb;
   }
+  else
+  {
+    A /= Lc (Aeval);
+    A *= bCommonDen (A);
+    // make factors elements of Z(a)[x] disable for modularDiophant
+    for (CFListIterator i= uniFactors; i.hasItem(); i++)
+      i.getItem()= i.getItem()*bCommonDen(i.getItem());
+    Off (SW_RATIONAL);
+    int i= 0;
+    ZZX NTLmipo= convertFacCF2NTLZZX (mipo);
+    CanonicalForm discMipo= convertZZ2CF (discriminant (NTLmipo));
+    findGoodPrime (F*discMipo,i);
+    findGoodPrime (Aeval*discMipo,i);
+    findGoodPrime (A*discMipo,i);
+
+    int p=cf_getBigPrime(i);
+    b = coeffBound( A, p, mipo );
+    modpk bb= coeffBound (Aeval, p, mipo);
+    if (bb.getk() > b.getk() ) b=bb;
+      bb= coeffBound (F, p, mipo);
+    if (bb.getk() > b.getk() ) b=bb;
+  }
 
   ExtensionInfo dummy= ExtensionInfo (false);
+  if (extension)
+    dummy= ExtensionInfo (v, false);
   bool earlySuccess= false;
   CFList earlyFactors;
   TIMING_START (fac_hensel_lift);
-  //maybe one should use a multiple of LC (A,1) and try a nonmonic lifting here?
   uniFactors= henselLiftAndEarly
               (A, earlySuccess, earlyFactors, degs, liftBound,
@@ -662 +690 @@
                                 uniFactors.length()/2, b);
 
-  if (!extension)
-    On (SW_RATIONAL);
+  On (SW_RATIONAL);
 
   if (earlySuccess)