Changeset e7a487 in git for factory/gfops.cc

Timestamp:

Feb 22, 2012, 6:41:12 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

a3aa3f3540f7d9604a809fe2b268a4115e7aef9a

Parents:

9b8b090bca59f6bb48b468a6a1b63a90e53e6299ff3a4f4a8e655885eb376e551f47339a6de25bf0

Message:

Merge pull request #70 from mmklee/factory_configure_options_sw

repair factory configure options: enable-timing, enable-debugoutput, enable-assertions (version for SW + improvements: enable-assertions ->  disable-assertions)

File:

• factory/gfops.cc (modified) (2 diffs)

factory/gfops.cc

@@ -31 +31 @@
 
 const int gf_primes_len = 42;
-//static unsigned short gf_primes [] =
-//{
-//      2,   3,   5,   7,  11,  13,  17,  19,
-//     23,  29,  31,  37,  41,  43,  47,  53,
-//     59,  61,  67,  71,  73,  79,  83,  89,
-//     97, 101, 103, 107, 109, 113, 127, 131,
-//    137, 139, 149, 151, 157, 163, 167, 173,
-//    179, 181, 191, 193, 197, 199, 223, 211,
-//    227, 229, 233, 239, 241, 251
-//};
+#ifndef NOASSERT
+static unsigned short gf_primes [] =
+{
+      2,   3,   5,   7,  11,  13,  17,  19,
+     23,  29,  31,  37,  41,  43,  47,  53,
+     59,  61,  67,  71,  73,  79,  83,  89,
+     97, 101, 103, 107, 109, 113, 127, 131,
+    137, 139, 149, 151, 157, 163, 167, 173,
+    179, 181, 191, 193, 197, 199, 223, 211,
+    227, 229, 233, 239, 241, 251
+};
+#endif
 
 int gf_q = 0;
@@ -190 +192 @@
 }
 
-//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;
-//    }
-//}
+#ifndef NOASSERT
+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;
+    }
+}
+#endif
 
 void gf_setcharacteristic ( int p, int n, char name )