Changeset 287cc8 in git for ntl/src/GF2EXFactoring.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/GF2EXFactoring.c (modified) (43 diffs)

ntl/src/GF2EXFactoring.c

@@ -29 +29 @@
    c = res;
 }
-   
+
 
 
@@ -79 +79 @@
          d = deg(r)/2;
          f.rep.SetLength(d+1);
-         for (k = 0; k <= d; k++) 
+         for (k = 0; k <= d; k++)
             IterSqr(f.rep[k], r.rep[k*2], GF2E::degree()-1);
          m = m*2;
@@ -85 +85 @@
    } while (!finished);
 }
-         
+
 
 
@@ -216 +216 @@
    SetX(res);
    long i;
-   for (i = 0; i < GF2E::degree(); i++) 
+   for (i = 0; i < GF2E::degree(); i++)
       SqrMod(res, res, F);
 
@@ -241 +241 @@
          long m1 = 2*m;
          if (i & d) m1++;
-   
+
          if (m1 >= NTL_BITS_PER_LONG-1 || (1L << m1) >= n) break;
-   
+
          m = m1;
          i = i >> 1;
@@ -290 +290 @@
          long m1 = 2*m;
          if (i & d) m1++;
-   
+
          if (m1 >= NTL_BITS_PER_LONG-1 || (1L << m1) >= n) break;
-   
+
          m = m1;
          i = i >> 1;
@@ -344 +344 @@
 
 
-   
+
 
 
@@ -359 +359 @@
       return;
    }
-      
+
    GF2EX h;
 
    GF2E r;
 
-   
+
    {
       GF2EXModulus F;
@@ -379 +379 @@
 
    RecFindRoots(x, h);
-   div(h, f, h); 
+   div(h, f, h);
    RecFindRoots(x, h);
 }
