Changeset 36dfca in git

Timestamp:

Jul 25, 2014, 11:26:44 PM (9 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'a7324b6e0b44a1a8ed3fa4d9ca3e2ff210ddd52c')

Children:

98cbe2b76d99d0d8c6d6e622ecfd56074408441b

Parents:

61c8d2588fefcc1db6a5299b376ed9dad6a5a05c

Message:

fix for #628

Location:

factory

Files:

• cfModResultant.cc (modified) (1 diff)
• facAlgFunc.cc (modified) (3 diffs)

factory/cfModResultant.cc

@@ -490 +490 @@
 
     count++;
-    if (count > bound || (prob && equalCount == 2))
+    if (count > bound || (prob && equalCount == 2 && !H.isOne()))
     {
       if (!algExt && degree (H, alpha) <= 0)

factory/facAlgFunc.cc

@@ -30 +30 @@
 #include "cf_util.h"
 #include "cf_algorithm.h"
+#include "templates/ftmpl_functions.h"
 #include "cf_map.h"
 #include "cfModResultant.h"
@@ -375 +376 @@
         if (getCharacteristic() == 0)
           On (SW_RATIONAL);
-        h= swapvar (g, g.mvar(), oldR.mvar());
-        tmp= CFList (swapvar (R, g.mvar(), oldR.mvar()));
-        h= alg_gcd (h, swapvar (oldR, g.mvar(), oldR.mvar()), tmp);
-        CanonicalForm hh= replacevar (h, oldR.mvar(), alpha);
+        Variable v= Variable (tmax (g.level(), oldR.level()) + 1);
+        h= swapvar (g, oldR.mvar(), v);
+        tmp= CFList (R);
+        h= alg_gcd (h, swapvar (oldR, oldR.mvar(), v), tmp);
 
         CanonicalForm numinv, deninv;
@@ -393 +394 @@
         ra /= denra;
         denra= deninv/denra;
-        denra= replacevar (denra, ra.mvar(), g.mvar());
-        ra= replacevar(ra, ra.mvar(), g.mvar());
         rb= R.mvar()*denra-s*ra;
         denrb= denra;