Changeset b8f8ea in git for factory/cf_gcd_smallp.cc

Timestamp:

Apr 9, 2013, 3:24:54 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

84299e1e1d2b92c5e28fc52391cc529f8eb8ade7f8565ac2b56eae4e46fb63670efa1bc402ae3628

Parents:

8e48d4973dda2a880260a9e9a6e0705b49ab77960b447e5e0cc1cede9cfd6c91fab1752432a2bd62

Message:

Merge pull request #314 from mmklee/factory_bugfix_sw

Factory bugfix sw

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;