Changeset 050d1b in git

Timestamp:

Apr 4, 2012, 1:30:52 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

0a7d0ca68a61f160eb5b83774592a019ed99f025

Parents:

a76d6fe76b652b99d7b02e9ba874bb0c39294637

git-author:

Martin Lee <martinlee84@web.de>2012-04-04 13:30:52+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 15:02:12+02:00

Message:

fix: wrong/unneccessary asserts

Location:

factory

Files:

• cf_char.cc (modified) (1 diff)
• cf_gcd_smallp.cc (modified) (1 diff)
• cf_map_ext.cc (modified) (1 diff)
• facFqBivar.cc (modified) (1 diff)
• facFqBivarUtil.cc (modified) (4 diffs)
• facMul.cc (modified) (5 diffs)
• variable.cc (modified) (1 diff)

factory/cf_char.cc

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

factory/cf_gcd_smallp.cc

@@ -3992 +3992 @@
   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;

factory/cf_map_ext.cc

@@ -287 +287 @@
       if (buf == buf2) break;
     }
-    ASSERT (counter >= bound, "alpha is not primitive");
+    ASSERT (counter <= bound, "alpha is not primitive");
     if (pos == 0)
     {

factory/facFqBivar.cc

@@ -145 +145 @@
 {
   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());

factory/facFqBivarUtil.cc

@@ -549 +549 @@
               )
 {
-  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;
@@ -560 +560 @@
 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();
@@ -583 +583 @@
 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 ();
@@ -626 +626 @@
            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())

factory/facMul.cc

@@ -2422 +2422 @@
 {
   ASSERT (getCharacteristic() > 0, "positive characteristic expected");
-  ASSERT (CFFactory::gettype() != GaloisFieldDomain, "no GF expected");
 
   CanonicalForm A= mod (F, M);
@@ -2575 +2574 @@
     return;
   }
-  ASSERT (2*degB > degA, "expected degree (F, 1) < 2*degree (G, 1)");
   if (degB < 1)
   {
@@ -2583 +2581 @@
     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)
@@ -2647 +2645 @@
     return;
   }
-  ASSERT (3*(degB/2) > degA, "expected degree (F, 1) < 3*(degree (G, 1)/2)");
   if (degB < 1)
   {
@@ -2656 +2653 @@
   }
   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

@@ -161 +161 @@
 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;