Changeset 806c18 in git for factory/gengftables.cc

Timestamp:

Nov 15, 2010, 4:34:57 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7c3bca08c96331a56864c1d35b8c2e8ff2e0be89

Parents:

c840d97af622b4e4da8761738b540e21144f716b

Message:

format

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

File:

• factory/gengftables.cc (modified) (8 diffs)

factory/gengftables.cc

@@ -79 +79 @@
     CanonicalForm prod = x;
     while ( e <= q && ! prod.isOne() ) {
-        e++;
-        prod = ( prod * x ) % f;
+        e++;
+        prod = ( prod * x ) % f;
     }
     return e;
@@ -108 +108 @@
 bool
 findGenRec ( int d, int n, int q,
-             const CanonicalForm & m, const Variable & x,
-             CanonicalForm & result )
+             const CanonicalForm & m, const Variable & x,
+             CanonicalForm & result )
 {
     int i, p = getCharacteristic();
     if ( n < 0 ) {
-        cerr << "."; cerr.flush();
-        // check whether m is irreducible
-        if ( isIrreducible( m ) ) {
-            cerr << "*"; cerr.flush();
-            // check whether m generates multiplicative group
-            if ( exponent( m, q ) == q - 1 ) {
-                result = m;
-                return true;
-            }
-            else
-                return false;
-        }
-        else
-            return false;
+        cerr << "."; cerr.flush();
+        // check whether m is irreducible
+        if ( isIrreducible( m ) ) {
+            cerr << "*"; cerr.flush();
+            // check whether m generates multiplicative group
+            if ( exponent( m, q ) == q - 1 ) {
+                result = m;
+                return true;
+            }
+            else
+                return false;
+        }
+        else
+            return false;
     }
     // for each monomial x^0, ..., x^n, ..., x^d, try all possible coefficients
     else  if ( n == d || n == 0 ) {
-        // we want to have a leading coefficient and a constant term,
-        // so start with coefficient >= 1
-        for ( i = 1; i < p; i++ )
-            if ( findGenRec( d, n-1, q, m + i * power( x, n ), x, result ) )
-                return true;
+        // we want to have a leading coefficient and a constant term,
+        // so start with coefficient >= 1
+        for ( i = 1; i < p; i++ )
+            if ( findGenRec( d, n-1, q, m + i * power( x, n ), x, result ) )
+                return true;
     }
     else {
-        for ( i = 0; i < p; i++ )
-            if ( findGenRec( d, n-1, q, m + i * power( x, n ), x, result ) )
-                return true;
+        for ( i = 0; i < p; i++ )
+            if ( findGenRec( d, n-1, q, m + i * power( x, n ), x, result ) )
+                return true;
     }
     return false;
@@ -164 +164 @@
     cerr << endl;
     if ( ! ok )
-        return 0;
+        return 0;
     else
-        return result;
+        return result;
 }
 //}}}
@@ -206 +206 @@
     T[0] = 1;
     for ( i = 1; i < q; i++ )
-        T[i] = ( T[i-1] * x ) % mipo;
+        T[i] = ( T[i-1] * x ) % mipo;
 
     cerr << "generating addition table ... ";
@@ -216 +216 @@
 
     for ( i = 0; i < q; i++ ) {
-        f = T[i] + 1;
-        int j = 0;
-        while ( j < q && T[j] != f ) j++;
-        table[i] = j;
+        f = T[i] + 1;
+        int j = 0;
+        while ( j < q && T[j] != f ) j++;
+        table[i] = j;
     }
 
@@ -232 +232 @@
     CFIterator MiPo = mipo;
     for ( i = d; MiPo.hasTerms(); i--, MiPo++ ) {
-        int exp;
-        for ( exp = MiPo.exp(); exp < i; i-- )
-            outfile << " 0";
-        outfile << " " << MiPo.coeff();
+        int exp;
+        for ( exp = MiPo.exp(); exp < i; i-- )
+            outfile << " 0";
+        outfile << " " << MiPo.coeff();
     }
     // since mipo is irreducible, it has a constant term,
@@ -246 +246 @@
     i = 1;
     while ( i < q ) {
-        int k = 0;
-        char * sptr = outstr;
-        while ( i < q && k < 30 ) {
-            convert62( table[i], m, sptr );
-            sptr += m;
-            k++; i++;
-        }
-        while ( k < 30 ) {
-            convert62( 0, m, sptr );
-            sptr += m;
-            k++;
-        }
-        outfile << outstr << endl;
+        int k = 0;
+        char * sptr = outstr;
+        while ( i < q && k < 30 ) {
+            convert62( table[i], m, sptr );
+            sptr += m;
+            k++; i++;
+        }
+        while ( k < 30 ) {
+            convert62( 0, m, sptr );
+            sptr += m;
+            k++;
+        }
+        outfile << outstr << endl;
     }
     outfile.close();
@@ -275 +275 @@
     int i, p, q, n;
     for ( i = 0; i < primes_len; i++ ) {
-        p = primes[i];
-        q = p*p;
-        n = 2;
-        setCharacteristic( p );
-        while ( q < maxtable ) {
-            CanonicalForm f = findGen( n, q );
-            ASSERT( f != 0, "no generator found" );
-            printTable( n, q, f );
-            n++; q *= p;
-        }
-    }
-}
+        p = primes[i];
+        q = p*p;
+        n = 2;
+        setCharacteristic( p );
+        while ( q < maxtable ) {
+            CanonicalForm f = findGen( n, q );
+            ASSERT( f != 0, "no generator found" );
+            printTable( n, q, f );
+            n++; q *= p;
+        }
+    }
+}