Changeset 047597 in git

Timestamp:

Sep 14, 2011, 6:57:01 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

a55ef037cdd445d3fc4149a3d95a4ebaecf3c2f5

Parents:

1d768d19dda8cae4ddc99de63c5a4e9e6e563ad1

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-14 18:57:01+02:00

git-committer:

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

Message:

FIX: registration of naInitChar and ntInitChar (siInit in Singular/misc_ip.cc)

Files:

• Singular/misc_ip.cc (modified) (4 diffs)
• libpolys/coeffs/numbers.cc (modified) (4 diffs)
• libpolys/configure.ac (modified) (1 diff)

Singular/misc_ip.cc

@@ -14 +14 @@
 
 // include header files
+#include <misc/auxiliary.h>
 #include <kernel/mod2.h>
-#include <misc/auxiliary.h>
 
 #ifdef HAVE_FACTORY
@@ -22 +22 @@
 #endif
 
+#include <coeffs/si_gmp.h>
+#include <coeffs/coeffs.h>
+
+#include <polys/ext_fields/algext.h>
+#include <polys/ext_fields/transext.h>
+
 #include "misc_ip.h"
 #include "ipid.h"
-
-#include <coeffs/si_gmp.h>
-#include <coeffs/coeffs.h>
-
 #include "feOpt.h"
 #include "silink.h"
@@ -1111 +1113 @@
   memset(&sLastPrinted,0,sizeof(sleftv));
   sLastPrinted.rtyp=NONE;
-  extern int iiInitArithmetic();
-  iiInitArithmetic();
+  
+  extern int iiInitArithmetic(); iiInitArithmetic(); // iparith.cc
+
   basePack=(package)omAlloc0(sizeof(*basePack));
   currPack=basePack;
@@ -1121 +1124 @@
   currPackHdl=h;
   basePackHdl=h;
-  coeffs_BIGINT=nInitChar(n_Q,NULL);
+
+  coeffs_BIGINT = nInitChar(n_Q,NULL);
+  
+#if 1 
+   // def HAVE_POLYEXTENSIONS
+  if(TRUE)
+  {
+    n_coeffType type = nRegister(n_algExt, naInitChar);
+    assume(type == n_algExt);
+     
+    type = nRegister(n_transExt, ntInitChar);
+    assume(type == n_transExt);
+  }
+#endif
 
 // random generator: -----------------------------------------------

libpolys/coeffs/numbers.cc

@@ -31 +31 @@
 #include <coeffs/ffields.h>
 #include <coeffs/shortfl.h>
+
 #ifdef HAVE_RINGS
 #include <coeffs/rmodulo2m.h>
@@ -39 +40 @@
 #ifdef HAVE_POLYEXTENSIONS
 #include <polys/ext_fields/algext.h>
+#include <polys/ext_fields/transext.h>
 #endif
 
@@ -177 +179 @@
  #ifdef HAVE_POLYEXTENSIONS
  naInitChar,  /* n_algExt */
+ ntInitChar,  /* n_transExt */
  #else
  NULL,        /* n_algExt */
- #endif
- NULL, /* n_transExt */
+ NULL,        /* n_transExt */
+ #endif   
  ngcInitChar,  /* n_long_C */
  #ifdef HAVE_RINGS
@@ -255 +258 @@
       nOK = (nInitCharTable[t])(n,parameter);
     else
-       Werror("nInitCharTable[%d] missing",(int)t);
+       Werror("Sorry: the coeff type [%d] was not registered: it is missing in nInitCharTable", (int)t);
     if (nOK)
     {

libpolys/configure.ac

@@ -83 +83 @@
 AC_DEFINE([NOSTREAMIO],[1],[DISABLE_GMP_CPP])
 
+## AC_DEFINE([HAVE_POLYEXTENSIONS], [1], [Enable the algebraic & transcendental extensions])
+
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([misc/Makefile])