Changeset 67e0dc in git for libpolys/polys/ext_fields/transext.cc

Timestamp:

Oct 21, 2015, 2:57:17 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5bd9ec36b87fa8f176a21995de2b56724d67be2d

Parents:

a1b6c917a1c8886b1bba1b05680ff06cfd39c82def1a968e317a12b42f88e04cd7f9483e47fba2f7

Message:

Merge pull request #718 from adipopescu/STDChanes2

Std over rings

File:

• libpolys/polys/ext_fields/transext.cc (modified) (28 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 in %s:%d: non-integer Q coeff in num. poly\n",f,l);
+        Print("TERM: ");  p_wrp(p, ntRing); PrintLn();
+        return FALSE;
+      }
+
   const poly den = DEN(t);
 
@@ -193 +201 @@
   {
     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 in %s:%d: non-integer Q coeff in den. poly\n",f,l);
+          Print("TERM: "); p_wrp(p, ntRing);  PrintLn();
+          return FALSE;
+        }
+
+    if (getCoeffType(ntCoeffs)==n_Zp)
+    {
+      if( p_IsConstant(den, ntRing) )
+      {
+        Print("ERROR in %s:%d: constant den. poly / Zp\n",f,l);
+        Print("NUM: ");  p_Write(num, ntRing);
+        Print("DEN: ");  p_Write(den, ntRing);
+        return FALSE;
+      }
+
+      if( !n_IsOne(pGetCoeff(den), ntCoeffs) )
+      {
+        Print("ERROR in %s:%d: non-monic den. poly / Zp\n",f,l);
+        Print("NUM: ");  p_Write(num, ntRing);
+        Print("DEN: ");  p_Write(den, ntRing);
+        return FALSE;
+      }
+    }
+
+    if (COM(t)==0)
+    {
+      poly gcd = singclap_gcd_r( num, den, ntRing );
+      if( !p_IsOne(gcd, ntRing) )
+      {
+        Print("ERROR in %s:%d: 1 != GCD between num. & den. poly\n",f,l);
+        Print("GCD: ");  p_Write(gcd, ntRing);
+        Print("NUM: ");  p_Write(num, ntRing);
+        Print("DEN: ");  p_Write(den, ntRing);
+        return FALSE;
+      }
+      p_Delete( &gcd, ntRing );
+    }
+    return TRUE;
+
+
+
     if(p_IsConstant(den, ntRing) && (n_IsOne(pGetCoeff(den), ntCoeffs)))
     {
@@ -206 +260 @@
   }
   else
-  {  // num != NULL // den == NULL
+  {
+    return TRUE;
+
+    // num != NULL // den == NULL
 //    if( COM(t) != 0 )
 //    {
@@ -279 +336 @@
   //check_N(*a,cf);
   ntTest(*a); // !!!
+
   fraction f = (fraction)(*a);
   if (IS0(f)) return;
@@ -580 +638 @@
   if (p == NULL) return NULL;
 
+  p_Test( p, ntRing);
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
 
@@ -792 +851 @@
      COM(result) = COM(fa);
      //check_N((number)result,cf);
+     ntTest((number)result);
      return (number)result;
   }
@@ -804 +864 @@
 
   //check_N((number)result,cf);
+  ntTest((number)result);
   return (number)result;
 }
@@ -845 +906 @@
 
   //check_N((number)result,cf);
+  ntTest((number)result);
   return (number)result;
 }
@@ -883 +945 @@
 //  ntTest((number)result);
   //check_N((number)result,cf);
+  ntTest((number)result);
   return (number)result;
 }
@@ -953 +1016 @@
 
   //check_N((number)result,cf);
+  ntTest((number)result);
   return (number)result;
 }
@@ -989 +1053 @@
   }
   COM(result) = COM(fa) + COM(fb) + MULT_COMPLEXITY;
