fix: wrong/unneccessary asserts

Author: mmklee

factory/cf_char.cc

@@ -73,7 +73,7 @@ int getExp()
 
 int getGFDegree()
 {
-    ASSERT( theDegree > 0, "not in GF(q)" );
+    //ASSERT( theDegree > 0, "not in GF(q)" );
     return theDegree;
 }
 

factory/cf_gcd_smallp.cc

@@ -3991,7 +3991,7 @@ Evaluation optimize4Lift (const CanonicalForm& F, CFMap & M,
 
   Evaluation result= Evaluation (A.min(), A.max());
   ASSERT (A.min() == 2, "expected A.min() == 2");
-  ASSERT (A.max() == n, "expected A.max() == n");
+  ASSERT (A.max() >= n, "expected A.max() >= n");
   int max_deg;
   int k= n;
   int l= 1;

factory/cf_map_ext.cc

@@ -286,7 +286,7 @@ CanonicalForm mapUp (const CanonicalForm& F, const CanonicalForm& G,
       counter++;
       if (buf == buf2) break;
     }
-    ASSERT (counter >= bound, "alpha is not primitive");
+    ASSERT (counter <= bound, "alpha is not primitive");
     if (pos == 0)
     {
       H_power= buf*power (H, counter);

factory/facFqBivar.cc

@@ -144,7 +144,8 @@ CFList
 uniFactorizer (const CanonicalForm& A, const Variable& alpha, const bool& GF)
 {
   Variable x= A.mvar();
-  ASSERT (A.isUnivariate(), "univariate polynomial expected");
+  ASSERT (A.isUnivariate() || A.inCoeffDomain(), 
+          "univariate polynomial expected or constant expected");
   CFFList factorsA;
   ZZ p= to_ZZ (getCharacteristic());
   ZZ_p::init (p);

factory/facFqBivarUtil.cc

@@ -548,8 +548,8 @@ writeInMatrix (CFMatrix& M, const CFArray& A, const int column,
                const int startIndex
               )
 {
-  ASSERT (A.size () - startIndex > 0, "wrong starting index");
-  ASSERT (A.size () - startIndex == M.rows(), "wrong starting index");
+  ASSERT (A.size () - startIndex >= 0, "wrong starting index");
+  ASSERT (A.size () - startIndex <= M.rows(), "wrong starting index");
   ASSERT (column > 0 && column <= M.columns(), "wrong column");
   if (A.size() - startIndex <= 0) return;
   int j= 1;
@@ -559,7 +559,7 @@ writeInMatrix (CFMatrix& M, const CFArray& A, const int column,
 
 CFArray getCoeffs (const CanonicalForm& F, const int k)
 {
-  ASSERT (F.isUnivariate(), "univariate input expected");
+  ASSERT (F.isUnivariate() || F.inCoeffDomain(), "univariate input expected");
   if (degree (F, 2) < k)
     return CFArray();
 
@@ -582,7 +582,7 @@ CFArray getCoeffs (const CanonicalForm& F, const int k)
 
 CFArray getCoeffs (const CanonicalForm& F, const int k, const Variable& alpha)
 {
-  ASSERT (F.isUnivariate(), "univariate input expected");
+  ASSERT (F.isUnivariate() || F.inCoeffDomain(), "univariate input expected");
   if (degree (F, 2) < k)
     return CFArray ();
 
@@ -625,7 +625,7 @@ getCoeffs (const CanonicalForm& G, const int k, const int l, const int degMipo,
            const Variable& alpha, const CanonicalForm& evaluation,
            const mat_zz_p& M)
 {
-  ASSERT (G.isUnivariate(), "univariate input expected");
+  ASSERT (G.isUnivariate() || G.inCoeffDomain(), "univariate input expected");
   CanonicalForm F= G (G.mvar() - evaluation, G.mvar());
   if (F.isZero())
     return CFArray ();

factory/facMul.cc

@@ -2421,7 +2421,6 @@ newtonDiv (const CanonicalForm& F, const CanonicalForm& G, const CanonicalForm&
            M)
 {
   ASSERT (getCharacteristic() > 0, "positive characteristic expected");
-  ASSERT (CFFactory::gettype() != GaloisFieldDomain, "no GF expected");
 
   CanonicalForm A= mod (F, M);
   CanonicalForm B= mod (G, M);
@@ -2574,16 +2573,15 @@ void divrem21 (const CanonicalForm& F, const CanonicalForm& G, CanonicalForm& Q,
     R= A;
     return;
   }
-  ASSERT (2*degB > degA, "expected degree (F, 1) < 2*degree (G, 1)");
   if (degB < 1)
   {
     divrem (A, B, Q, R);
     Q= mod (Q, M);
     R= mod (R, M);
     return;
   }
-
   int m= (int) ceil ((double) (degB + 1)/2.0) + 1;
+  ASSERT (4*m >= degA, "expected degree (F, 1) < 2*degree (G, 1)");
   CFList splitA= split (A, m, x);
   if (splitA.length() == 3)
     splitA.insert (0);
@@ -2646,7 +2644,6 @@ void divrem32 (const CanonicalForm& F, const CanonicalForm& G, CanonicalForm& Q,
     R= A;
     return;
   }
-  ASSERT (3*(degB/2) > degA, "expected degree (F, 1) < 3*(degree (G, 1)/2)");
   if (degB < 1)
   {
     divrem (A, B, Q, R);
@@ -2655,7 +2652,7 @@ void divrem32 (const CanonicalForm& F, const CanonicalForm& G, CanonicalForm& Q,
     return;
   }
   int m= (int) ceil ((double) (degB + 1)/ 2.0);
-
+  ASSERT (3*m > degA, "expected degree (F, 1) < 3*degree (G, 1)");
   CFList splitA= split (A, m, x);
   CFList splitB= split (B, m, x);
 

factory/variable.cc

@@ -160,7 +160,7 @@ static CanonicalForm conv2mipo ( const CanonicalForm & mipo, const Variable alph
 
 Variable rootOf( const CanonicalForm & mipo, char name )
 {
-    ASSERT (mipo.inPolyDomain() && mipo.isUnivariate(), "not a legal extension");
+    ASSERT (mipo.isUnivariate(), "not a legal extension");
 
     int l;
     if ( var_names_ext == 0 ) {