Changeset 7e3d56 in git for factory

Timestamp:

Nov 22, 2012, 6:00:49 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5641361d547d954c224e5c07effaefe14c255070

Parents:

32a76d8ff1ea7276dcd4a51110cc4bfb4506c97f

git-author:

Martin Lee <martinlee84@web.de>2012-11-22 18:00:49+01:00

git-committer:

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

Message:

fix: computation of factor bound over Q(a)

File:

• factory/facBivar.cc (modified) (1 diff)

factory/facBivar.cc

@@ -102 +102 @@
         K *= degs[i] + 1;
     }
-    K /= power (CanonicalForm (2), k);
-    K= K.sqrt()+1;
+    K /= power (CanonicalForm (2), k/2);
     K *= power (CanonicalForm (2), M);
     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);
+       power (CanonicalForm (2), N)*
+       power (CanonicalForm (N+1), 4*N);
     b /= power (abs (lc (mipo)), N);
-
-    ZZX NTLmipo= convertFacCF2NTLZZX (mipo);
-    ZZX NTLLcf= convertFacCF2NTLZZX (Lc (f));
-    ZZ NTLf= resultant (NTLmipo, NTLLcf);
-    ZZ NTLD= discriminant (NTLmipo);
-    b /= abs (convertZZ2CF (NTLf))*abs (convertZZ2CF (NTLD));
 
     CanonicalForm B = p;