+//  definiteGcdCancellation((number)result, cf,FALSE);
   heuristicGcdCancellation((number)result, cf);
 //  ntTest((number)result);
   //check_N((number)result,cf);
+  ntTest((number)result);
   return (number)result;
 }
@@ -1186 +1252 @@
 
 /* modifies a */
+/* this is an intermediate simplification routine - not a comple "normalize" */
 void heuristicGcdCancellation(number a, const coeffs cf)
 {
-//  ntTest(a); // !!!!????
   if (IS0(a)) return;
 
@@ -1232 +1298 @@
         }
       }
-    }
-  }
-
-  ntTest(a);
+      if ((DEN(f)!=NULL)
+      && (pNext(DEN(f))==NULL))
+      {
+        poly den_f=DEN(f);
+        poly h=NUM(f);
+        loop
+        {
+          if (h==NULL)
+          {
+            h=NUM(f);
+            do
+            {
+              p_ExpVectorDiff(h,h,den_f,ntRing);
+              pIter(h);
+            } while(h!=NULL);
+            p_ExpVectorDiff(den_f,den_f,den_f,ntRing);
+            break;
+          }
+          int i=0;
+          do
+          {
+            i++;
+            if (p_GetExp(den_f,i,ntRing) > p_GetExp(h,i,ntRing)) return;
+          } while(i<ntRing->N);
+          pIter(h);
+        }
+      }
+    }
+  }
 }
 
@@ -1242 +1333 @@
                              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)
   {
@@ -1344 +1435 @@
        to be != 1. */
     if (p_IsConstant(DEN(f), ntRing) &&
-        n_IsOne(p_GetCoeff(DEN(f), ntRing), ntCoeffs))
+      n_IsOne(p_GetCoeff(DEN(f), ntRing), ntCoeffs))
     {
       /* DEN(f) = 1 needs to be represented by NULL! */
@@ -1367 +1458 @@
     }
   }
+  p_Delete(&pGcd, ntRing);
   COM(f) = 0;
-  p_Delete(&pGcd, ntRing);
 
   if( DEN(f) != NULL )
+  {
     if( !n_GreaterZero(pGetCoeff(DEN(f)), ntCoeffs) )
     {
@@ -1383 +1475 @@
       }
     }
+  }
   ntTest(a); // !!!!
 }
@@ -1442 +1535 @@
   if (p == NULL) *a = NULL;
   else *a = ntInit(p, cf);
+  ntTest(*a);
   return result;
 }
@@ -1570 +1664 @@
     return (number)result;
 
-  return NULL;
+    return NULL;
 }
 
@@ -1661 +1755 @@
   int noOfTerms = 0;
   int numDegree = 0;
-  while (p != NULL)
-  {
-    noOfTerms++;
-    int d = 0;
-    for (int i = 1; i <= rVar(ntRing); i++)
-      d += p_GetExp(p, i, ntRing);
-    if (d > numDegree) numDegree = d;
-    pIter(p);
+  if (p!=NULL)
+  {
+    numDegree = p_Totaldegree(p,ntRing);
+    noOfTerms = pLength(p);
   }
   int denDegree = 0;
   if (!DENIS1(f))
   {
-    p = DEN(f);
-    while (p != NULL)
-    {
-      noOfTerms++;
-      int d = 0;
-      for (int i = 1; i <= rVar(ntRing); i++)
-        d += p_GetExp(p, i, ntRing);
-      if (d > denDegree) denDegree = d;
-      pIter(p);
-    }
+    denDegree =  p_Totaldegree(DEN(f),ntRing);
+    noOfTerms += pLength(DEN(f));
   }
   ntTest(a); // !!!!
@@ -1748 +1830 @@
 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 +1846 @@
   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 +1854 @@
 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 +1868 @@
 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 +2464 @@
 {
   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 +2487 @@
     p_Delete(&DEN(result),ntRing);
   }
+  ntTest((number)result);
   return ((number)result);
 }
@@ -2411 +2497 @@
   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);
 }