Changeset a199a3 in git

Timestamp:

Mar 7, 2014, 12:29:42 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

ba613995ddff08ba13beb2499b6e5336d7ecb483

Parents:

d221a2f14103ce45b583cfa80f40efc541b8a20c

git-author:

Martin Lee <martinlee84@web.de>2014-03-07 12:29:42+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-03-17 18:31:53+01:00

Message:

chg: use modular resultant in alg_factor

File:

• factory/libfac/charset/alg_factor.cc (modified) (2 diffs)

factory/libfac/charset/alg_factor.cc

@@ -78 +78 @@
 }
 
-// replacement for factory's broken resultant
 static CanonicalForm
 resultante( const CanonicalForm & f, const CanonicalForm& g, const Variable & v )
@@ -89 +88 @@
   CanonicalForm gz = g * cd;
   if (!on_rational)  Off(SW_RATIONAL);
-
-  return resultant(fz,gz,v);
+  CanonicalForm result;
+  if (getCharacteristic() == 0)
+    result= resultantZ (fz, gz,v);
+  else
+    result= resultant (fz,gz,v);
+
+  return result;
 }