Changeset 10b5cf in git

Timestamp:

Jan 9, 2014, 2:43:36 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

87b94594069607a5ab9e57ef4d0949d46cd26b64

Parents:

581ac1cf5cb5c2dd89cdcbcef7426758e27c3a60

git-author:

Martin Lee <martinlee84@web.de>2014-01-09 14:43:36+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-01-27 16:12:23+01:00

Message:

chg: removed/disable dead code

Location:

factory

Files:

• NTLconvert.cc (modified) (1 diff)
• NTLconvert.h (modified) (1 diff)
• canonicalform.cc (modified) (2 diffs)
• cf_char.cc (modified) (2 diffs)
• facFqBivar.h (modified) (1 diff)
• fac_util.cc (modified) (2 diffs)
• fac_util.h (modified) (1 diff)
• factory.template (modified) (1 diff)

factory/NTLconvert.cc

@@ -8 +8 @@
 #include "canonicalform.h"
 #include "cf_iter.h"
-#include "fac_berlekamp.h"
-#include "fac_cantzass.h"
-#include "fac_univar.h"
-#include "fac_multivar.h"
 #include "fac_sqrfree.h"
 #include "cf_algorithm.h"

factory/NTLconvert.h

@@ -9 +9 @@
 #include "canonicalform.h"
 #include "cf_iter.h"
-#include "fac_berlekamp.h"
-#include "fac_cantzass.h"
-#include "fac_univar.h"
-#include "fac_multivar.h"
 #include "fac_sqrfree.h"
 #include "cf_algorithm.h"

factory/canonicalform.cc

@@ -16 +16 @@
 #include "imm.h"
 #include "gfops.h"
-#include "cf_binom.h"
 
 #include <factory/cf_gmp.h>
@@ -42 +41 @@
 
         (void)initializeCharacteristic();
-        initPT();
         initialized = true;
     }

factory/cf_char.cc

@@ -12 +12 @@
 #include "int_pp.h"
 #include "cf_primes.h"
-#include "cf_binom.h"
 #include "cf_util.h"
 
@@ -41 +40 @@
         if (c > 536870909) factoryError("characteristic is too large(max is 2^29)");
         ff_setprime( c );
-        resetFPT();
     }
 }

factory/facFqBivar.h

@@ -27 +27 @@
 #include "cf_map.h"
 #include "cfNewtonPolygon.h"
+#include "fac_util.h"
 
 TIMING_DEFINE_PRINT(fac_fq_bi_sqrf)

factory/fac_util.cc

@@ -96 +96 @@
 
 CanonicalForm
-remainder( const CanonicalForm & f, const CanonicalForm & g, const modpk & pk )
-{
-    ASSERT( (f.inCoeffDomain() || f.isUnivariate()) && (g.inCoeffDomain() || g.isUnivariate()) && (f.inCoeffDomain() || g.inCoeffDomain() || f.mvar() == g.mvar()), "can not build remainder" );
-    if ( f.inCoeffDomain() )
-        if ( g.inCoeffDomain() )
-            return pk( f % g );
-        else
-            return pk( f );
-    else {
-        Variable x = f.mvar();
-        CanonicalForm result = f;
-        int degg = g.degree();
-        CanonicalForm invlcg = pk.inverse( g.lc() );
-        CanonicalForm gg = pk( g*invlcg );
-        if((gg.lc().isOne()))
-        {
-          while ( result.degree() >= degg )
-          {
-            result -= pk(lc( result ) * gg) * power( x, result.degree() - degg );
-            result=pk(result);
-          }
-        }
-        else
-        // no inverse found
-        {
-          CanonicalForm ic=icontent(g);
-          if (!ic.isOne())
-          {
-            gg=g/ic;
-            return remainder(f,gg,pk);
-          }
-          while ( result.degree() >= degg )
-          {
-            if (gg.lc().isZero()) return result;
-            CanonicalForm lcgf = result.lc() / gg.lc();
-            if (lcgf.inZ())
-              gg = pk( g*lcgf );
-            else
-            {
-              //printf("!\n\n");
-              return result;
-            }
-            result -=  gg * power( x, result.degree() - degg );
-            result=pk(result);
-          }
-        }
-        return result;
-    }
-}
-
-void
-divremainder( const CanonicalForm & f, const CanonicalForm & g, CanonicalForm & quot, CanonicalForm & rem, const modpk & pk )
-{
-    ASSERT( (f.inCoeffDomain() || f.isUnivariate()) && (g.inCoeffDomain() || g.isUnivariate()) && (f.inCoeffDomain() || g.inCoeffDomain() || f.mvar() == g.mvar()), "can not build remainder" );
-    if ( f.inCoeffDomain() )
-        if ( g.inCoeffDomain() ) {
-            divrem( f, g, quot, rem );
-            quot = pk( quot );
-            rem = pk( rem );
-        }
-        else {
-            quot = 0;
-            rem = pk( f );
-        }
-    else {
-        Variable x = f.mvar();
-        CanonicalForm invlcg = pk.inverse( g.lc() );
-        rem = f;
-        int degg = g.degree();
-        while ( rem.degree() >= degg ) {
-            quot += pk( lc( rem ) * invlcg ) * power( x, rem.degree() - degg );
-            rem = pk( rem - lc( rem ) * invlcg * g * power( x, rem.degree() - degg ) );
-        }
-    }
-}
-
-CanonicalForm
 mappksymmetric ( const CanonicalForm & f )
 {
@@ -188 +111 @@
 }
 
