Changeset ab2923 in git

Timestamp:

Aug 7, 2007, 4:11:18 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

e61df204676c5cfbf13c624fb0a8a94e0c49c8eb

Parents:

592e22040e058cea577d1be39a41916d20067d38

Message:

*hannes: more gf_tables


git-svn-id: file:///usr/local/Singular/svn/trunk@10291 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

factory/gfops.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: gfops.cc,v 1.5 1998-06-12 14:33:41 schmidt Exp $ */
+/* $Id: gfops.cc,v 1.6 2007-08-07 14:11:18 Singular Exp $ */
 
 #include <config.h>
@@ -20 +20 @@
 
 
-const int gf_maxtable = 32767;
+const int gf_maxtable = 63001;
 const int gf_maxbuffer = 200;
 
@@ -31 +31 @@
      97, 101, 103, 107, 109, 113, 127, 131,
     137, 139, 149, 151, 157, 163, 167, 173,
-    179, 181
+    179, 181, 191, 193, 197, 199, 223, 211,
+    227, 229, 233, 239, 241, 251
 };
 
@@ -50 +51 @@
     int i;
     CanonicalForm result;
-    for ( i = 0; i <= degree; i++ ) {
+    for ( i = 0; i <= degree; i++ )
+    {
         result += CanonicalForm( coeffs[ i ] ) * power( Variable( level ), degree - i );
     }
@@ -65 +67 @@
 
     // do not read the table a second time
-    if ( gf_q == q ) {
+    if ( gf_q == q )
+    {
         return;
     }
@@ -71 +74 @@
 #ifdef SINGULAR
     // just copy the table if Singular already read it
-    if ( q == nfCharQ ) {
+    if ( q == nfCharQ )
+    {
         gf_p = p; gf_n = n;
         gf_q = q; gf_q1 = q - 1;
@@ -112 +116 @@
     bufptr = (char *)strchr( bufptr, ' ' ) + 1;
     int * mipo = new int[degree + 1];
-    for ( i = 0; i <= degree; i++ ) {
+    for ( i = 0; i <= degree; i++ )
+    {
         sscanf( bufptr, "%d", mipo + i );
         bufptr = (char *)strchr( bufptr, ' ' ) + 1;
@@ -125 +130 @@
     int k, digs = gf_tab_numdigits62( gf_q );
     i = 1;
-    while ( i < gf_q ) {
+    while ( i < gf_q )
+    {
         success = fgets( buffer, gf_maxbuffer, inputfile );
         STICKYASSERT( strlen( buffer ) - 1 == (size_t)digs * 30, "illegal table" );
         bufptr = buffer;
         k = 0;
-        while ( i < gf_q && k < 30 ) {
+        while ( i < gf_q && k < 30 )
+        {
             gf_table[i] = convertback62( bufptr, digs );
             bufptr += digs;
@@ -154 +161 @@
     if ( i == gf_primes_len )
         return false;
-    else {
+    else
+    {
         i = n;
         int a = 1;
-        while ( a < gf_maxtable && i > 0 ) {
+        while ( a < gf_maxtable && i > 0 )
+        {
             a *= p;
             i--;
@@ -181 +190 @@
     if ( gf_iszero( a ) )
         return 0;
-    else {
+    else
+    {
         // starting from z^0=1, step through the table
         // counting the steps until we hit z^a or z^0
@@ -187 +197 @@
         // latter is guaranteed to be fulfilled.
         int i = 0, ff = 1;
-        do {
+        do
+        {
             if ( i == a )
                 return ff;
@@ -202 +213 @@
     if ( gf_iszero( a ) )
         return true;
-    else {
+    else
+    {
         // z^a in GF(p) iff (z^a)^p-1=1
         return gf_isone( gf_power( a, gf_p - 1 ) );