Changeset cf2d9e in git

Timestamp:

Jan 10, 2012, 4:53:09 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

72486f0639537653ca068a90c827262845f27ce2

Parents:

41d31d33c92e8a93df58457734616fabacdcb346

git-author:

Martin Lee <martinlee84@web.de>2012-01-10 16:53:09+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-03 17:54:39+01:00

Message:

chg: use feFopen to open GF tables if Singular is used

TODO: add a check if table was already read in and if so load it from memory?

Location:

factory

Files:

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

factory/gfops.cc

@@ -21 +21 @@
 #include "variable.h"
 #include "gfops.h"
+
+#ifdef SINGULAR
+#include "singext.h"
+#endif
 
 
@@ -74 +78 @@
         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
-    sprintf( buffer, GFTABLEDIR "/%d", q );
+#ifndef SINGULAR
+    sprintf( buffer, GFTABLEDIR "/%d", q);
     FILE * inputfile = fopen( buffer, "r" );
+#else
+    int check= 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 <factory/cf_gmp.h>
+
+extern FILE * feFopen ( const char * path, const char * mode);
 
 /*BEGINPUBLIC*/