[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323
Bernhard R. Link
brlink at debian.org
Tue Apr 24 15:54:45 UTC 2012
The following commit has been merged in the cleanedupstream branch:
commit a29e668869ad197e6fc5d0b7c19e23c020d63cc0
Author: Martin Lee <martinlee84 at web.de>
Date: Fri Jan 6 18:28:00 2012 +0100
chg: removed some debug stuff
diff --git a/factory/facHensel.cc b/factory/facHensel.cc
index 53ca5b7..5d4bfdb 100644
--- a/factory/facHensel.cc
+++ b/factory/facHensel.cc
@@ -559,19 +559,10 @@ mulNTL (const CanonicalForm& F, const CanonicalForm& G)
if ((!F.inCoeffDomain() && !G.inCoeffDomain()) && (hasFirstAlgVar (F, alpha) || hasFirstAlgVar (G, alpha)))
{
CanonicalForm result= mulFLINTQa (F, G, alpha);
- CanonicalForm test= F*G;
- if (test != result)
- printf ("FAILLLLLLLL\n");
return result;
}
else if (!F.inCoeffDomain() && !G.inCoeffDomain())
- {
- CanonicalForm result= mulFLINTQ (F,G);
- CanonicalForm test= F*G;
- if (test != result)
- printf ("FAILLLLLLLL2\n");
return mulFLINTQ (F, G);
- }
#endif
return F*G;
}
@@ -626,14 +617,7 @@ modNTL (const CanonicalForm& F, const CanonicalForm& G)
#ifdef HAVE_FLINT
Variable alpha;
if (!hasFirstAlgVar (F, alpha) && !hasFirstAlgVar (G, alpha))
- {
- CanonicalForm result= modFLINTQ (F,G);
- CanonicalForm test= mod (F, G);
- if (test != result)
- printf ("FAILINMOD\n");
- return result;
- //return modFLINTQ (F, G);
- }
+ return modFLINTQ (F, G);
else
return mod (F, G);
#else
@@ -692,14 +676,7 @@ divNTL (const CanonicalForm& F, const CanonicalForm& G)
#ifdef HAVE_FLINT
Variable alpha;
if (!hasFirstAlgVar (F, alpha) && !hasFirstAlgVar (G, alpha))
- {
- CanonicalForm result= divFLINTQ (F,G);
- CanonicalForm test= div (F, G);
- if (test != result)
- printf ("FAILINDIV\n");
- return result;
- //return divFLINTQ (F,G);
- }
+ return divFLINTQ (F,G);
else
return div (F, G);
#else
@@ -2160,14 +2137,7 @@ CanonicalForm mulMod2 (const CanonicalForm& A, const CanonicalForm& B,
#ifdef HAVE_FLINT
Variable alpha;
if (getCharacteristic() == 0 && !hasFirstAlgVar (F, alpha) && ! hasFirstAlgVar (G, alpha))
- {
- CanonicalForm result= mulMod2FLINTQ (F, G, M);
- CanonicalForm test= mod (F*G, M);
- if (test != result)
- printf ("GOTTVERDAMMT\n");
- return result;
- //return mulMod2FLINTQ (F, G, M);
- }
+ return mulMod2FLINTQ (F, G, M);
#endif
if (getCharacteristic() > 0 && CFFactory::gettype() != GaloisFieldDomain &&
--
an open source computer algebra system
More information about the debian-science-commits
mailing list