Changeset e2c181 in git

Timestamp:

Feb 22, 2012, 4:26:12 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

ff3a4f4a8e655885eb376e551f47339a6de25bf0

Parents:

43bbd6d912fd61156de899f0e8aa1e830a90b6d7

Message:

chg: enable assertions instead of being lazy

Location:

factory

Files:

• gfops.cc (modified) (1 diff)
• variable.cc (modified) (2 diffs)

factory/gfops.cc

@@ -190 +190 @@
 }
 
-//static bool gf_valid_combination ( int p, int n )
-//{
-//    int i = 0;
-//    while ( i < gf_primes_len && gf_primes[i] != p ) i++;
-//    if ( i == gf_primes_len )
-//        return false;
-//    else
-//    {
-//        i = n;
-//        int a = 1;
-//        while ( a < gf_maxtable && i > 0 )
-//        {
-//            a *= p;
-//            i--;
-//        }
-//        if ( i > 0 || a > gf_maxtable )
-//            return false;
-//        else
-//            return true;
-//    }
-//}
+static bool gf_valid_combination ( int p, int n )
+{
+    int i = 0;
+    while ( i < gf_primes_len && gf_primes[i] != p ) i++;
+    if ( i == gf_primes_len )
+        return false;
+    else
+    {
+        i = n;
+        int a = 1;
+        while ( a < gf_maxtable && i > 0 )
+        {
+            a *= p;
+            i--;
+        }
+        if ( i > 0 || a > gf_maxtable )
+            return false;
+        else
+            return true;
+    }
+}
 
 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

@@ -151 +151 @@
 #endif /* NOSTREAMIO */
 
-//static bool legal_mipo( const CanonicalForm & mipo )
-//{
-//    ASSERT( mipo.inPolyDomain(), "not a legal extension" );
-//    bool ok = true;
-//    for ( CFIterator i = mipo; ok && i.hasTerms(); i++ )
-//        ok = i.coeff().inBaseDomain();
-//    return ok;
-//}
-
 static CanonicalForm conv2mipo ( const CanonicalForm & mipo, const Variable alpha )
 {
@@ -170 +161 @@
 Variable rootOf( const CanonicalForm & mipo, char name )
 {
-    //ASSERT( legal_mipo( mipo ), "not a legal extension" );
+    ASSERT (mipo.inPolyDomain() && mipo.isUnivariate(), "not a legal extension");
 
     int l;