Changeset 8c3e8c in git

Timestamp:

Jul 3, 2020, 2:40:19 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

cbdf0e507d7f2e431e05eeee9c7e8a7437d2c9c8

Parents:

175dfbe8022a34e8c7eab0e37ca15b932dbcb243

Message:

factory: find_irreducible

Location:

factory

Files:

• cf_irred.cc (modified) (2 diffs)
• facAlgFuncUtil.cc (modified) (1 diff)

factory/cf_irred.cc

@@ -27 +27 @@
 }
 
-CanonicalForm
-find_irreducible ( int deg, CFRandom & gen, const Variable & x )
-{
-    CanonicalForm result;
-    int i;
-    do {
-        result = power( x, deg );
-        for ( i = deg-1; i >= 0; i-- )
-            result += gen.generate() * power( x, i );
-    } while ( ! is_irreducible( result ) );
-    return result;
-}
-
 #if defined(HAVE_NTL) || defined(HAVE_FLINT)
 /// computes a random monic irreducible univariate polynomial in x over Fp of
@@ -65 +52 @@
   return CFirredpoly;
 }
+#else
+CanonicalForm
+find_irreducible ( int deg, CFRandom & gen, const Variable & x )
+{
+    CanonicalForm result;
+    int i;
+    do {
+        result = power( x, deg );
+        for ( i = deg-1; i >= 0; i-- )
+            result += gen.generate() * power( x, i );
+    } while ( ! is_irreducible( result ) );
+    return result;
+}
 #endif

factory/facAlgFuncUtil.cc

@@ -90 +90 @@
 generateMipo (int degOfExt)
 {
-#ifndef HAVE_NTL
+#if defined(HAVE_NTL) || defined(HAVE_FLINT)
+  return randomIrredpoly (degOfExt, Variable (1));
+#else
   FFRandom gen;
   return find_irreducible (degOfExt, gen, Variable (1));
-#else
-  return randomIrredpoly (degOfExt, Variable (1));
 #endif
 }