-void
-extgcd ( const CanonicalForm & a, const CanonicalForm & b, CanonicalForm & S, CanonicalForm & T, const modpk & pk )
-{
-    int p = pk.getp(), k = pk.getk(), j;
-    CanonicalForm amodp, bmodp, smodp, tmodp, s, t, sigma, tau, e;
-    CanonicalForm modulus = p, sigmat, taut, q;
-
-    setCharacteristic( p );
-    {
-        amodp = mapinto( a ); bmodp = mapinto( b );
-        (void)extgcd( amodp, bmodp, smodp, tmodp );
-    }
-    setCharacteristic( 0 );
-    s = mapinto( smodp ); t = mapinto( tmodp );
-
-    for ( j = 1; j < k; j++ ) {
-        e = ( 1 - s * a - t * b ) / modulus;
-        setCharacteristic( p );
-        {
-            e = mapinto( e );
-            sigmat = smodp * e;
-            taut = tmodp * e;
-            divrem( sigmat, bmodp, q, sigma );
-            tau = taut + q * amodp;
-        }
-        setCharacteristic( 0 );
-        s += mapinto( sigma ) * modulus;
-        t += mapinto( tau ) * modulus;
-        modulus *= p;
-    }
-    S = s; T = t;
-}
-
-CanonicalForm
-sum ( const CFArray & a, int f, int l )
-{
-    if ( f < a.min() ) f = a.min();
-    if ( l > a.max() ) l = a.max();
-    CanonicalForm s = 0;
-    for ( int i = f; i <= l; i++ )
-        s += a[i];
-    return s;
-}
-
-CanonicalForm
-prod ( const CFArray & a, int f, int l )
-{
-    if ( f < a.min() ) f = a.min();
-    if ( l > a.max() ) l = a.max();
-    CanonicalForm p = 1;
-    for ( int i = f; i <= l; i++ )
-        p *= a[i];
-    return p;
-}
-
-CanonicalForm
-sum ( const CFArray & a )
-{
-    return sum( a, a.min(), a.max() );
-}
-
-CanonicalForm
-prod ( const CFArray & a )
-{
-    return prod( a, a.min(), a.max() );
-}
-
-CanonicalForm
-crossprod ( const CFArray & a, const CFArray & b )
-{
-    ASSERT( a.size() == b.size(), "array size mismatch" );
-    CanonicalForm s = 0;
-    int fa = a.min();
-    int fb = b.min();
-    int n = a.max();
-    for ( ; fa <= n; fa++, fb++ )
-        s += a[fa] * b[fb];
-    return s;
-}

factory/fac_util.h

@@ -34 +34 @@
 CanonicalForm replaceLc( const CanonicalForm & f, const CanonicalForm & c );
 
-CanonicalForm remainder( const CanonicalForm & f, const CanonicalForm & g, const modpk & pk );
-
-void divremainder( const CanonicalForm & f, const CanonicalForm & g, CanonicalForm & quot, CanonicalForm & rem, const modpk & pk );
-
-bool Hensel ( const CanonicalForm & U, CFArray & G, const CFArray & lcG, const Evaluation & A, const modpk & bound, const Variable & x );
-
-/* some special array functions */
-
-CanonicalForm sum ( const CFArray & a, int f, int l );
-
-CanonicalForm prod ( const CFArray & a, int f, int l );
-
-CanonicalForm sum ( const CFArray & a );
-
-CanonicalForm prod ( const CFArray & a );
-
-CanonicalForm crossprod ( const CFArray & a, const CFArray & b );
-
 /*ENDPUBLIC*/
 

factory/factory.template

@@ -60 +60 @@
 
 /*MAKEHEADER PUBLIC ONLY*/
-#include "cf_binom.h"
-
-/*MAKEHEADER PUBLIC ONLY*/
 #include "cf_algorithm.h"