Changeset 04dd0c in git

Timestamp:

Jun 17, 2010, 2:49:49 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

fecc08cb1fbac7aebf01c221287ec9360849a8b4

Parents:

547f6439fcbe82be0ab53e3707bf2e0d4fbc7872

Message:

minor changes


git-svn-id: file:///usr/local/Singular/svn/trunk@12875 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

factory/cf_gcd_smallp.cc

@@ -31 +31 @@
 #include "cf_random.h"
 
-// inline helper functions:
+// iinline helper functions:
 #include "cf_map_ext.h"
 
 #ifdef HAVE_NTL
 #include <NTL/ZZ_pEX.h>
+#include <NTLconvert.h>
 #endif
 
@@ -45 +46 @@
 /// compressing two polynomials F and G, M is used for compressing, 
 /// N to reverse the compression
+static inline
 int myCompress (const CanonicalForm& F, const CanonicalForm& G, CFMap & M,
                 CFMap & N, bool& top_level) 
@@ -335 +337 @@
 /// based on Alg. 7.2. as described in "Algorithms for
 /// Computer Algebra" by Geddes, Czapor, Labahn
-CanonicalForm 
+static inline CanonicalForm 
 GCD_Fp_extension (const CanonicalForm& F, const CanonicalForm& G, 
                   Variable & alpha, CFList& l, bool& top_level) 
@@ -436 +438 @@
 
       DEBOUTLN (cerr, "getMipo (alpha)= " << getMipo (alpha));
-      DEBOUTLN (cerr, "getMipo (alpha)= " << getMipo (V_buf2));
+      DEBOUTLN (cerr, "getMipo (V_buf2)= " << getMipo (V_buf2));
       inextension= true;
       for (CFListIterator i= l; i.hasItem(); i++) 
@@ -535 +537 @@
 /// univariate polynomial, returns fail if there are no field elements left
 /// which have not been used before
+static inline
 CanonicalForm
 GFRandomElement (const CanonicalForm& F, CFList& list, bool& fail)
@@ -574 +577 @@
 /// faster field arithmetics, however it might fail if the input is large since
 /// the size of the base field is bounded by 2^16, output is monic
+inline
 CanonicalForm 
 GCD_GF (const CanonicalForm& F, const CanonicalForm& G, CFList& l, 
@@ -663 +667 @@
       num_vars--;
       p= getCharacteristic();
-      expon= floor ((log ((double) ipower (d + 1, num_vars))/log ((double) p)));
+      expon= (int) floor ((log ((double) ipower (d + 1, num_vars))/log ((double) p)));
       if (expon < 2)
         expon= 2;
@@ -671 +675 @@
       else 
       {
-        expon= floor((log ((double)((1<<16) - 1)))/(log((double)p)*kk));
+        expon= (int) floor((log ((double)((1<<16) - 1)))/(log((double)p)*kk));
         ASSERT (expon >= 2, "not enough points in GCD_GF");
         setCharacteristic (p, (int)(kk*expon), 'b');
@@ -777 +781 @@
 /// computes a random monic irreducible univariate polynomial of random 
 /// degree < i in x which does not divide F
+static inline
 CanonicalForm 
-randomIrredpoly (int i, const Variable & x, 
-                 CFList & list) 
+randomIrredpoly (int i, const Variable & x) 
 {
-  int random;
   int p= getCharacteristic();
   ZZ NTLp= to_ZZ (p);
@@ -787 +790 @@
   ZZ_pX NTLirredpoly; 
   CanonicalForm CFirredpoly;
-  int buf= ceil((log((double) i) / log((double) p)));
-  buf= buf + 1;
-  int bound= 0;
-  //lower bound on the number of monic irreducibles of degree less than buf
-  for (int j= 2; j < buf; j++) 
-    bound += ((ipower (p, j) - 2*ipower(p, j/2)) / j);
-  if (list.length() > bound) 
-  {
-    if (buf > 1)
-      buf--;
-    buf *= 2;
-    buf++;
-  }
-  for (int j=  ((buf - 1)/2) + 1; j < buf; j++) 
-    bound += ((ipower (p, j) - 2*ipower(p, j/2)) / j);
-  do 
-  {
-    if (list.length() <= bound) 
-    {
-      random= factoryrandom ((int) buf);  
-      if (random <= 1)
-        random= 2;
-    }
-    else 
-    {
-      if (buf > 1) 
-        buf--;
-      buf *= 2;
-      buf++;
-      for (int j= ((int) (buf - 1)/2) + 1; j < buf; j++) 
-        bound += ((ipower (p, j) - 2*ipower(p, j/2)) / j);
-      random= factoryrandom ((int) buf);
-      if (random <= 1)
-        random= 2;
-    } 
-    BuildIrred (NTLirredpoly, random);
-    CFirredpoly= convertNTLZZpX2CF (NTLirredpoly, x);
-  } while (find (list, CFirredpoly));
+  BuildIrred (NTLirredpoly, i + 1);
+  CFirredpoly= convertNTLZZpX2CF (NTLirredpoly, x);
   return CFirredpoly;
 } 
 
+static inline
 CanonicalForm
 FpRandomElement (const CanonicalForm& F, CFList& list, bool& fail)
@@ -861 +829 @@
 }
 
+static inline
 CanonicalForm GCD_small_p (const CanonicalForm& F, const CanonicalForm&  G, 
                            bool& top_level, CFList& l) 
@@ -977 +946 @@
       int deg= 3;
       do {
-        mipo= randomIrredpoly (deg, x, list); 
+        mipo= randomIrredpoly (deg, x); 
         alpha= rootOf (mipo);
         inextension= true;
@@ -1069 +1038 @@
       d= d0;
     }
-   
+     
     TIMING_START (newton_interpolation);
     H= newtonInterp (random_element, G_random_element, newtonPoly, G_m, x);