Changeset fa470e in git

Timestamp:

Jan 9, 2014, 2:45:12 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

ce6d1a6d88a8ba1991875ff81506304ecb7bbb10

Parents:

87b94594069607a5ab9e57ef4d0949d46cd26b64

git-author:

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

git-committer:

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

Message:

chg: disabled dead code for factorization

File:

• factory/cf_factor.cc (modified) (4 diffs)

factory/cf_factor.cc

@@ -20 +20 @@
 #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"
@@ -493 +490 @@
 #endif //HAVE_NTL
       {  // Use Factory without NTL
-        if ( isOn( SW_BERLEKAMP ) )
-          F=FpFactorizeUnivariateB( f, issqrfree );
-        else
-          F=FpFactorizeUnivariateCZ( f, issqrfree, 0, Variable(), Variable() );
+        factoryError ("uniivariate factorization not implemented");
+        return CFFList (CFFactor (f, 1));
       }
     }
@@ -573 +568 @@
           }
         }
-        //if ( F.getFirst().factor().isOne() )
-        //{
-        //  F.removeFirst();
-        //}
-        //printf("NTL:\n");out_cff(F);
-        //F=ZFactorizeUnivariate( fz, issqrfree );
-        //printf("fac.:\n");out_cff(F);
       }
       #else
       {
-        //Use Factory without NTL
-        //F = ZFactorizeUnivariate( fz, issqrfree );
-        factoryError ("univariate factorization over Z not implemented"); 
-        return CFFList (CFFactor (f, 1));
+        factoryError ("univariate factorization over Z not implemented"); 
+        return CFFList (CFFactor (f, 1));
       }
       #endif
@@ -739 +725 @@
     #endif
     {
-      F=FpFactorizeUnivariateCZ( f, false, 1, alpha, Variable() );
+      factoryError ("univariate factorization not implemented");
+      return CFFList (CFFactor (f, 1));
     }
   }