Changeset 0349c20 in git

Timestamp:

Sep 1, 2011, 3:40:30 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

38ffb7aa68530ae0bcc0c2bb95142f15951ff00c

Parents:

380a9b6e945b3b23b3197f3b6692bf955b0c0301

Message:

deleted unused cf_gcd_charp.cc, cfGEval.*, ffreval.*
deleted factorization over Fp from fac_multivar.cc
deleted some unused parameters


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

Files:

• Singular/misc_ip.cc (modified) (1 diff)
• factory/GNUmakefile.in (modified) (4 diffs)
• factory/cfGEval.cc (deleted)
• factory/cfGEval.h (deleted)
• factory/cf_defs.h (modified) (1 diff)
• factory/cf_gcd.cc (modified) (6 diffs)
• factory/cf_gcd_charp.cc (deleted)
• factory/cf_gcd_smallp.cc (modified) (3 diffs)
• factory/cf_switches.h (modified) (1 diff)
• factory/facFqBivar.cc (modified) (1 diff)
• factory/facFqSquarefree.cc (modified) (2 diffs)
• factory/fac_ezgcd.cc (modified) (1 diff)
• factory/fac_multivar.cc (modified) (1 diff)
• factory/ffreval.cc (deleted)
• factory/ffreval.h (deleted)
• factory/int_cf.cc (modified) (7 diffs)
• factory/int_int.h (modified) (2 diffs)
• factory/int_poly.h (modified) (4 diffs)

Singular/misc_ip.cc

@@ -1076 +1076 @@
 // factory default settings: -----------------------------------------------
   On(SW_USE_NTL);
-  Off(SW_USE_GCD_P);
   On(SW_USE_NTL_GCD_0); // On -> seg11 in Old/algnorm, Old/factor...
   On(SW_USE_NTL_GCD_P); // On -> cyle in Short/brnoeth_s: fixed

factory/GNUmakefile.in

@@ -139 +139 @@
                 cf_factory.cc \
                 cf_gcd.cc \
-                cf_gcd_charp.cc \
                 cf_gcd_smallp.cc \
                 cf_generator.cc \
-                cfGEval.cc \
                 cf_globals.cc \
                 cf_hnf.cc \
@@ -186 +184 @@
                 fieldGCD.cc \
                 ffops.cc \
-                ffreval.cc \
                 gf_tabutil.cc \
                 gfops.cc \
@@ -235 +232 @@
                 cf_factory.h \
                 cf_generator.h \
-                cfGEval.h \
                 cf_globals.h \
                 cf_gcd_smallp.h \
@@ -273 +269 @@
                 fieldGCD.h \
                 ffops.h \
-                ffreval.h \
                 ftmpl_list.h \
                 ftmpl_matrix.h \

factory/cf_defs.h

@@ -41 +41 @@
 const int SW_USE_NTL_SORT=12;
 const int SW_USE_CHINREM_GCD=13;
-const int SW_USE_GCD_P=14;
-const int SW_USE_QGCD=15;
-const int SW_USE_fieldGCD=16;
-const int SW_USE_FF_MOD_GCD=17;
+const int SW_USE_QGCD=14;
+const int SW_USE_fieldGCD=15;
+const int SW_USE_FF_MOD_GCD=16;
 //}}}
 

factory/cf_gcd.cc

@@ -16 +16 @@
 #include "fac_util.h"
 #include "templates/ftmpl_functions.h"
-#include "ffreval.h"
 #include "algext.h"
 #include "fieldGCD.h"
@@ -32 +31 @@
 
 static CanonicalForm cf_content ( const CanonicalForm &, const CanonicalForm & );
-static bool gcd_avoid_mtaildegree ( CanonicalForm &, CanonicalForm &, CanonicalForm & );
 static void cf_prepgcd( const CanonicalForm &, const CanonicalForm &, int &, int &, int & );
 
@@ -38 +36 @@
 
 CanonicalForm chinrem_gcd(const CanonicalForm & FF,const CanonicalForm & GG);
-CanonicalForm newGCD(CanonicalForm A, CanonicalForm B);
 
 bool
