Changeset 35eb6c in git for factory/facAlgExt.cc

Timestamp:

Jun 20, 2011, 11:06:11 AM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fe2d4cb34f289f4b0611d2b5ac416c7bc1b2c60a

Parents:

37cf8fb52819b7a47cb628349e0830bf986d039a

Message:

compute norm now modular
changed handling of On (SW_RATIONAL)
changed NTL zz_p initalizations in cfModResultant.cc


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

File:

• factory/facAlgExt.cc (modified) (8 diffs)

factory/facAlgExt.cc

@@ -29 +29 @@
 #include "facFqBivarUtil.h"
 #include "facAlgExt.h"
+#include "cfModResultant.h"
 
 // squarefree part of F
 CanonicalForm
-sqrfPart (const CanonicalForm& F)
+uniSqrfPart (const CanonicalForm& F)
 {
   ASSERT (F.isUnivariate(), "univariate input expected");
@@ -50 +51 @@
   mipo= mipo (x, alpha);
 
-  CanonicalForm norm= resultant (g, mipo, x);
+  int degg= degree (g);
+  int degmipo= degree (mipo);
+  CanonicalForm norm;
+  if (degg >= 8 || degmipo >= 8)
+    norm= resultantZ (g, mipo, x);
+  else
+    norm= resultant (g, mipo, x);
+
   i= 0;
   int k;
@@ -64 +72 @@
       {
         g= F (y - i*alpha, y);
-        norm= resultant (g (x, alpha), mipo, x);
+        if (degg >= 8 || degmipo >= 8)
+          norm= resultantZ (g (x, alpha), mipo, x);
+        else
+          norm= resultant (g (x, alpha), mipo, x);
       }
       else
       {
         g= F (y + i*alpha, y);
-        norm= resultant (g (x, alpha), mipo, x);
+        if (degg >= 8 || degmipo >= 8)
+          norm= resultantZ (g (x, alpha), mipo, x);
+        else
+          norm= resultant (g (x, alpha), mipo, x);
       }
       if (degree (gcd (deriv (norm, y), norm)) <= 0)
@@ -89 +103 @@
   ASSERT (getCharacteristic() == 0, "characteristic 0 expected");
 
-  On (SW_RATIONAL);
-  CanonicalForm f= F;
+  if (!isOn (SW_RATIONAL))
+    On (SW_RATIONAL);
+  CanonicalForm f= F*bCommonDen (F);
   int shift;
   CanonicalForm norm= sqrfNorm (f, alpha, shift);
@@ -97 +112 @@
   CFList factors;
   if (normFactors.length() <= 2)
-    return CFList (f);
+    return CFList (F);
 
   normFactors.removeFirst();
@@ -116 +131 @@
   }
   ASSERT (degree (buf) <= 0, "incomplete factorization");
-  Off (SW_RATIONAL);
   return factors;
 }
@@ -126 +140 @@
   ASSERT (getCharacteristic() == 0, "characteristic 0 expected");
 
+
   if (F.inCoeffDomain())
     return CFFList (CFFactor (F, 1));
 
-  CanonicalForm sqrf= sqrfPart (F);
+  CanonicalForm sqrf= uniSqrfPart (F);
   CFList sqrfFactors= AlgExtSqrfFactorize (sqrf, alpha);
 
-  On (SW_RATIONAL);
+  if (!isOn (SW_RATIONAL))
+    On (SW_RATIONAL);
   CanonicalForm buf= F/Lc (F);
   CFFList factors;
@@ -147 +163 @@
     factors.append (CFFactor (i.getItem(), multi));
   }
-  Off (SW_RATIONAL);
   factors.insert (CFFactor (Lc(F), 1));
   ASSERT (degree (buf) <= 0, "bug in AlgExtFactorize");