Changeset 52cccfd in git

Timestamp:

Apr 7, 2013, 1:36:31 AM (9 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')

Children:

803956e36bc486d4e8bb34f103dce728e5d1ea6f

Parents:

67f82efac7d435c72c77fbd667d017b0ad83a57e

git-author:

Martin Lee <martinlee84@web.de>2013-04-07 01:36:31+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-04-08 14:42:19+02:00

Message:

fix: int overflow

File:

• factory/cf_gcd_smallp.cc (modified) (3 diffs)

factory/cf_gcd_smallp.cc

@@ -383 +383 @@
   int p= getCharacteristic ();
   int d= degree (mipo);
-  int bound= ipower (p, d);
+  double bound= pow ((double) p, (double) d);
   do
   {
@@ -436 +436 @@
   CanonicalForm newMipo= convertNTLzzpX2CF (NTLIrredpoly, Variable (1));
   return rootOf (newMipo);
-}
-
-/// chooses a suitable extension of \f$ F_{p}(\alpha ) \f$
-/// we do not extend \f$ F_{p}(\alpha ) \f$ itself but extend \f$ F_{p} \f$ ,
-/// s.t. \f$ F_{p}(\alpha ) \subset F_{p}(\beta ) \f$
-static inline
-void choose_extension (const int& d, const int& num_vars, Variable& beta)
-{
-  int p= getCharacteristic();
-  if (p != fac_NTL_char)
-  {
-    fac_NTL_char= p;
-    zz_p::init (p);
-  }
-  zz_pX NTLirredpoly;
-  //TODO: replace d by max_{i} (deg_x{i}(f))
-  int i= (int) (log ((double) ipower (d + 1, num_vars))/log ((double) p));
-  int m= degree (getMipo (beta));
-  if (i <= 1)
-    i= 2;
-  BuildIrred (NTLirredpoly, i*m);
-  CanonicalForm mipo= convertNTLzzpX2CF (NTLirredpoly, Variable(1));
-  beta= rootOf (mipo);
 }
 
@@ -2253 +2230 @@
   GFRandom genGF;
   int p= getCharacteristic ();
-  int bound;
+  double bound;
   if (alpha != Variable (1))
   {
-    bound= ipower (p, degree (getMipo(alpha)));
-    bound= ipower (bound, k);
+    bound= pow ((double) p, (double) degree (getMipo(alpha)));
+    bound= pow (bound, (double) k);
   }
   else if (GF)
   {
-    bound= ipower (p, getGFDegree());
-    bound= ipower (bound, k);
+    bound= pow ((double) p, (double) getGFDegree());
+    bound= pow ((double) bound, (double) k);
   }
   else
-    bound= ipower (p, k);
+    bound= pow ((double) p, (double) k);
 
   CanonicalForm random;