Changeset 64e7cb in git for factory/facHensel.cc

Timestamp:

Jun 22, 2011, 12:19:52 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

6f30b8f0100530412045adfaaae98447428ef7fb

Parents:

50a2aa95106a901b7b3b189d3724a19e186db0f7

Message:

prepare Hensel lifting for char= 0 case


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

File:

• factory/facHensel.cc (modified) (4 diffs)

factory/facHensel.cc

@@ -36 +36 @@
 mulNTL (const CanonicalForm& F, const CanonicalForm& G)
 {
-  if (F.inCoeffDomain() || G.inCoeffDomain())
+  if (F.inCoeffDomain() || G.inCoeffDomain() || getCharacteristic() == 0)
     return F*G;
   ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
@@ -74 +74 @@
     return mod (F,G);
 
+  if (getCharacteristic() == 0)
+    return mod (F, G);
+
   ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
   ASSERT (F.level() == G.level(), "expected polys of same level");
@@ -109 +112 @@
   else if (F.isUnivariate() && G.inCoeffDomain())
     return div (F,G);
+
+  if (getCharacteristic() == 0)
+    return div (F, G);
 
   ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
@@ -794 +800 @@
     return mod (F*G, M);
 
-  if (CFFactory::gettype() != GaloisFieldDomain &&
+  if (getCharacteristic() > 0 && CFFactory::gettype() != GaloisFieldDomain &&
       (((degF-degG) < 50 && degF > degG) || ((degG-degF) < 50 && degF <= degG)))
     return mulMod2NTLFq (F, G, M);