@@ -435 +435 @@
 static
 void split(GF2EX& f1, GF2EX& g1, GF2EX& f2, GF2EX& g2,
-           const GF2EX& f, const GF2EX& g, 
+           const GF2EX& f, const GF2EX& g,
            const vec_GF2E& roots, long lo, long mid)
 {
@@ -456 +456 @@
 
    GCD(f1, a, f);
-   
+
    div(f2, f, f1);
 
@@ -520 +520 @@
 
 
-   
+
 
 void SFBerlekamp(vec_GF2EX& factors, const GF2EX& ff, long verbose)
@@ -619 +619 @@
       Error("berlekamp: bad args");
 
-   
+
    SquareFreeDecomp(sfd, f);
 
@@ -644 +644 @@
 
 static
-void ProcessTable(GF2EX& f, vec_pair_GF2EX_long& factors, 
+void ProcessTable(GF2EX& f, vec_pair_GF2EX_long& factors,
                   const GF2EXModulus& F, long limit, const vec_GF2EX& tbl,
                   long d, long verbose)
@@ -681 +681 @@
 
    while (2*d <= deg(t1)) {
-      GCD(t2, tbl[i], t1); 
+      GCD(t2, tbl[i], t1);
       if (deg(t2) > 0) {
          AddFactor(factors, t2, d, verbose);
@@ -696 +696 @@
 
 
-void TraceMap(GF2EX& w, const GF2EX& a, long d, const GF2EXModulus& F, 
+void TraceMap(GF2EX& w, const GF2EX& a, long d, const GF2EXModulus& F,
               const GF2EX& b)
 
@@ -710 +710 @@
    while (d) {
       if (d == 1) {
-         if (IsZero(w)) 
+         if (IsZero(w))
             w = y;
          else {
@@ -817 +817 @@
 long GF2EX_BlockingFactor = 10;
 
-void DDF(vec_pair_GF2EX_long& factors, const GF2EX& ff, const GF2EX& hh, 
+void DDF(vec_pair_GF2EX_long& factors, const GF2EX& ff, const GF2EX& hh,
          long verbose)
 {
@@ -836 +836 @@
    }
 
-   long CompTableSize = 2*SqrRoot(deg(f)); 
+   long CompTableSize = 2*SqrRoot(deg(f));
 
    long GCDTableSize = GF2EX_BlockingFactor;
@@ -876 +876 @@
 
          if (deg(f) < old_n) {
-            // f has changed 
+            // f has changed
 
             build(F, f);
@@ -916 +916 @@
    GF2EXModulus F;
    vec_GF2E roots;
-   
+
    build(F, f);
    long n = F.n;
@@ -947 +947 @@
    }
 }
-         
+
 
 void EDF(vec_GF2EX& factors, const GF2EX& ff, const GF2EX& bb,
@@ -978 +978 @@
    }
 
-   
+
    factors.SetLength(0);
 
@@ -1008 +1008 @@
    double t;
 
-   
+
    GF2EXModulus F;
    build(F, f);
@@ -1050 +1050 @@
    }
 }
-   
+
 void CanZass(vec_pair_GF2EX_long& factors, const GF2EX& f, long verbose)
 {
@@ -1060 +1060 @@
    vec_GF2EX x;
 
-   
+
    SquareFreeDecomp(sfd, f);
 
@@ -1121 +1121 @@
 
 static
-void TandemPowerCompose(GF2EX& y1, GF2EX& y2, const GF2EX& h, 
+void TandemPowerCompose(GF2EX& y1, GF2EX& y2, const GF2EX& h,
                         long q1, long q2, const GF2EXModulus& F)
 {
@@ -1201 +1201 @@
    long q1, q2, r1, r2;
 
-   q1 = fvec[fvec[u].link].val; 
+   q1 = fvec[fvec[u].link].val;
    q2 = fvec[fvec[u].link+1].val;
 
@@ -1210 +1210 @@
 }
 
-   
+
 
 
@@ -1218 +1218 @@
    // 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;
 
@@ -1239 +1239 @@
 
    f = ff;
-   
+
    if (!IsOne(LeadCoeff(f)))
       Error("FindRoot: bad args");
@@ -1261 +1261 @@
       }
    }
- 
+
    root = ConstTerm(f);
 }
@@ -1308 +1308 @@
 
 
-   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);
 }
@@ -1324 +1324 @@
 
    build(F, f);
-   
+
    GF2EX h;
 
@@ -1350 +1350 @@
 
    build(F, f);
-   
+
    GF2EX h;
 
@@ -1672 +1672 @@
    long i;
 
-   long HexOutput = GF2X::HexOutput; 
+   long HexOutput = GF2X::HexOutput;
    GF2X::HexOutput = 1;
 
@@ -1708 +1708 @@
 }
 
-   
+
 
 
@@ -1778 +1778 @@
    }
 }
-      
+
 
 
@@ -1838 +1838 @@
 
          long i;
-         for (i = 1; i <= k-1; i++) 
+         for (i = 1; i <= k-1; i++)
             rem(BabyStep[i], BabyStep[i], F);
       }
@@ -1847 +1847 @@
    }
 
-   if (deg(f) > 0) 
+   if (deg(f) > 0)
       NewAddFactor(u, f, 0, verbose);
 
@@ -1902 +1902 @@
    NewProcessTable(factors, f, F, buf, size, first_d, 1, verbose);
 
-   if (deg(f) > 0) 
+   if (deg(f) > 0)
       NewAddFactor(factors, f, deg(f), verbose);
 }
-   
+
 
 
@@ -1935 +1935 @@
 }
 
-      
-      
-
-      
+
+
+
+
 
 void NewDDF(vec_pair_GF2EX_long& factors,
@@ -1962 +1962 @@
    if (!GF2EX_stem[0])
       sprintf(GF2EX_stem, "ddf-%ld", RandomBnd(10000));
-      
+
    long B = deg(f)/2;
    long k = SqrRoot(B);