Changeset fc2acf in git for libpolys/polys/ext_fields/transext.cc

Timestamp:

Jul 8, 2015, 5:21:19 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3f2942fb2df02ef47a6e1125188f5c588a05e8d2

Parents:

f0e1f60636ea63dea4a25bf2abff929dd68198db

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-07-08 17:21:19+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-07-08 17:22:49+02:00

Message:

Testing correctness in trans ext

File:

• libpolys/polys/ext_fields/transext.cc (modified) (22 diffs)

libpolys/polys/ext_fields/transext.cc

@@ -72 +72 @@
 
 #ifdef LDEBUG
-#define ntTest(a) ntDBTest(a,__FILE__,__LINE__,cf)
 BOOLEAN  ntDBTest(number a, const char *f, const int l, const coeffs r);
-#else
-#define ntTest(a) do {} while (0)
 #endif
+
+#define ntTest(a) n_Test(a, cf)
 
 /// Our own type!
@@ -184 +183 @@
   //check_N(a,cf);
   const poly num = NUM(t);
-  assume(num != NULL);   /**< t != 0 ==> numerator(t) != 0 */
+  assume(num != NULL);   ///< t != 0 ==> numerator(t) != 0
 
   p_Test(num, ntRing);
 
+  if (getCoeffType(ntCoeffs)==n_Q)
+    for( poly p = num; p != NULL; pIter(p) )
+      if (! nlIsInteger( p_GetCoeff(p, ntRing), ntCoeffs) )
+      {
+        Print("ERROR: non-integer Q coeff in num. poly in %s:%d\n",f,l);        
+        return FALSE;      
+      }
+
   const poly den = DEN(t);
 
@@ -193 +200 @@
   {
     p_Test(den, ntRing);
+
+    if (getCoeffType(ntCoeffs)==n_Q)
+      for( poly p = den; p != NULL; pIter(p) )
+        if (! nlIsInteger( p_GetCoeff(p, ntRing), ntCoeffs) )
+        {
+          Print("ERROR: non-integer Q coeff in den. poly in %s:%d\n",f,l);        
+          return FALSE;      
+        }
+
+    if (getCoeffType(ntCoeffs)==n_Zp)
+    {
+      if( p_IsConstant(den, ntRing) )
+      {
+        Print("ERROR: constant den. poly / Zp in %s:%d\n",f,l);        
+        return FALSE;
+      }
+         
+      if( !n_IsOne(pGetCoeff(den), ntCoeffs) )
+      {       
+        Print("ERROR: non-monic den. poly / Zp in %s:%d\n",f,l);        
+        return FALSE;
+      }
+    }
+    
+    poly gcd = singclap_gcd_r( num, den, ntRing );
+
+    if( !(p_IsConstant(gcd, ntRing) && (n_IsOne(pGetCoeff(gcd), ntCoeffs))) )
+    {
+      Print("ERROR: 1 != GCD between num. & den. poly in %s:%d\n",f,l);        
+      return FALSE;
+    }
+
+    p_Delete( &gcd, ntRing );
+
+    return TRUE;
+    
+
+    
     if(p_IsConstant(den, ntRing) && (n_IsOne(pGetCoeff(den), ntCoeffs)))
     {
@@ -206 +251 @@
   }
   else
-  {  // num != NULL // den == NULL
+  {
+    return TRUE;
+
+    // num != NULL // den == NULL
 //    if( COM(t) != 0 )
 //    {
@@ -279 +327 @@
   //check_N(*a,cf);
   ntTest(*a); // !!!
+  
   fraction f = (fraction)(*a);
   if (IS0(f)) return;
@@ -580 +629 @@
   if (p == NULL) return NULL;
 
+  p_Test( p, ntRing);
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
 
@@ -792 +842 @@
      COM(result) = COM(fa);
      //check_N((number)result,cf);
+     ntTest((number)result);
      return (number)result;
   }
@@ -804 +855 @@
 
   //check_N((number)result,cf);
+  ntTest((number)result);
   return (number)result;
 }
@@ -845 +897 @@
 
   //check_N((number)result,cf);
+  ntTest((number)result);
   return (number)result;
 }
