Changeset 047597 in git


Ignore:
Timestamp:
Sep 14, 2011, 6:57:01 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '45e267b9942dec9429fe249ce3e5e44ab80a6a3a')
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:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/misc_ip.cc

    r1d768d r047597  
    1414
    1515// include header files
     16#include <misc/auxiliary.h>
    1617#include <kernel/mod2.h>
    17 #include <misc/auxiliary.h>
    1818
    1919#ifdef HAVE_FACTORY
     
    2222#endif
    2323
     24#include <coeffs/si_gmp.h>
     25#include <coeffs/coeffs.h>
     26
     27#include <polys/ext_fields/algext.h>
     28#include <polys/ext_fields/transext.h>
     29
    2430#include "misc_ip.h"
    2531#include "ipid.h"
    26 
    27 #include <coeffs/si_gmp.h>
    28 #include <coeffs/coeffs.h>
    29 
    3032#include "feOpt.h"
    3133#include "silink.h"
     
    11111113  memset(&sLastPrinted,0,sizeof(sleftv));
    11121114  sLastPrinted.rtyp=NONE;
    1113   extern int iiInitArithmetic();
    1114   iiInitArithmetic();
     1115 
     1116  extern int iiInitArithmetic(); iiInitArithmetic(); // iparith.cc
     1117
    11151118  basePack=(package)omAlloc0(sizeof(*basePack));
    11161119  currPack=basePack;
     
    11211124  currPackHdl=h;
    11221125  basePackHdl=h;
    1123   coeffs_BIGINT=nInitChar(n_Q,NULL);
     1126
     1127  coeffs_BIGINT = nInitChar(n_Q,NULL);
     1128 
     1129#if 1
     1130   // def HAVE_POLYEXTENSIONS
     1131  if(TRUE)
     1132  {
     1133    n_coeffType type = nRegister(n_algExt, naInitChar);
     1134    assume(type == n_algExt);
     1135     
     1136    type = nRegister(n_transExt, ntInitChar);
     1137    assume(type == n_transExt);
     1138  }
     1139#endif
    11241140
    11251141// random generator: -----------------------------------------------
  • libpolys/coeffs/numbers.cc

    r1d768d r047597  
    3131#include <coeffs/ffields.h>
    3232#include <coeffs/shortfl.h>
     33
    3334#ifdef HAVE_RINGS
    3435#include <coeffs/rmodulo2m.h>
     
    3940#ifdef HAVE_POLYEXTENSIONS
    4041#include <polys/ext_fields/algext.h>
     42#include <polys/ext_fields/transext.h>
    4143#endif
    4244
     
    177179 #ifdef HAVE_POLYEXTENSIONS
    178180 naInitChar,  /* n_algExt */
     181 ntInitChar,  /* n_transExt */
    179182 #else
    180183 NULL,        /* n_algExt */
    181  #endif
    182  NULL, /* n_transExt */
     184 NULL,        /* n_transExt */
     185 #endif   
    183186 ngcInitChar,  /* n_long_C */
    184187 #ifdef HAVE_RINGS
     
    255258      nOK = (nInitCharTable[t])(n,parameter);
    256259    else
    257        Werror("nInitCharTable[%d] missing",(int)t);
     260       Werror("Sorry: the coeff type [%d] was not registered: it is missing in nInitCharTable", (int)t);
    258261    if (nOK)
    259262    {
  • libpolys/configure.ac

    r1d768d r047597  
    8383AC_DEFINE([NOSTREAMIO],[1],[DISABLE_GMP_CPP])
    8484
     85## AC_DEFINE([HAVE_POLYEXTENSIONS], [1], [Enable the algebraic & transcendental extensions])
     86
    8587AC_CONFIG_FILES([Makefile])
    8688AC_CONFIG_FILES([misc/Makefile])
Note: See TracChangeset for help on using the changeset viewer.