Changeset 9d37f6 in git

Timestamp:

Jul 28, 2014, 9:36:28 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

8469042e02131cad32c6668f716c3559fc06182c8f3a6d803bd98461fd9197ffdf873d764d4d4c1b

Parents:

61c8d2588fefcc1db6a5299b376ed9dad6a5a05c98cbe2b76d99d0d8c6d6e622ecfd56074408441b

Message:

Merge pull request #622 from mmklee/tr628

Tr628

Files:

• Tst/Short.lst (modified) (1 diff)
• Tst/Short/bug_tr628.res.gz.uu (added)
• Tst/Short/bug_tr628.stat (added)
• Tst/Short/bug_tr628.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)
• factory/cfModResultant.cc (modified) (1 diff)
• factory/facAlgFunc.cc (modified) (3 diffs)

Tst/Short.lst

@@ -127 +127 @@
 Short/bug_tr489.tst
 Short/bug_tr549.tst
+Short/bug_tr628.tst
 Short/bug_x_i_j.tst
 Short/charseries.tst

Tst/Short/ok_s.lst

@@ -141 +141 @@
 bug_tr604
 bug_tr627
+bug_tr628
 bug_tr630
 bug_genus_etc

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;