Changeset 9a9034 in git

Timestamp:

May 12, 2011, 10:39:59 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

ea000154f0b80de2f44a961be0d4a407828b72c9

Parents:

6137945778b99e12da0ed42de11464a71e637602

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-05-12 10:39:59+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:06+01:00

Message:

fix: files names and loading of gftables

Location:

factory

Files:

• gfops.cc (modified) (2 diffs)
• singext.h (modified) (1 diff)

factory/gfops.cc

@@ -20 +20 @@
 #include "canonicalform.h"
 #include "variable.h"
-#ifdef SINGULAR
-#include "singext.h"
-#endif
 #include "gfops.h"
 
@@ -77 +74 @@
         gf_table = new unsigned short[gf_maxtable];
 
-#ifdef SINGULAR
-    // just copy the table if Singular already read it
-    //printf("init_gf(gf_get_table) q=%d, nfCharQ=%d\n",q,nfCharQ);
-    if ( q == nfCharQ )
-    {
-        gf_p = p; gf_n = n;
-        gf_q = q; gf_q1 = q - 1;
-        gf_m1 = nfM1;
-        gf_mipo = intVec2CF( nfMinPoly[0], nfMinPoly + 1, 1 );
-        (void)memcpy( gf_table, nfPlus1Table, gf_q * sizeof( unsigned short ) );
-        gf_table[gf_q] = 0;
-        return;
-    }
-#endif
-
     // try to open file
-#ifndef SINGULAR
-    sprintf( buffer, GFTABLEDIR "/gftable.%d.%d", p, n );
+    sprintf( buffer, GFTABLEDIR "/%d", q );
     FILE * inputfile = fopen( buffer, "r" );
-#else
-    sprintf( buffer, "gftables/%d", q );
-    FILE * inputfile = feFopen( buffer, "r" );
-#endif
     STICKYASSERT( inputfile, "can not open GF(q) table" );
 

factory/singext.h

@@ -9 +9 @@
 #include "canonicalform.h"
 #include "cf_gmp.h"
-
-// we need this to copy singulars GF(q) table to ours
-extern int nfCharQ;
-extern int nfM1;
-extern int nfMinPoly[];
-extern short nfPlus1Table[];
-
-// used to open the GF(q) tables from Singular
-extern FILE * feFopen ( const char * path, const char * mode, char *where = 0, int useWerror = 0, int path_only = 0);
 
 /*BEGINPUBLIC*/