Changeset eb55f8a in git for libpolys/polys/ext_fields

Timestamp:

Sep 16, 2014, 4:56:19 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

5b45a4ff15d0998cc64c730af75c1c1f773d4a77

Parents:

4ec0f01d431893a4c0997d2bdfab87cb8d37e03e

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-16 16:56:19+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-23 20:10:49+02:00

Message:

There should be no *Test in assume call (and no assume in *Test definition)

Location:

libpolys/polys/ext_fields

Files:

• algext.cc (modified) (3 diffs)
• transext.cc (modified) (16 diffs)

libpolys/polys/ext_fields/algext.cc

@@ -936 +936 @@
   }
   definiteReduce(p, dst->extRing->qideal->m[0], dst);
-  assume (p_Test (p, dst->extRing));
+  p_Test (p, dst->extRing);
   if (!DENIS1(fa))
   {
     definiteReduce(q, dst->extRing->qideal->m[0], dst);
-    assume (p_Test (q, dst->extRing));
+    p_Test (q, dst->extRing);
     if (q != NULL)
     {
@@ -999 +999 @@
   poly g = prMapR(f, nMap, rSrc, rDst);
 
-  assume(n_Test((number)g, dst));
+  n_Test((number)g, dst);
   return (number)g;
 }
@@ -1029 +1029 @@
     result=(number)g;
 
-  assume(n_Test((number)result, dst));
+  n_Test((number)result, dst);
   return (number)result;
 }

libpolys/polys/ext_fields/transext.cc

@@ -80 +80 @@
 
 #ifdef LDEBUG
-#define ntTest(a) assume(ntDBTest(a,__FILE__,__LINE__,cf))
+#define ntTest(a) ntDBTest(a,__FILE__,__LINE__,cf)
 BOOLEAN  ntDBTest(number a, const char *f, const int l, const coeffs r);
 #else
@@ -193 +193 @@
   const poly num = NUM(t);
   assume(num != NULL);   /**< t != 0 ==> numerator(t) != 0 */
-  assume( _p_Test(num, ntRing,1) );
+  
+  p_Test(num, ntRing); 
 
   const poly den = DEN(t);
@@ -199 +200 @@
   if (den != NULL) // !DENIS1(f)
   {
-    assume( _p_Test(den, ntRing,1) );
+    p_Test(den, ntRing);
 
     if(p_IsConstant(den, ntRing) && (n_IsOne(pGetCoeff(den), ntCoeffs)))
@@ -1760 +1761 @@
 {
   if (n_IsZero(a, src)) return NULL;
-  assume(n_Test(a, src));
+  n_Test(a, src);
   assume(src->rep == dst->extRing->cf->rep);
   if ((SR_HDL(a) & SR_INT) || (a->s==3))
@@ -1782 +1783 @@
 {
   if (n_IsZero(a, src)) return NULL;
-  assume(n_Test(a, src));
+  n_Test(a, src);
   nMapFunc nMap=n_SetMap(src,dst->extRing->cf);
   poly p=p_NSet(nMap(a, src,dst->extRing->cf), dst->extRing);
@@ -1796 +1797 @@
 {
   if (n_IsZero(a, src)) return NULL;
-  assume(n_Test(a, src));
+  n_Test(a, src);
   /* mapping via intermediate int: */
   int n = n_Int(a, src);
@@ -1834 +1835 @@
   COM(result) = COM(f);
   //check_N((number)result,dst);
-  assume(n_Test((number)result, dst));
+  n_Test((number)result, dst);
   return (number)result;
 }
@@ -1861 +1862 @@
   COM(result) = COM(f);
   //check_N((number)result,dst);
-  assume(n_Test((number)result, dst));
+  n_Test((number)result, dst);
   return (number)result;
 }
@@ -1867 +1868 @@
 number ntCopyAlg(number a, const coeffs cf, const coeffs dst)
 {
-  assume( n_Test(a, cf) );
+  n_Test(a, cf) ;
   if (n_IsZero(a, cf)) return NULL;
   return ntInit(prCopyR((poly)a, cf->extRing, dst->extRing),dst);
@@ -1874 +1875 @@
 number ntGenAlg(number a, const coeffs cf, const coeffs dst)
 {
-  assume( n_Test(a, cf) );
+  n_Test(a, cf) ;
   if (n_IsZero(a, cf)) return NULL;
 
@@ -1884 +1885 @@
 number ntMap0P(number a, const coeffs src, const coeffs dst)
 {
-  assume( n_Test(a, src) );
+  n_Test(a, src) ;
   if (n_IsZero(a, src)) return NULL;
   // int p = rChar(dst->extRing);
@@ -1899 +1900 @@
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(f) = g; // DEN(f) = NULL; COM(f) = 0;
-  assume(n_Test((number)f, dst));
+  n_Test((number)f, dst);
   //check_N((number)f,dst);
   return (number)f;
@@ -1907 +1908 @@
 number ntMapPP(number a, const coeffs src, const coeffs dst)
 {
-  assume( n_Test(a, src) );
+  n_Test(a, src) ;
   if (n_IsZero(a, src)) return NULL;
   assume(src == dst->extRing->cf);
@@ -1914 +1915 @@
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(f) = p; // DEN(f) = NULL; COM(f) = 0;
-  assume(n_Test((number)f, dst));
+  n_Test((number)f, dst);
   //check_N((number)f,dst);
   return (number)f;
@@ -1922 +1923 @@
 number ntMapUP(number a, const coeffs src, const coeffs dst)
 {
-  assume( n_Test(a, src) );
+  n_Test(a, src) ;
   if (n_IsZero(a, src)) return NULL;
   /* mapping via intermediate int: */
@@ -1937 +1938 @@
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(f) = p; // DEN(f) = NULL; COM(f) = 0;
-  assume(n_Test((number)f, dst));
+  n_Test((number)f, dst);
   //check_N((number)f,dst);
   return (number)f;