@@ -534 +531 @@
     if ( !( pi.isUnivariate() && pi1.isUnivariate() ) )
     {
-        //out_cf("F:",f,"\n");
-        //out_cf("G:",g,"\n");
-        //out_cf("newGCD:",newGCD(f,g),"\n");
-        if (isOn(SW_USE_GCD_P) && (getCharacteristic()>0))
-        {
-          return newGCD(f,g);
-        }
         if ( gcd_test_one( pi1, pi, true ) )
         {
@@ -714 +704 @@
       fc= EZGCD_P (fc, gc);
     }
-    #endif
-    else if (isOn(SW_USE_GCD_P))
-    {
-      fc=newGCD(fc,gc);
-    }
-    #ifdef HAVE_NTL
     else if (isOn(SW_USE_FF_MOD_GCD) && !fc_and_gc_Univariate)
     {
@@ -1057 +1041 @@
 #endif
 
-static bool
-gcd_avoid_mtaildegree ( CanonicalForm & f1, CanonicalForm & g1, CanonicalForm & d1 )
-{
-    bool rdy = true;
-    int df = f1.taildegree();
-    int dg = g1.taildegree();
-
-    d1 = d1.genOne();
-    if ( dg == 0 )
-    {
-        if ( df == 0 )
-            return false;
-        else
-        {
-            if ( f1.degree() == df )
-                d1 = cf_content( g1, LC( f1 ) );
-            else
-            {
-                f1 /= power( f1.mvar(), df );
-                rdy = false;
-            }
-        }
-    }
-    else
-    {
-        if ( df == 0)
-        {
-            if ( g1.degree() == dg )
-                d1 = cf_content( f1, LC( g1 ) );
-            else
-            {
-                g1 /= power( g1.mvar(), dg );
-                rdy = false;
-            }
-        }
-        else
-        {
-            if ( df > dg )
-                d1 = power( f1.mvar(), dg );
-            else
-                d1 = power( f1.mvar(), df );
-            if ( f1.degree() == df )
-            {
-                if (g1.degree() == dg)
-                    d1 *= gcd( LC( f1 ), LC( g1 ) );
-                else
-                {
-                    g1 /= power( g1.mvar(), dg);
-                    d1 *= cf_content( g1, LC( f1 ) );
-                }
-            }
-            else
-            {
-                f1 /= power( f1.mvar(), df );
-                if ( g1.degree() == dg )
-                    d1 *= cf_content( f1, LC( g1 ) );
-                else
-                {
-                    g1 /= power( g1.mvar(), dg );
-                    rdy = false;
-                }
-            }
-        }
-    }
-    return rdy;
-}
-
 /*
 *  compute positions p1 and pe of optimal variables:

factory/cf_gcd_smallp.cc

@@ -30 +30 @@
 #include "templates/ftmpl_functions.h"
 #include "cf_random.h"
-#include "ffreval.h"
+#include "cf_reval.h"
 #include "facHensel.h"
 
@@ -3996 +3996 @@
 static inline
 int Hensel_P (const CanonicalForm & UU, CFArray & G, const Evaluation & AA,
-                const Variable & x, const CFArray& LeadCoeffs )
+              const CFArray& LeadCoeffs )
 {
   CFList factors;
@@ -4510 +4510 @@
       }
 
-      gcdfound= Hensel_P (B*lcD, DD, b, x, lcDD);
+      gcdfound= Hensel_P (B*lcD, DD, b, lcDD);
 
       if (gcdfound == -1)

factory/cf_switches.h

@@ -19 +19 @@
 //
 //}}}
-const int CFSwitchesMax = 18;
+const int CFSwitchesMax = 17;
 //}}}
 

factory/facFqBivar.cc

@@ -2003 +2003 @@
 CFList
 increasePrecision (CanonicalForm& F, CFList& factors, int factorsFound,
-                   int oldNumCols, int oldL, const Variable& alpha,
+                   int oldNumCols, int oldL, const Variable&,
                    int precision
                   )

factory/facFqSquarefree.cc

@@ -72 +72 @@
 static inline
 CFFList
-sqrfPosDer (const CanonicalForm & F, const Variable & x, const int & k,
-            const Variable & alpha, CanonicalForm & c)
-{
-  Variable buf= alpha;
+sqrfPosDer (const CanonicalForm & F, const Variable & x,
+            CanonicalForm & c)
+{
   CanonicalForm b= deriv (F, x);
   c= gcd (F, b);
@@ -131 +130 @@
     if (degree (deriv (A, buf)) >= 0)
     {
-      if (GF)
-        tmp1= sqrfPosDer (A, buf, k, alpha, tmp);
-      else if (GF == false && alpha.level() != 1)
-        tmp1= sqrfPosDer (A, buf, k, alpha, tmp);
-      else
-        tmp1= sqrfPosDer (A, buf, 1, alpha, tmp);
+      tmp1= sqrfPosDer (A, buf, tmp);
       A= tmp;
       for (CFFListIterator j= tmp1; j.hasItem(); j++)

factory/fac_ezgcd.cc

@@ -237 +237 @@
         // (means: bad evaluation point).  Try again with another
         // evaluation point.  Bug fix (?) by JS.  The bad example was
-        // gcd.debug -ocr /+USE_EZGCD/@12/CB \
-        //     '(16*B^8-208*B^6*C+927*B^4*C^2-1512*B^2*C^3+432*C^4)' \
+        // gcd.debug -ocr /+USE_EZGCD/@12/CB
+        //     '(16*B^8-208*B^6*C+927*B^4*C^2-1512*B^2*C^3+432*C^4)'
         //     '(4*B^7*C^2-50*B^5*C^3+208*B^3*C^4-288*B*C^5)'
         b.nextpoint();

factory/fac_multivar.cc

@@ -401 +401 @@
     return R;
 }
-
-static CFArray FpFactorizeMulti ( const CanonicalForm & arg )
-{
-    DEBINCLEVEL( cerr, "FpFactorizeMulti" );
-    CFMap M;
-    CanonicalForm UU, U = compress( arg, M );
-    CanonicalForm delta, omega, V = LC( U, 1 );
-    int t = U.level();
-    CFFList F = factorize( V );
-    CFFListIterator I, J;
-    CFArray G, lcG, D;
-    int i, j, r, maxdeg;
-    REvaluation A( 2, t, FFRandom() );
-    CanonicalForm U0;
-    CanonicalForm ft, ut, gt, d;
-    modpk b;
-    bool negate = false;
-
-    DEBOUTLN( cerr, "-----------------------------------------------------" );
-    DEBOUTLN( cerr, "trying to factorize U = " << U );
-    DEBOUTLN( cerr, "U is a polynomial of level = " << arg.level() );
-    DEBOUTLN( cerr, "U will be factorized with respect to variable " << Variable(1) );
-    DEBOUTLN( cerr, "the leading coefficient of U with respect to that variable is " << V );
-    DEBOUTLN( cerr, "which is factorized as " << F );
-
-    maxdeg = 0;
-    for ( i = 2; i <= t; i++ )
-    {
-        j = U.degree( Variable( i ) );
-        if ( j > maxdeg ) maxdeg = j;
-    }
-
-    if ( F.getFirst().factor().inCoeffDomain() )
-    {
-        omega = F.getFirst().factor();
-        F.removeFirst();
-        if ( omega < 0 )
-        {
-            negate = true;
-            omega = -omega;
-            U = -U;
-        }
-    }
-    else
-        omega = 1;
-
-    bool goodeval = false;
-    r = 0;
-
-//    for ( i = 0; i < 10*t; i++ )
-//        A.nextpoint();
-
-    while ( ! goodeval )
-    {
-        TIMING_START(fac_findeval);
-        findEvaluation( U, V, omega, F, A, U0, delta, D, r );
-        TIMING_END(fac_findeval);
-        DEBOUTLN( cerr, "the evaluation point to reduce to an univariate problem is " << A );
-        DEBOUTLN( cerr, "corresponding delta = " << delta );
-        DEBOUTLN( cerr, "              omega = " << omega );
-        DEBOUTLN( cerr, "              D     = " << D );
-        DEBOUTLN( cerr, "now factorize the univariate polynomial " << U0 );
-        G = conv_to_factor_array( factorize( U0, false ) );
-        printf("conv_to_factor_array\n");
-        DEBOUTLN( cerr, "which factorizes into " << G );
-
-        r = G.size();
-        lcG = CFArray( 1, r );
-        UU = U;
-        //if ( goodeval )
-        {
-            printf("start hensel\n");
-            TIMING_START(fac_hensel);
-            goodeval = Hensel( UU, G, lcG, A, b, Variable(1) );
-            TIMING_END(fac_hensel);
-        }
-    }
-    for ( i = 1; i <= r; i++ )
-    {
-        G[i] /= icontent( G[i] );
-        G[i] = M(G[i]);
-    }
-    // negate noch beachten !
-    if ( negate )
-        G[1] = -G[1];
-    DEBDECLEVEL( cerr, "ZFactorMulti" );
-    return G;
-}
-CFFList FpFactorizeMultivariate ( const CanonicalForm & f, bool issqrfree )
-{
-    CFFList G, F, R;
-    CFArray GG;
-    CFFListIterator i, j;
-    CFMap M;
-    CanonicalForm g, cont;
-    Variable v1, vm;
-    int k, m, n;
-
-    v1 = Variable(1);
-    if ( issqrfree )
-        F = CFFactor( f, 1 );
-    else
-        F = sqrFree( f );
-
-    for ( i = F; i.hasItem(); i++ )
-    {
-        if ( i.getItem().factor().inCoeffDomain() )
-        {
-            if ( ! i.getItem().factor().isOne() )
-                R.append( CFFactor( i.getItem().factor(), i.getItem().exp() ) );
-        }
-        else
-        {
-            TIMING_START(fac_content);
-            g = compress( i.getItem().factor(), M );
-            // now after compress g contains Variable(1)
-            vm = g.mvar();
-            g = swapvar( g, v1, vm );
-            cont = content( g );
-            g = swapvar( g / cont, v1, vm );
-            cont = swapvar( cont, v1, vm );
-            n = i.getItem().exp();
-            TIMING_END(fac_content);
-            DEBOUTLN( cerr, "now after content ..." );
-            if ( g.isUnivariate() )
-            {
-                G = factorize( g, true );
-                for ( j = G; j.hasItem(); j++ )
-                    if ( ! j.getItem().factor().isOne() )
-                        R.append( CFFactor( M( j.getItem().factor() ), n ) );
-            }
-            else
-            {
-                GG = FpFactorizeMulti( g );
-                m = GG.max();
-                for ( k = GG.min(); k <= m; k++ )
-                    if ( ! GG[k].isOne() )
-                        R.append( CFFactor( M( GG[k] ), n ) );
-            }
-            G = factorize( cont, true );
-            for ( j = G; j.hasItem(); j++ )
-                if ( ! j.getItem().factor().isOne() )
-                    R.append( CFFactor( M( j.getItem().factor() ), n ) );
-        }
-    }
-    return R;
-}

factory/int_cf.cc

@@ -175 +175 @@
 
 InternalCF*
-InternalCF::tryMulsame( InternalCF* F, const CanonicalForm& M)
+InternalCF::tryMulsame( InternalCF*, const CanonicalForm&)
 {
     ASSERT1( 0, "tryMulsame() not implemented for class %s", this->classname() );
@@ -182 +182 @@
 
 InternalCF*
-InternalCF::tryInvert ( const CanonicalForm& M, bool& fail)
+InternalCF::tryInvert ( const CanonicalForm&, bool&)
 {
     ASSERT1( 0, "tryInvert() not implemented for class %s", this->classname() );
@@ -189 +189 @@
 
 bool
-InternalCF::tryDivremsamet ( InternalCF* F, InternalCF*& S, InternalCF*& T, const CanonicalForm& M, bool& fail)
+InternalCF::tryDivremsamet ( InternalCF*, InternalCF*&, InternalCF*&, const CanonicalForm&, bool&)
 {
     ASSERT1( 0, "tryDivremsamet() not implemented for class %s", this->classname() );
@@ -196 +196 @@
 
 bool
-InternalCF::tryDivremcoefft ( InternalCF* F, InternalCF*& S, InternalCF*& T, bool invert, const CanonicalForm& M, bool& fail)
+InternalCF::tryDivremcoefft ( InternalCF*, InternalCF*&, InternalCF*&, bool, const CanonicalForm&, bool&)
 {
     ASSERT1( 0, "tryDivremcoefft() not implemented for class %s", this->classname() );
@@ -203 +203 @@
 
 InternalCF*
-InternalCF::tryDivsame ( InternalCF* F, const CanonicalForm& M, bool& fail)
+InternalCF::tryDivsame ( InternalCF*, const CanonicalForm&, bool&)
 {
     ASSERT1( 0, "tryDivsame() not implemented for class %s", this->classname() );
@@ -210 +210 @@
 
 InternalCF*
-InternalCF::tryDivcoeff ( InternalCF* F, bool invert, const CanonicalForm& M, bool& fail)
+InternalCF::tryDivcoeff ( InternalCF*, bool, const CanonicalForm&, bool&)
 {
     ASSERT1( 0, "tryDivcoeff() not implemented for class %s", this->classname() );
@@ -217 +217 @@
 
 InternalCF*
-InternalCF::tryDividecoeff ( InternalCF* F, bool invert, const CanonicalForm& M, bool& fail)
+InternalCF::tryDividecoeff ( InternalCF*, bool, const CanonicalForm&, bool&)
 {
     ASSERT1( 0, "tryDividecoeff() not implemented for class %s", this->classname() );

factory/int_int.h

@@ -46 +46 @@
 public:
 #ifdef HAVE_OMALLOC
-  void* operator new(size_t size)
+  void* operator new(size_t)
     {
       void* addr;
@@ -52 +52 @@
       return addr;
     }
-  void operator delete(void* addr, size_t size)
+  void operator delete(void* addr, size_t)
     {
       omFreeBin(addr, InternalInteger_bin);

factory/int_poly.h

@@ -41 +41 @@
     friend class CFIterator;
 #ifdef HAVE_OMALLOC
-  void* operator new(size_t size)
+  void* operator new(size_t)
     {
       void* addr;
@@ -47 +47 @@
       return addr;
     }
-  void operator delete(void* addr, size_t size)
+  void operator delete(void* addr, size_t)
     {
       omFreeBin(addr, term_bin);
@@ -142 +142 @@
 #ifdef HAVE_OMALLOC
   static const omBin InternalPoly_bin;
-  void* operator new(size_t size)
+  void* operator new(size_t)
     {
       void* addr;
@@ -148 +148 @@
       return addr;
     }
-  void operator delete(void* addr, size_t size)
+  void operator delete(void* addr, size_t)
     {
       omFreeBin(addr, InternalPoly_bin);