Changeset 0b55585 in git

Timestamp:

Aug 26, 2013, 5:50:31 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

60d63da305a83ef95e9f72767dab47d13016ace4

Parents:

9f8c05a875ee27eb1bad4fbba07a54f8b840bdee

git-author:

Martin Lee <martinlee84@web.de>2013-08-26 17:50:31+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-08-29 17:23:52+02:00

Message:

fix: wrong assertions

Location:

factory

Files:

• cf_gcd_smallp.cc (modified) (4 diffs)
• cf_gcd_smallp.h (modified) (1 diff)
• variable.cc (modified) (1 diff)

factory/cf_gcd_smallp.cc

@@ -2124 +2124 @@
   if (F == G) return F/Lc(F);
 
+  ASSERT (degree (A, 1) == 0, "expected degree (F, 1) == 0");
+  ASSERT (degree (B, 1) == 0, "expected degree (G, 1) == 0");
+
   CFMap M,N;
   int best_level= myCompress (A, B, M, N, false);
@@ -2134 +2137 @@
 
   Variable x= Variable (1);
-  ASSERT (degree (A, x) == 0, "expected degree (F, 1) == 0");
-  ASSERT (degree (B, x) == 0, "expected degree (G, 1) == 0");
 
   //univariate case
@@ -2382 +2383 @@
   if (F == G) return F/Lc(F);
 
+  ASSERT (degree (A, 1) == 0, "expected degree (F, 1) == 0");
+  ASSERT (degree (B, 1) == 0, "expected degree (G, 1) == 0");
+
   CFMap M,N;
   int best_level= myCompress (A, B, M, N, false);
@@ -2392 +2396 @@
 
   Variable x= Variable (1);
-  ASSERT (degree (A, x) == 0, "expected degree (F, 1) == 0");
-  ASSERT (degree (B, x) == 0, "expected degree (G, 1) == 0");
 
   //univariate case

factory/cf_gcd_smallp.h

@@ -79 +79 @@
 CanonicalForm sparseGCDFp (const CanonicalForm& A, const CanonicalForm& B)
 {
-  ASSERT (CFFactory::gettype() == GaloisFieldDomain, 
-          "GF as base field expected");
+  ASSERT (CFFactory::gettype() == FiniteFieldDomain,
+          "Fp as base field expected");
   CFList list;
   bool topLevel= true;

factory/variable.cc

@@ -52 +52 @@
 Variable::Variable( int l ) : _level(l)
 {
-    ASSERT( l > 0 && l != LEVELQUOT, "illegal level" );
+    //ASSERT( l > 0 && l != LEVELQUOT, "illegal level" );
 }