Changeset fcf7587 in git for factory/cf_factor.cc

Timestamp:

Jun 22, 2011, 5:34:47 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f152c5a55feb4bb8f254f8c34262507cbe3c16f7

Parents:

c8c436dbaac87cb32807b78b08f51c4be97ab9f1

Message:

switched on new factorization and updated tests


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

File:

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

factory/cf_factor.cc

@@ -31 +31 @@
 #include "algext.h"
 #include "facAlgExt.h"
+#include "facFactorize.h"
+#include "singext.h"
 
 #include "int_int.h"
@@ -666 +668 @@
 CFFList factorize ( const CanonicalForm & f, const Variable & alpha )
 {
+  if ( f.inCoeffDomain() )
+    return CFFList( f );
   //out_cf("factorize:",f,"==================================\n");
   //out_cf("mipo:",getMipo(alpha),"\n");
@@ -795 +799 @@
 
   }
-  else if (f.isUnivariate() && ch == 0) // Q(a)[x]
+  else if (f.isUnivariate() && (ch == 0)) // Q(a)[x]
   {
     F= AlgExtFactorize (f, alpha);
@@ -801 +805 @@
   else //Q(a)[x1,...,xn]
   {
-      factoryError("not implemented");
+    F= ratFactorize (f, alpha);
   }
   if(isOn(SW_USE_NTL_SORT)) F.sort(cmpCF);