Changeset 50a2aa9 in git

Timestamp:

Jun 21, 2011, 12:42:12 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

64e7cb73f028e3866617e41d55fd0265168a395d

Parents:

8c1a84580fcaf92907fa2c80e52eec3de2d8a5c2

Message:

resultantZ needs polys over Z


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

File:

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

factory/facAlgExt.cc

@@ -50 +50 @@
   CanonicalForm mipo= getMipo (alpha);
   mipo= mipo (x, alpha);
+  mipo *= bCommonDen (mipo);
 
   int degg= degree (g);
@@ -72 +73 @@
       {
         g= F (y - i*alpha, y);
+        g *= bCommonDen (g);
         if (degg >= 8 || degmipo >= 8)
           norm= resultantZ (g (x, alpha), mipo, x);
@@ -80 +82 @@
       {
         g= F (y + i*alpha, y);
+        g *= bCommonDen (g);
         if (degg >= 8 || degmipo >= 8)
           norm= resultantZ (g (x, alpha), mipo, x);
@@ -109 +112 @@
   CanonicalForm norm= sqrfNorm (f, alpha, shift);
   ASSERT (degree (norm, alpha) <= 0, "wrong norm computed");
-  CFFList normFactors= factorize (norm); //maybe compute norm (not necessarily squarefree), split f and procede recursively
+  CFFList normFactors= factorize (norm);
   CFList factors;
   if (normFactors.length() <= 2)
@@ -151 +154 @@
   CFList sqrfFactors= AlgExtSqrfFactorize (sqrf, alpha);
 
-  if (!isOn (SW_RATIONAL))
-    On (SW_RATIONAL);
+  bool save_rat=!isOn (SW_RATIONAL);
+  On (SW_RATIONAL);
   CanonicalForm buf= F/Lc (F);
   CFFList factors;
@@ -169 +172 @@
   factors.insert (CFFactor (Lc(F), 1));
   ASSERT (degree (buf) <= 0, "bug in AlgExtFactorize");
+  if (save_rat) Off(SW_RATIONAL);
   return factors;
 }