Changeset f71453 in git

Timestamp:

Feb 22, 2012, 10:22:53 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

346edc8b6fd87fc9063b76b6ec2fa61d0061899f

Parents:

9b8b090bca59f6bb48b468a6a1b63a90e53e6299

git-author:

Martin Lee <martinlee84@web.de>2012-02-22 10:22:53+01:00

git-committer:

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

Message:

fix: compilation errors with --enable-assertions

Location:

factory

Files:

• cf_gcd_smallp.cc (modified) (3 diffs)
• cf_gcd_smallp.h (modified) (1 diff)
• facAlgExt.cc (modified) (1 diff)
• gfops.cc (modified) (1 diff)
• variable.cc (modified) (1 diff)

factory/cf_gcd_smallp.cc

@@ -1474 +1474 @@
 {
   int r= M.size();
-  ASSERT (c == r, "number of columns and rows not equal");
   ASSERT (A.size() == r, "vector does not have right size");
   if (r == 1)
@@ -1971 +1970 @@
 
   Variable x= Variable (1);
-  ASSERT (degree (A, y) == 0, "expected degree (F, 1) == 0");
-  ASSERT (degree (B, y) == 0, "expected degree (G, 1) == 0");
+  ASSERT (degree (A, x) == 0, "expected degree (F, 1) == 0");
+  ASSERT (degree (B, x) == 0, "expected degree (G, 1) == 0");
 
   //univariate case
@@ -2229 +2228 @@
 
   Variable x= Variable (1);
-  ASSERT (degree (A, y) == 0, "expected degree (F, 1) == 0");
-  ASSERT (degree (B, y) == 0, "expected degree (G, 1) == 0");
+  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

@@ -25 +25 @@
 // #include "config.h"
 #include "cf_assert.h"
+
+#include "cf_factory.h"
 
 CanonicalForm GCD_Fp_extension (const CanonicalForm& F, const CanonicalForm& G,

factory/facAlgExt.cc

@@ -168 +168 @@
 
   factors.insert (CFFactor (Lc(F), 1));
-  ASSERT (degree (buf) <= 0, "bug in AlgExtFactorize");
   if (save_rat) Off(SW_RATIONAL);
   return factors;

factory/gfops.cc

@@ -214 +214 @@
 void gf_setcharacteristic ( int p, int n, char name )
 {
-    ASSERT( gf_valid_combination( p, n ), "illegal immediate GF(q)" );
+    //ASSERT( gf_valid_combination( p, n ), "illegal immediate GF(q)" );
     gf_name = name;
     gf_get_table( p, n );

factory/variable.cc

@@ -170 +170 @@
 Variable rootOf( const CanonicalForm & mipo, char name )
 {
-    ASSERT( legal_mipo( mipo ), "not a legal extension" );
+    //ASSERT( legal_mipo( mipo ), "not a legal extension" );
 
     int l;