Changeset 287cc8 in git for ntl/src/lzz_pXFactoring.c

Timestamp:

Jan 5, 2010, 5:51:13 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3c38b3810fd61108b01f123f5a91e13ccff52b20

Parents:

1d43d184dd871d77c1ba8e095d768f22a0fbe92f

Message:

ntl 5.5.2

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

File:

• ntl/src/lzz_pXFactoring.c (modified) (37 diffs)

ntl/src/lzz_pXFactoring.c

@@ -58 +58 @@
          d = deg(r)/p;
          f.rep.SetLength(d+1);
-         for (k = 0; k <= d; k++) 
+         for (k = 0; k <= d; k++)
             f.rep[k] = r.rep[k*p];
          m = m*p;
@@ -64 +64 @@
    } while (!finished);
 }
-         
+
 
 
@@ -143 +143 @@
 
 static
-void BuildMatrix(vec_vec_zz_p& M, 
+void BuildMatrix(vec_vec_zz_p& M,
                  long n, const zz_pX& g, const zz_pXModulus& F, long verbose)
 {
@@ -189 +189 @@
       return;
    }
-      
+
    zz_pX h;
 
@@ -209 +209 @@
 
    RecFindRoots(x, h);
-   div(h, f, h); 
+   div(h, f, h);
    RecFindRoots(x, h);
 }
@@ -224 +224 @@
 
 static