@@ -883 +936 @@
 //  ntTest((number)result);
   //check_N((number)result,cf);
+  ntTest((number)result);
   return (number)result;
 }
@@ -953 +1007 @@
 
   //check_N((number)result,cf);
+  ntTest((number)result);
   return (number)result;
 }
@@ -992 +1047 @@
 //  ntTest((number)result);
   //check_N((number)result,cf);
+  ntTest((number)result);
   return (number)result;
 }
@@ -1242 +1298 @@
                              BOOLEAN simpleTestsHaveAlreadyBeenPerformed)
 {
-  ntTest(a); // !!!!
+//  ntTest(a); // !!!!
 
   fraction f = (fraction)a;
 
   if (IS0(a)) return;
-  if (DENIS1(f) || NUMIS1(f)) { COM(f) = 0; return; }
+  if (DENIS1(f) || NUMIS1(f)) { COM(f) = 0; ntTest(a); return; }
   if (!simpleTestsHaveAlreadyBeenPerformed)
   {
@@ -1442 +1498 @@
   if (p == NULL) *a = NULL;
   else *a = ntInit(p, cf);
+  ntTest(*a);
   return result;
 }
@@ -1570 +1627 @@
     return (number)result;
 
-  return NULL;
+    return NULL;
 }
 
@@ -1748 +1805 @@
 number ntMap00(number a, const coeffs src, const coeffs dst)
 {
+  n_Test(a, src);
+  
   if (n_IsZero(a, src)) return NULL;
-  n_Test(a, src);
   assume(src->rep == dst->extRing->cf->rep);
   if ((SR_HDL(a) & SR_INT) || (a->s==3))
   {
     number res=ntInit(p_NSet(n_Copy(a, src), dst->extRing), dst);
-    n_Test(res,dst);
+    n_Test(res, dst);
     return res;
   }
@@ -1763 +1821 @@
   if (n_IsOne(nn,src)) DEN(ff)=NULL;
   else                 DEN(ff)=p_NSet(nn,dst->extRing);
+  
   n_Test((number)ff,dst);
   //check_N((number)ff,dst);
@@ -1770 +1829 @@
 number ntMapZ0(number a, const coeffs src, const coeffs dst)
 {
+  n_Test(a, src);
   if (n_IsZero(a, src)) return NULL;
-  n_Test(a, src);
   nMapFunc nMap=n_SetMap(src,dst->extRing->cf);
   poly p=p_NSet(nMap(a, src,dst->extRing->cf), dst->extRing);
@@ -1784 +1843 @@
 number ntMapP0(number a, const coeffs src, const coeffs dst)
 {
+  n_Test(a, src);
   if (n_IsZero(a, src)) return NULL;
-  n_Test(a, src);
   /* mapping via intermediate int: */
   int n = n_Int(a, src);
@@ -2380 +2439 @@
 {
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
-  int i;
 
   poly *P=(poly*)omAlloc(rl*sizeof(poly*));
   number *X=(number *)omAlloc(rl*sizeof(number));
+
+  int i;
 
   for(i=0;i<rl;i++) P[i]=p_Copy(NUM((fraction)(x[i])),cf->extRing);
@@ -2402 +2462 @@
     p_Delete(&DEN(result),ntRing);
   }
+  ntTest((number)result);
   return ((number)result);
 }
@@ -2411 +2472 @@
   NUM(result)=p_Farey(p_Copy(NUM((fraction)p),cf->extRing),n,cf->extRing);
   DEN(result)=p_Farey(p_Copy(DEN((fraction)p),cf->extRing),n,cf->extRing);
+  ntTest((number)result);
   return ((number)result);
 }