Changeset 17b0b05 in git

Timestamp:

May 12, 2011, 3:12:45 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

2c41bc0e28c6628127866480994b3041a3c1f0af

Parents:

ea000154f0b80de2f44a961be0d4a407828b72c9

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-05-12 15:12:45+02:00

git-committer:

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

Message:

fix loading of gftables

- fix loading in nfReadTable
- fix feCleanUpFile
- add to feResourceConfigs: %b/../../factory/gftables
- add feStringAppendResources to test of GF polys

Location:

libpolys

Files:

• coeffs/ffields.cc (modified) (2 diffs)
• polys/monomials/ring.cc (modified) (2 diffs)
• polys/monomials/ring.h (modified) (1 diff)
• resources/feResource.cc (modified) (4 diffs)
• tests/polys_test.h (modified) (1 diff)

libpolys/coeffs/ffields.cc

@@ -17 +17 @@
 #include <resources/feFopen.h>
 #include <math.h>
-#include <factory/factory.h>
 
 
@@ -612 +611 @@
     else     r->m_nfCharQ = -c;
     char buf[100];
-    sprintf(buf,GFTABLEDIR "/%d",r->m_nfCharQ);
+    sprintf(buf,"%d",r->m_nfCharQ);
     FILE * fp = feFopen(buf,"r",NULL,TRUE);
     if (fp==NULL)

libpolys/polys/monomials/ring.cc

@@ -136 +136 @@
 */
 
-ring rDefault(coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1)
+ring rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1)
 {
   assume( cf != NULL);
@@ -170 +170 @@
   return rDefault(cf,N,n,ord_size,ord,block0,block1);
 }
-ring   rDefault(coeffs cf, int N, char **n)
-{
-  assume( cf != NULL);
-  /*order: lp,0*/
-  int *order = (int *) omAlloc(2* sizeof(int));
-  int *block0 = (int *)omAlloc0(2 * sizeof(int));
-  int *block1 = (int *)omAlloc0(2 * sizeof(int));
-  /* ringorder dp for the first block: var 1..N */
-  order[0]  = ringorder_lp;
-  block0[0] = 1;
-  block1[0] = N;
-  /* the last block: everything is 0 */
-  order[1]  = 0;
-
-  return rDefault(cf,N,n,2,order,block0,block1);
+ring   rDefault(const coeffs cf, int N, char **n)
+{
+  if( cf != NULL)
+  {
+    /*order: lp,0*/
+    int *order = (int *) omAlloc(2* sizeof(int));
+    int *block0 = (int *)omAlloc0(2 * sizeof(int));
+    int *block1 = (int *)omAlloc0(2 * sizeof(int));
+    /* ringorder dp for the first block: var 1..N */
+    order[0]  = ringorder_lp;
+    block0[0] = 1;
+    block1[0] = N;
+    /* the last block: everything is 0 */
+    order[1]  = 0;
+
+    return rDefault(cf,N,n,2,order,block0,block1);
+  }
+  else return NULL;
 }
 

libpolys/polys/monomials/ring.h

@@ -335 +335 @@
 idhdl  rDefault(const char *s);
 ring   rDefault(int ch, int N, char **n);
-ring   rDefault(coeffs cf, int N, char **n);
+ring   rDefault(const coeffs cf, int N, char **n);
 ring rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1);
-ring rDefault(coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1);
+ring rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1);
 
 // #define rIsRingVar(A) r_IsRingVar(A,currRing)

libpolys/resources/feResource.cc

@@ -17 +17 @@
 
 #include "feResource.h"
-
 
 #ifdef AIX_4
@@ -83 +82 @@
    "%r/../LIB;"
    "%d/LIB;"
-   "%d/../LIB"
+   "%d/../LIB;"
+   "%b/../../../factory/gftables;"
+   "%b/../../factory/gftables",
    ""},
   {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",(char *)""},
@@ -523 +524 @@
         if (*(fn+2) == '.' && (*(fn + 3) == '/' || *(fn + 3) == '\0'))
         {
+        #if 0
+        // this does not work: ./../../mmm will be changed to ./../mmm
+        // but we only want to change ././mmm to ./mmm
           *fn = '\0';
           s = strrchr(fname, '/');
@@ -534 +538 @@
             *fn = '/';
           }
+        #endif
         }
         else if (*(fn+2) == '/' || *(fn+2) == '\0')

libpolys/tests/polys_test.h

@@ -300 +300 @@
    void test_Z13_t_GF()
    {
+     StringSetS("ressources in use (as reported by feStringAppendResources(0):\n");
+     feStringAppendResources(0);
+     PrintS(StringAppendS("\n"));
+
      clog << "Creating  GF[t]: " << endl;