-void RandomBasisElt(zz_pX& g, const vec_long& D, 
+void RandomBasisElt(zz_pX& g, const vec_long& D,
                     const vec_vec_zz_p& M)
 {
@@ -263 +263 @@
 static
 void split(zz_pX& f1, zz_pX& g1, zz_pX& f2, zz_pX& g2,
-           const zz_pX& f, const zz_pX& g, 
+           const zz_pX& f, const zz_pX& g,
            const vec_zz_p& roots, long lo, long mid)
 {
@@ -284 +284 @@
 
    GCD(f1, a, f);
-   
+
    div(f2, f, f1);
 
@@ -347 +347 @@
 #endif
 
-   
+
 
 void SFBerlekamp(vec_zz_pX& factors, const zz_pX& ff, long verbose)
@@ -474 +474 @@
 
 static
-void ProcessTable(zz_pX& f, vec_pair_zz_pX_long& factors, 
+void ProcessTable(zz_pX& f, vec_pair_zz_pX_long& factors,
                   const zz_pXModulus& F, long limit, const vec_zz_pX& tbl,
                   long d, long verbose)
@@ -511 +511 @@
 
    while (2*d <= deg(t1)) {
-      GCD(t2, tbl[i], t1); 
+      GCD(t2, tbl[i], t1);
       if (deg(t2) > 0) {
          AddFactor(factors, t2, d, verbose);
@@ -526 +526 @@
 
 
-void TraceMap(zz_pX& w, const zz_pX& a, long d, const zz_pXModulus& F, 
+void TraceMap(zz_pX& w, const zz_pX& a, long d, const zz_pXModulus& F,
               const zz_pX& b)
 
@@ -540 +540 @@
    while (d) {
       if (d == 1) {
-         if (IsZero(w)) 
+         if (IsZero(w))
             w = y;
          else {
@@ -647 +647 @@
 long zz_pX_BlockingFactor = 10;
 
-void DDF(vec_pair_zz_pX_long& factors, const zz_pX& ff, const zz_pX& hh, 
+void DDF(vec_pair_zz_pX_long& factors, const zz_pX& ff, const zz_pX& hh,
          long verbose)
 {
@@ -659 +659 @@
 
    if (deg(f) == 0)
-      return; 
+      return;
 
    if (deg(f) == 1) {
@@ -666 +666 @@
    }
 
-   long CompTableSize = 2*SqrRoot(deg(f)); 
+   long CompTableSize = 2*SqrRoot(deg(f));
 
    long GCDTableSize = zz_pX_BlockingFactor;
@@ -706 +706 @@
 
          if (deg(f) < old_n) {
-            // f has changed 
+            // f has changed
 
             build(F, f);
@@ -746 +746 @@
    zz_pXModulus F;
    vec_zz_p roots;
-   
+
    build(F, f);
    long n = F.n;
@@ -777 +777 @@
    }
 }
-         
+
 
 void EDF(vec_zz_pX& factors, const zz_pX& ff, const zz_pX& bb,
@@ -808 +808 @@
    }
 
-   
+
    double t;
 
@@ -827 +827 @@
    long p = zz_p::modulus();
 
-   
+
    zz_pXModulus F;
    build(F, f);
@@ -899 +899 @@
    long p = zz_p::modulus();
 
-   
+
    zz_pXModulus F;
    build(F, f);
@@ -941 +941 @@
    }
 }
-   
+
 void CanZass(vec_pair_zz_pX_long& factors, const zz_pX& f, long verbose)
 {
@@ -1010 +1010 @@
 
 
-void TandemPowerCompose(zz_pX& y1, zz_pX& y2, const zz_pX& h, 
+void TandemPowerCompose(zz_pX& y1, zz_pX& y2, const zz_pX& h,
                         long q1, long q2, const zz_pXModulus& F)
 {
@@ -1089 +1089 @@
    long q1, q2, r1, r2;
 
-   q1 = fvec[fvec[u].link].val; 
+   q1 = fvec[fvec[u].link].val;
    q2 = fvec[fvec[u].link+1].val;
 
@@ -1098 +1098 @@
 }
 
-   
+
 
 
@@ -1106 +1106 @@
    // the common degree of the irreducible factors of f is computed
 {
-   if (F.n == 1 || IsX(h)) 
+   if (F.n == 1 || IsX(h))
       return 1;
 
@@ -1221 +1221 @@
 
 
-   q1 = fvec[fvec[u].link].val; 
+   q1 = fvec[fvec[u].link].val;
    q2 = fvec[fvec[u].link+1].val;
 
    TandemPowerCompose(h1, h2, h, q1, q2, F);
-   return RecIrredTest(fvec[u].link, h2, F, fvec) 
+   return RecIrredTest(fvec[u].link, h2, F, fvec)
           && RecIrredTest(fvec[u].link+1, h1, F, fvec);
 }
@@ -1237 +1237 @@
 
    build(F, f);
-   
+
    zz_pX h;
 
@@ -1263 +1263 @@
 
    build(F, f);
-   
+
    zz_pX h;
 
@@ -1510 +1510 @@
       zz_pXArgument H;
       build(H, h, F, 2*rootn);
-   
-   
+
+
       for (i = 1; i <= k-1; i++) {
-         (*BabyStepFile)(i) = h1; 
-   
+         (*BabyStepFile)(i) = h1;
+
          CompMod(h1, h1, H, F);
       }
    }
-   
+
 }
 
@@ -1561 +1561 @@
 }
 
-   
+
 
 
@@ -1651 +1651 @@
    }
 }
-      
+
 
 
@@ -1713 +1713 @@
 
          long i;
-         for (i = 1; i <= k-1; i++) 
+         for (i = 1; i <= k-1; i++)
             rem(BabyStep[i], BabyStep[i], F);
       }
@@ -1722 +1722 @@
    }
 
-   if (deg(f) > 0) 
+   if (deg(f) > 0)
       NewAddFactor(u, f, 0, verbose);
 
@@ -1777 +1777 @@
    NewProcessTable(factors, f, F, buf, size, first_d, 1, verbose);
 
-   if (deg(f) > 0) 
+   if (deg(f) > 0)
       NewAddFactor(factors, f, deg(f), verbose);
 }
-   
+
 
 
@@ -1812 +1812 @@
 }
 
-      
-
-      
+
+
+
 
 void NewDDF(vec_pair_zz_pX_long& factors,