Changeset e4fe2b in git


Ignore:
Timestamp:
Aug 23, 2011, 9:17:33 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
72ebdb01e4821ac45cbf1e8065cb15515ef1b391
Parents:
fbb01737147ed8f605c88489320c73e975833f32
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-23 21:17:33+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:25+01:00
Message:
FIX: Fixed huge BUG in cf_gmp.h
CHG: starting to cleanup factory
Files:
153 edited

Legend:

Unmodified
Added
Removed

  • factory/CMakeLists.txt

    rfbb0173 re4fe2b  
    165165  fieldGCD.cc
    166166  ffops.cc
    167   ffreval.cc
    168167  gf_tabutil.cc
    169168  gfops.cc

  • factory/DegreePattern.cc

    rfbb0173 re4fe2b  
    1313/*****************************************************************************/
    1414
    15 #include <config.h>
     15#include "config.h"
    1616
    1717#include "DegreePattern.h"

  • factory/DegreePattern.h

    rfbb0173 re4fe2b  
    1515#define DEGREE_PATTERN_H
    1616
    17 #include <config.h>
     17// #include "config.h"
    1818
    1919#include "cf_assert.h"

  • factory/ExtensionInfo.cc

    rfbb0173 re4fe2b  
    1313/*****************************************************************************/
    1414
    15 #include <config.h>
     15#include "config.h"
    1616
    1717#include "ExtensionInfo.h"

  • factory/ExtensionInfo.h

    rfbb0173 re4fe2b  
    1818#define EXTENSION_INFO_H
    1919
    20 #include <config.h>
     20// #include "config.h"
    2121
    2222#include "canonicalform.h"

  • factory/Makefile.am

    rfbb0173 re4fe2b  
    2929                cf_gcd_smallp.cc \
    3030                cf_generator.cc \
    31                 cfGEval.cc \
    3231                cf_globals.cc \
    3332                cf_hnf.cc \
    … …  
    7372                fieldGCD.cc \
    7473                ffops.cc \
    75                 ffreval.cc \
    7674                gf_tabutil.cc \
    7775                gfops.cc \
    … …  
    9290                singext.cc \
    9391                parseutil.cc \
    94                 readcf.yy \
    95                 factory.h \
    96                 factoryconf.h \
    97                 ftmpl_inst.cc
     92                ftmpl_inst.cc \
     93                factory.h factoryconf.h cplusplus.h \
     94                readcf.yy
     95
    9896
    9997libfactory_a_SOURCES = $(SOURCES)
    … …  
    110108                cf_factory.h \
    111109                cf_generator.h \
    112                 cfGEval.h \
    113110                cf_globals.h \
    114111                cf_gcd_smallp.h \
    … …  
    118115                cf_map.h \
    119116                cfNewtonPolygon.h \
    120                 cfModResultant.h \
     117                cfModResultant.h \
    121118                cf_primes.h \
    122119                cf_primetab.h \
    … …  
    148145                fieldGCD.h \
    149146                ffops.h \
    150                 ffreval.h \
    151147                templates/ftmpl_list.h \
    152148                templates/ftmpl_matrix.h \
    … …  
    250246        ${srcdir}/bin/makeheader $< $@
    251247
    252 BUILT_SOURCES = factory.h factoryconf.h
     248BUILT_SOURCES = cplusplus.h factory.h factoryconf.h
     249
    253250
    254251libfactory_a_include_HEADERS=$(BUILT_SOURCES)
    … …  
    312309                bin/makeheader bin/gen-readcf readcf.cc $(gftables_DATA)
    313310
    314 CLEANFILES = factory.h factoryconf.h
     311CLEANFILES = factory.h factoryconf.h cplusplus.h
     312
     313
     314
     315EXTRA_PROGRAMS = cplusplus
     316
     317cplusplus_SOURCES = cplusplus.cc
     318
     319cplusplus.h: cplusplus
     320        ${builddir}/cplusplus > ${builddir}/cplusplus.h
     321
     322cf_gmp.h: cplusplus.h

  • factory/NTLconvert.cc

    rfbb0173 re4fe2b  
    11/* $Id$ */
    2 #include <config.h>
     2#include "config.h"
    33
    44#include "cf_assert.h"

  • factory/NTLconvert.h

    rfbb0173 re4fe2b  
    33#define INCL_NTLCONVERT_H
    44
    5 #include <config.h>
    6 
    75#ifdef HAVE_NTL
    86
    9 #include "cf_gmp.h"
     7// #include "cf_gmp.h"
    108
    119#include "cf_defs.h"
    … …  
    1917#include "cf_algorithm.h"
    2018
     19#include <NTL/config.h>
    2120
    22 #include <NTL/config.h>
    2321#ifdef NTL_STD_CXX
    2422#ifdef NOSTREAMIO
    … …  
    3533#endif
    3634
     35
    3736#include <NTL/ZZXFactoring.h>
    3837#include <NTL/ZZ_pXFactoring.h>
    3938#include <NTL/lzz_pXFactoring.h>
    4039#include <NTL/GF2XFactoring.h>
    41 #include "int_int.h"
    4240#include <NTL/ZZ_pEXFactoring.h>
    4341#include <NTL/lzz_pEXFactoring.h>
    … …  
    4745#include <NTL/mat_lzz_pE.h>
    4846
    49 #include "cf_assert.h"
    50 
    5147#ifdef NTL_CLIENT               // in <NTL/tools.h>: using of name space NTL
    5248NTL_CLIENT
    5349#endif
     50
     51
     52
     53
     54#include "int_int.h"
     55#include "cf_assert.h"
     56
    5457
    5558ZZ_pX convertFacCF2NTLZZpX(CanonicalForm f);

  • factory/abs_fac.cc

    rfbb0173 re4fe2b  
    1 
     1#include "config.h"
    22#include "canonicalform.h"
     3
    34#ifdef HAVE_BIFAC
    4 #ifndef NOSTREAMIO
    5 #include<fstream>
    6 #endif
    7 #include <sys/timeb.h>
     5
     6# ifndef NOSTREAMIO
     7#  include<fstream>
     8# endif
     9
     10# include <sys/timeb.h>
    811
    912
    … …  
    10711074
    10721075}
    1073 #endif
     1076#endif /* HAVE_BIFAC */

  • factory/algext.h

    rfbb0173 re4fe2b  
    22#define ALGEXT_H
    33
    4 #include <config.h>
     4// #include "config.h"
    55
    66#include "canonicalform.h"

  • factory/bifac.cc

    rfbb0173 re4fe2b  
     1#include "config.h"
     2
    13#include "canonicalform.h"
     4
    25#ifdef HAVE_BIFAC
    3 #include "lgs.h"
     6
     7# include "lgs.h"
    48#include "bifacConfig.h"
    59
    610#define BIFAC_BASIS_OF_G_CHECK        1
     11
    712void Reduce( bool );
    813CanonicalForm Bigcd( const CanonicalForm& f, const CanonicalForm& g);
    … …  
    12921297
    12931298// ==============  end of 'bifac.cc'  ==================
    1294 #endif
     1299#endif /* #ifdef HAVE_BIFAC */

  • factory/bifac.h

    rfbb0173 re4fe2b  
    1313
    1414#include <time.h>
    15 #include <factoryconf.h>
     15
     16// #include <factoryconf.h>
     17
    1618#ifdef HAVE_BIFAC
    1719

  • factory/canonicalform.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"
    7 
    87#include "cf_factory.h"
    98
    … …  
    1716#include "gfops.h"
    1817#include "cf_binom.h"
     18
    1919#if defined (USE_MEMUTIL) && ! defined (USE_OLD_MEMMAN)
    2020#include "memman.h"
    2121#endif
    2222
     23#include "cf_gmp.h"
     24
     25
    2326#ifndef NOSTREAMIO
    2427CanonicalForm readCF( ISTREAM& );
    … …  
    2831int initializeGMP();
    2932int initializeCharacteristic();
     33
    3034#ifdef SINGULAR
    3135extern int mmInit(void);

  • factory/canonicalform.h

    rfbb0173 re4fe2b  
    55#define INCL_CANONICALFORM_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#ifndef NOSTREAMIO
    10 #ifdef HAVE_IOSTREAM
    11 #include <iostream>
    12 #define OSTREAM std::ostream
    13 #define ISTREAM std::istream
    14 #elif defined(HAVE_IOSTREAM_H)
    15 #include <iostream.h>
    16 #define OSTREAM ostream
    17 #define ISTREAM istream
    18 #endif
     10# ifdef HAVE_IOSTREAM
     11#  include <iostream>
     12#  define OSTREAM std::ostream
     13#  define ISTREAM std::istream
     14# elif defined(HAVE_IOSTREAM_H)
     15#  include <iostream.h>
     16#  define OSTREAM ostream
     17#  define ISTREAM istream
     18# endif
    1919#endif /* NOSTREAMIO */
    2020
    … …  
    165165    // input/output
    166166#ifndef NOSTREAMIO
    167     void print( OSTREAM&, char * ) const;
    168     void print( OSTREAM& ) const;
    169     friend OSTREAM& operator << ( OSTREAM&, const CanonicalForm& );
    170     friend ISTREAM& operator >> ( ISTREAM&, CanonicalForm& );
     167   void print( OSTREAM&, char * ) const;
     168   void print( OSTREAM& ) const;
     169   friend OSTREAM& operator << ( OSTREAM&, const CanonicalForm& );
     170   friend ISTREAM& operator >> ( ISTREAM&, CanonicalForm& );
    171171#endif /* NOSTREAMIO */
    172172

  • factory/cfModResultant.cc

    rfbb0173 re4fe2b  
    1313/*****************************************************************************/
    1414
    15 
    16 #include "assert.h"
     15#include "config.h"
     16
     17#include "cf_assert.h"
    1718
    1819#include "cfModResultant.h"
    … …  
    2122#include "cf_map.h"
    2223#include "cf_algorithm.h"
     24#include "cf_iter.h"
    2325
    2426#ifdef HAVE_NTL

  • factory/cfNewtonPolygon.cc

    rfbb0173 re4fe2b  
    1515/*****************************************************************************/
    1616
    17 #include <config.h>
     17#include "config.h"
    1818#include <stdlib.h>
    1919

  • factory/cfNewtonPolygon.h

    rfbb0173 re4fe2b  
    1818#define CF_NEWTON_POLYGON_H
    1919
    20 #include <config.h>
     20// #include "config.h"
    2121
    2222#ifdef HAVE_NTL

  • factory/cf_algorithm.cc

    rfbb0173 re4fe2b  
    1919//}}}
    2020
    21 #include <config.h>
     21#include "config.h"
    2222
    2323#include "cf_assert.h"

  • factory/cf_algorithm.h

    rfbb0173 re4fe2b  
    2424//}}}
    2525
    26 #include <config.h>
     26// #include "config.h"
    2727
    2828#include "canonicalform.h"

  • factory/cf_binom.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/cf_binom.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_BINOM_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/cf_char.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/cf_chinese.cc

    rfbb0173 re4fe2b  
    1212//}}}
    1313
    14 #include <config.h>
    15 
    16 #include "cf_assert.h"
    17 #include "debug.h"
    18 
    19 #include "canonicalform.h"
    20 #include "cf_iter.h"
     14#include "config.h"
    2115
    2216#ifdef HAVE_NTL
    2317#include "NTLconvert.h"
    2418#endif
     19
     20#include "cf_assert.h"
     21#include "debug.h"
     22
     23#include "canonicalform.h"
     24#include "cf_iter.h"
     25
    2526
    2627//{{{ void chineseRemainder ( const CanonicalForm & x1, const CanonicalForm & q1, const CanonicalForm & x2, const CanonicalForm & q2, CanonicalForm & xnew, CanonicalForm & qnew )

  • factory/cf_cyclo.cc

    rfbb0173 re4fe2b  
    1717//*****************************************************************************
    1818
    19 #include <config.h>
     19#include "config.h"
    2020
    2121#include "canonicalform.h"
    2222#include "cf_primes.h"
    2323#include "cf_util.h"
     24#include "cf_assert.h"
    2425
    2526#ifdef HAVE_NTL

  • factory/cf_cyclo.h

    rfbb0173 re4fe2b  
    1919//*****************************************************************************
    2020
    21 #include <config.h>
     21// #include "config.h"
    2222
    2323int* integerFactorizer (const long integer, int& length, bool& fail);

  • factory/cf_defs.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_DEFS_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99/*BEGINPUBLIC*/

  • factory/cf_eval.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/cf_eval.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_EVAL_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#ifndef NOSTREAMIO

  • factory/cf_factor.cc

    rfbb0173 re4fe2b  
    1212//}}}
    1313
    14 #include <config.h>
     14#include "config.h"
    1515
    1616#include "cf_assert.h"

  • factory/cf_factory.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/cf_factory.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_FACTORY_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "cf_defs.h"
    1010#include "variable.h"
    11 #include "cf_gmp.h"
     11
     12#include <factory/cf_gmp.h>
    1213
    1314class InternalCF;
    … …  
    3435};
    3536
     37
    3638MP_INT getmpi ( InternalCF * value, bool symmetric = true );
    3739

  • factory/cf_gcd.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/cf_gcd_smallp.cc

    rfbb0173 re4fe2b  
    1919//*****************************************************************************
    2020
    21 #include <config.h>
     21#include "config.h"
    2222
    2323#include "cf_assert.h"

  • factory/cf_gcd_smallp.h

    rfbb0173 re4fe2b  
    2323//*****************************************************************************
    2424
    25 #include <config.h>
     25// #include "config.h"
    2626#include "cf_assert.h"
    2727

  • factory/cf_generator.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/cf_generator.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_GENERATOR_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/cf_globals.cc

    rfbb0173 re4fe2b  
    1010//}}}
    1111
    12 #include <config.h>
     12#include "config.h"
    1313
    1414#include "cf_switches.h"

  • factory/cf_globals.h

    rfbb0173 re4fe2b  
    1111//}}}
    1212
    13 #include <config.h>
     13// #include "config.h"
    1414
    1515#include "cf_switches.h"

  • factory/cf_gmp.h

    rfbb0173 re4fe2b  
    44
    55#ifdef __cplusplus
    6   #define __cplusplus_backup __cplusplus
     6//  #define __cplusplus_backup __cplusplus
    77  #undef __cplusplus
    8   extern "C" {
    9   #include <gmp.h>
     8  extern "C"
     9  {
     10    #include <gmp.h>
    1011  }
    11   #define __cplusplus __cplusplus_backup
     12  #include <factory/cplusplus.h>
     13//  #define __cplusplus __cplusplus_backup
    1214#else
    1315  #include <gmp.h>

  • factory/cf_inline.cc

    rfbb0173 re4fe2b  
    7575#endif
    7676
    77 #include <config.h>
     77#include "config.h"
    7878
    7979#include "cf_assert.h"

  • factory/cf_irred.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/cf_irred.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_IRRED_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/cf_iter.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/cf_iter.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_ITER_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/cf_iter_inline.cc

    rfbb0173 re4fe2b  
    2222#endif
    2323
    24 #include <config.h>
     24#include "config.h"
    2525
    2626#include "cf_assert.h"

  • factory/cf_linsys.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/cf_map.cc

    rfbb0173 re4fe2b  
    1010//}}}
    1111
    12 #include <config.h>
     12#include "config.h"
    1313
    1414#include "canonicalform.h"

  • factory/cf_map.h

    rfbb0173 re4fe2b  
    1111//}}}
    1212
    13 #include <config.h>
     13// #include "config.h"
    1414
    1515#ifndef NOSTREAMIO

  • factory/cf_map_ext.cc

    rfbb0173 re4fe2b  
    1717//*****************************************************************************
    1818
    19 #include <config.h>
     19#include "config.h"
    2020
    2121#include "cf_assert.h"

  • factory/cf_map_ext.h

    rfbb0173 re4fe2b  
    1919//*****************************************************************************
    2020
    21 #include <config.h>
     21// #include "config.h"
    2222
    2323int findItem (const CFList& list, const CanonicalForm& item);

  • factory/cf_ops.cc

    rfbb0173 re4fe2b  
    2020//}}}
    2121
    22 #include <config.h>
     22#include "config.h"
    2323
    2424#include "cf_assert.h"

  • factory/cf_primes.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/cf_primes.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_PRIMES_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99/*BEGINPUBLIC*/

  • factory/cf_primetab.cc

    rfbb0173 re4fe2b  
    1515//}}}
    1616
    17 #include <config.h>
     17#include "config.h"
    1818
    1919#include "cf_primes.h"

  • factory/cf_primetab.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_PRIMETAB_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#define NUMSMALLPRIMES 3511

  • factory/cf_random.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include <time.h>

  • factory/cf_random.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_RANDOM_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/cf_resultant.cc

    rfbb0173 re4fe2b  
    1010//}}}
    1111
    12 #include <config.h>
     12#include "config.h"
    1313
    1414#include "cf_assert.h"

  • factory/cf_reval.cc

    rfbb0173 re4fe2b  
    44#define MORE_ZEROES
    55
    6 #include <config.h>
     6#include "config.h"
    77
    88#include "cf_assert.h"

  • factory/cf_reval.h

    rfbb0173 re4fe2b  
    55#define INCL_CF_REVAL_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/cf_switches.cc

    rfbb0173 re4fe2b  
    1010//}}}
    1111
    12 #include <config.h>
     12#include "config.h"
    1313
    1414#include "cf_switches.h"

  • factory/cf_switches.h

    rfbb0173 re4fe2b  
    1111//}}}
    1212
    13 #include <config.h>
     13// #include "config.h"
    1414
    1515//{{{ const int CFSwitchesMax

  • factory/cf_util.cc

    rfbb0173 re4fe2b  
    1111//}}}
    1212
    13 #include <config.h>
     13#include "config.h"
    1414
    1515//{{{ int ipower ( int b, int m )

  • factory/cf_util.h

    rfbb0173 re4fe2b  
    1111//}}}
    1212
    13 #include <config.h>
     13// #include "config.h"
    1414
    1515int ipower ( int b, int n );

  • factory/configure.ac

    rfbb0173 re4fe2b  
    1616AC_CONFIG_SRCDIR(canonicalform.cc)
    1717AC_CONFIG_MACRO_DIR([../m4])
    18 AC_CONFIG_HEADER(config.h)
    1918AC_CONFIG_AUX_DIR([.])
    2019AM_MAINTAINER_MODE
    … …  
    3736#
    3837AC_ARG_WITH(
     38  Singular,
     39  [AS_HELP_STRING([--without-Singular],[build NOT for the use with CAS Singular.])],
     40  ,
     41  [with_Singular=yes])
     42
     43
     44AC_ARG_WITH(
    3945  memman,
    4046  [  --with-memman(=<memman>) specify Factory memory manager.
    … …  
    5157AC_ARG_WITH(
    5258  omalloc,
    53   [  --with-omalloc           build for use with omalloc])
    54 
    55 AC_ARG_WITH(
    56   Singular,
    57   [  --with-Singular         build for use with computer algebra system Singular.],
    58   ,
    59   with_Singular=no)
     59  [AS_HELP_STRING([--with-omalloc],[build for use with omalloc])])
     60
    6061
    6162AC_ARG_ENABLE(
    6263  cf-inline,
    63   [  --enable-cf-inline      build Factory with \"configurable inline methods\"
    64                           enabled.],
    65   ,
    66   enable_cf_inline=no)
     64  [AS_HELP_STRING([--enable-cf-inline],[build Factory with \"configurable inline methods\" enabled.])],
     65  [enable_cf_inline=$enableval],
     66  [enable_cf_inline=no])
    6767
    6868AC_ARG_ENABLE(
    6969  streamio,
    70   [  --disable-streamio      build Factory without stream IO],
    71   ,
    72   [ if test "x$with_Singular" = xyes; then
    73       enable_streamio=no
    74     else
    75       enable_streamio=yes
    76     fi ])
     70  [AS_HELP_STRING([--enable-streamio],[build Factory with stream IO])],
     71  ,
     72  [enable_streamio=no])
    7773
    7874AC_ARG_ENABLE(
    … …  
    8682AC_ARG_ENABLE(
    8783  assertions,
    88   [  --enable-assertions     build Factory with assertions activated],
     84  [AS_HELP_STRING([--enable-assertions],[build Factory with assertions activated])],
    8985  ,
    9086  enable_assertions=no)
    … …  
    9288AC_ARG_ENABLE(
    9389  timing,
    94   [  --enable-timing         build Factory so it will print timing information],
     90  [AS_HELP_STRING([--enable-timing],[build Factory so it will print timing information])],
    9591  ,
    9692  enable_timing=no)
    … …  
    9894AC_ARG_ENABLE(
    9995  debugoutput,
    100   [  --enable-debugoutput    build Factory so it will print debugging information],
     96  [AS_HELP_STRING([--enable-debugoutput],[build Factory so it will print debugging information])],
    10197  ,
    10298  enable_debugoutput=no)
    … …  
    470466AC_DEFINE_UNQUOTED([GFTABLEDIR], "$explicit_gftabledir", [GFTABLEDIR])
    471467
     468AC_CONFIG_HEADER(config.h)
    472469AC_OUTPUT(Makefile ftest/GNUmakefile)

  • factory/facAlgExt.cc

    rfbb0173 re4fe2b  
    1818//*****************************************************************************
    1919
    20 #include <config.h>
     20#include "config.h"
    2121
    2222#include "cf_assert.h"

  • factory/facBivar.cc

    rfbb0173 re4fe2b  
    1313/*****************************************************************************/
    1414
    15 #include <config.h>
     15#include "config.h"
    1616
    1717#include "assert.h"

  • factory/facBivar.h

    rfbb0173 re4fe2b  
    1616#define FAC_BIVAR_H
    1717
    18 #include <config.h>
     18// #include "config.h"
    1919
    2020#include "assert.h"

  • factory/facFactorize.cc

    rfbb0173 re4fe2b  
    1313/*****************************************************************************/
    1414
    15 #include <config.h>
     15#include "config.h"
    1616
    1717#include "assert.h"

  • factory/facFactorize.h

    rfbb0173 re4fe2b  
    1616#define FAC_FACTORIZE_H
    1717
    18 #include <config.h>
     18// #include "config.h"
    1919
    2020#include "facBivar.h"

  • factory/facFqBivar.cc

    rfbb0173 re4fe2b  
    1919/*****************************************************************************/
    2020
    21 #include <config.h>
     21#include "config.h"
    2222
    2323#include "cf_assert.h"

  • factory/facFqBivar.h

    rfbb0173 re4fe2b  
    1717#define FAC_FQ_BIVAR_H
    1818
    19 #include <config.h>
     19// #include "config.h"
    2020
    2121#include "cf_assert.h"

  • factory/facFqBivarUtil.cc

    rfbb0173 re4fe2b  
    1313/*****************************************************************************/
    1414
    15 #include <config.h>
     15#include "config.h"
    1616
    1717#include "cf_map.h"

  • factory/facFqBivarUtil.h

    rfbb0173 re4fe2b  
    1616#define FAC_FQ_BIVAR_UTIL_H
    1717
    18 #include <config.h>
     18// #include "config.h"
    1919
    2020#include "cf_map.h"

  • factory/facFqFactorize.cc

    rfbb0173 re4fe2b  
    1818/*****************************************************************************/
    1919
    20 #include <config.h>
     20#include "config.h"
    2121
    2222#include "cf_assert.h"

  • factory/facFqFactorize.h

    rfbb0173 re4fe2b  
    1717#define FAC_FQ_FACTORIZE_H
    1818
    19 #include <config.h>
     19// #include "config.h"
    2020
    2121#include "facFqBivar.h"

  • factory/facFqFactorizeUtil.cc

    rfbb0173 re4fe2b  
    1313/*****************************************************************************/
    1414
    15 #include <config.h>
     15#include "config.h"
    1616
    1717#include "canonicalform.h"

  • factory/facFqFactorizeUtil.h

    rfbb0173 re4fe2b  
    1616#define FAC_FQ_FACTORIZE_UTIL_H
    1717
    18 #include <config.h>
     18// #include "config.h"
    1919
    2020#include "canonicalform.h"

  • factory/facFqSquarefree.cc

    rfbb0173 re4fe2b  
    1515/*****************************************************************************/
    1616
    17 #include <config.h>
     17#include "config.h"
    1818
    1919#include "canonicalform.h"

  • factory/facHensel.cc

    rfbb0173 re4fe2b  
    1919 **/
    2020/*****************************************************************************/
     21
     22#include "config.h"
    2123
    2224#include "cf_assert.h"

  • factory/facHensel.h

    rfbb0173 re4fe2b  
    1919#define FAC_HENSEL_H
    2020
    21 #include <config.h>
     21// #include "config.h"
    2222#include "cf_assert.h"
    2323#include "debug.h"

  • factory/facIrredTest.cc

    rfbb0173 re4fe2b  
    1414/*****************************************************************************/
    1515
    16 #include <config.h>
     16#include "config.h"
    1717#include <math.h>
    1818

  • factory/facIrredTest.h

    rfbb0173 re4fe2b  
    2020#define FAC_IRRED_TEST_H
    2121
    22 #include <config.h>
     22// #include "config.h"
    2323
    2424#include "canonicalform.h"

  • factory/fac_berlekamp.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/fac_berlekamp.h

    rfbb0173 re4fe2b  
    55#define INCL_FAC_BERLEKAMP_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/fac_cantzass.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/fac_cantzass.h

    rfbb0173 re4fe2b  
    55#define INCL_FAC_CANTZASS_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "variable.h"

  • factory/fac_distrib.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/fac_distrib.h

    rfbb0173 re4fe2b  
    55#define INCL_FAC_DISTRIB_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/fac_ezgcd.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/fac_iterfor.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/fac_iterfor.h

    rfbb0173 re4fe2b  
    55#define INCL_FAC_ITERFOR_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#ifndef NOSTREAMIO

  • factory/fac_multihensel.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/fac_multivar.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/fac_multivar.h

    rfbb0173 re4fe2b  
    55#define INCL_FAC_MULTIVAR_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/fac_sqrfree.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/fac_sqrfree.h

    rfbb0173 re4fe2b  
    55#define INCL_FAC_SQRFREE_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/fac_univar.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include <math.h>

  • factory/fac_univar.h

    rfbb0173 re4fe2b  
    55#define INCL_FAC_UNIVAR_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/fac_util.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/fac_util.h

    rfbb0173 re4fe2b  
    55#define INCL_FAC_UTIL_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"

  • factory/factory.template

    rfbb0173 re4fe2b  
    2222//}}}
    2323
    24 #include <factory/factoryconf.h>
     24// #include <factory/factoryconf.h>
    2525
    2626#ifndef NOSTREAMIO
    … …  
    3636#endif /* ! NOSTREAMIO */
    3737
    38 #  include <factory/cf_gmp.h>
     38#include <factory/cf_gmp.h>
    3939
    4040#include <factory/templates/ftmpl_array.h>

  • factory/ffops.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include <string.h>

  • factory/ffops.h

    rfbb0173 re4fe2b  
    55#define INCL_FFOPS_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "cf_globals.h"

  • factory/fieldGCD.cc

    rfbb0173 re4fe2b  
    11#include <stdio.h>
    2 #include <config.h>
     2#include "config.h"
    33#ifndef NOSTREAMIO
    44#ifdef HAVE_IOSTREAM

  • factory/ftmpl_inst.cc

    rfbb0173 re4fe2b  
    1212//}}}
    1313
    14 #include <factoryconf.h>
     14#include "config.h"
    1515
    16 #include <templates/ftmpl_array.cc>
    17 #include <templates/ftmpl_factor.cc>
    18 #include <templates/ftmpl_list.cc>
    19 #include <templates/ftmpl_functions.h>
    20 #include <templates/ftmpl_matrix.cc>
     16#include "factoryconf.h"
    2117
    22 #include <factory.h>
     18#include "templates/ftmpl_array.cc"
     19#include "templates/ftmpl_factor.cc"
     20#include "templates/ftmpl_list.cc"
     21#include "templates/ftmpl_functions.h"
     22#include "templates/ftmpl_matrix.cc"
     23
     24#include "factory.h"
    2325
    2426

  • factory/gf_tabutil.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/gf_tabutil.h

    rfbb0173 re4fe2b  
    55#define INCL_GF_TABUTIL_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99int gf_tab_numdigits62 ( int q );

  • factory/gfops.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#ifdef HAVE_CSTDIO

  • factory/gfops.h

    rfbb0173 re4fe2b  
    55#define INCL_GFOPS_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#ifndef NOSTREAMIO

  • factory/gmpext.h

    rfbb0173 re4fe2b  
    55#define INCL_GMPEXT_H
    66
    7 #include <config.h>
    8 
    9 #include "cf_gmp.h"
     7// #include "config.h"
     8// #include "cf_gmp.h"
    109
    1110#include "cf_defs.h"

  • factory/imm.cc

    rfbb0173 re4fe2b  
    1111//}}}
    1212
    13 #include <config.h>
     13#include "config.h"
    1414
    1515#include "imm.h"

  • factory/imm.h

    rfbb0173 re4fe2b  
    55#define INCL_IMM_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#ifndef NOSTREAMIO

  • factory/initgmp.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/int_cf.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/int_cf.h

    rfbb0173 re4fe2b  
    55#define INCL_INT_CF_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#ifndef NOSTREAMIO

  • factory/int_int.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "canonicalform.h"

  • factory/int_int.h

    rfbb0173 re4fe2b  
    55#define INCL_INT_INT_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#ifndef NOSTREAMIO
    … …  
    2020
    2121#include "int_cf.h"
    22 #include "cf_gmp.h"
     22// #include "cf_gmp.h"
    2323#include "gmpext.h"
    2424

  • factory/int_intdiv.cc

    rfbb0173 re4fe2b  
    88//}}}
    99
    10 #include <config.h>
     10#include "config.h"
    1111
    1212#include "canonicalform.h"

  • factory/int_poly.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#ifndef NOSTREAMIO

  • factory/int_poly.h

    rfbb0173 re4fe2b  
    55#define INCL_INT_POLY_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#ifndef NOSTREAMIO

  • factory/int_pp.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/int_pp.h

    rfbb0173 re4fe2b  
    55#define INCL_INT_PP_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    9 #include "cf_gmp.h"
     9#include <factory/cf_gmp.h>
    1010
    1111#ifndef NOSTREAMIO

  • factory/int_rat.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/int_rat.h

    rfbb0173 re4fe2b  
    55#define INCL_INT_RAT_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#ifndef NOSTREAMIO
    … …  
    2222#include "int_cf.h"
    2323#include "imm.h"
    24 #include "cf_gmp.h"
     24// #include "cf_gmp.h"
    2525
    2626class InternalRational : public InternalCF

  • factory/lgs.cc

    rfbb0173 re4fe2b  
    22    Dateiname:          lgs.cc
    33   =================================================================== */
     4#include "config.h"
    45
    56#include "lgs.h"
    … …  
    307308  return erg;
    308309}
    309 #endif
     310#endif /* #ifdef HAVE_BIFAC */
     311

  • factory/memman.h

    rfbb0173 re4fe2b  
    55#define INCL_MEMMAN_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include <stdlib.h>

  • factory/memutil.h

    rfbb0173 re4fe2b  
    77#define _POSIX_SOURCE 1
    88
    9 #include <config.h>
     9// #include "config.h"
    1010
    1111#include <stdlib.h>

  • factory/mmprivate.h

    rfbb0173 re4fe2b  
    55#define INCL_MMPRIVATE_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#define MAXDATA 4000

  • factory/newdelete.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55#include <new>
    66

  • factory/parseutil.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include <string.h>

  • factory/parseutil.h

    rfbb0173 re4fe2b  
    55#define INCL_PARSEUTIL_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "cf_defs.h"

  • factory/readcf.yy

    rfbb0173 re4fe2b  
    33
    44%{
     5#ifndef NOSTREAMIO
    56
    67#if defined(WINNT) && ! defined(__GNUC__)
    … …  
    210211    return buffer;
    211212}
     213
     214
     215#endif
     216// #ifndef NOSTREAMIO

  • factory/singext.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include "cf_assert.h"

  • factory/singext.h

    rfbb0173 re4fe2b  
    55#define INCL_SINGEXT_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#include "canonicalform.h"
    10 #include "cf_gmp.h"
     10#include <factory/cf_gmp.h>
    1111
    1212/*BEGINPUBLIC*/

  • factory/sm_sparsemod.cc

    rfbb0173 re4fe2b  
    1212//}}}
    1313
    14 #include <config.h>
     14#include "config.h"
    1515
    1616#include "cf_assert.h"

  • factory/sm_sparsemod.h

    rfbb0173 re4fe2b  
    1313//}}}
    1414
    15 #include <config.h>
     15// #include "config.h"
    1616
    1717#include "canonicalform.h"

  • factory/sm_util.cc

    rfbb0173 re4fe2b  
    1212//}}}
    1313
    14 #include <config.h>
     14#include "config.h"
    1515
    1616#include "cf_assert.h"

  • factory/sm_util.h

    rfbb0173 re4fe2b  
    1313//}}}
    1414
    15 #include <config.h>
     15// #include "config.h"
    1616
    1717#include "canonicalform.h"

  • factory/templates/ftmpl_array.h

    rfbb0173 re4fe2b  
    55#define INCL_ARRAY_H
    66
    7 #include <factory/factoryconf.h>
     7// #include <factory/factoryconf.h>
    88
    99#ifndef NOSTREAMIO

  • factory/templates/ftmpl_factor.h

    rfbb0173 re4fe2b  
    55#define INCL_FACTOR_H
    66
    7 #include <factory/factoryconf.h>
     7// #include <factory/factoryconf.h>
    88
    99#ifndef NOSTREAMIO

  • factory/templates/ftmpl_functions.h

    rfbb0173 re4fe2b  
    2727//}}}
    2828
    29 #include <factory/factoryconf.h>
     29// #include <factory/factoryconf.h>
    3030
    3131//{{{ template <class T> inline T tmax ( const T & a, const T & b )

  • factory/templates/ftmpl_list.h

    rfbb0173 re4fe2b  
    55#define INCL_LIST_H
    66
    7 #include <factory/factoryconf.h>
     7// #include <factory/factoryconf.h>
    88
    99#ifndef NOSTREAMIO

  • factory/templates/ftmpl_matrix.h

    rfbb0173 re4fe2b  
    55#define INCL_MATRIX_H
    66
    7 #include <factory/factoryconf.h>
     7// #include <factory/factoryconf.h>
    88
    99#ifndef NOSTREAMIO

  • factory/var_intglobal.cc

    rfbb0173 re4fe2b  
    1515//}}}
    1616
    17 #include <config.h>
     17#include "config.h"
    1818
    1919#include "cf_assert.h"

  • factory/var_intglobal.h

    rfbb0173 re4fe2b  
    1111//}}}
    1212
    13 #include <config.h>
     13// #include "config.h"
    1414
    1515class Prim;

  • factory/variable.cc

    rfbb0173 re4fe2b  
    22/* $Id$ */
    33
    4 #include <config.h>
     4#include "config.h"
    55
    66#include <string.h>

  • factory/variable.h

    rfbb0173 re4fe2b  
    55#define INCL_VARIABLE_H
    66
    7 #include <config.h>
     7// #include "config.h"
    88
    99#ifndef NOSTREAMIO
    10 #ifdef HAVE_IOSTREAM
    11 #include <iostream>
    12 #define OSTREAM std::ostream
    13 #elif defined(HAVE_IOSTREAM_H)
    14 #include <iostream.h>
    15 #define OSTREAM ostream
    16 #endif
     10# ifdef HAVE_IOSTREAM
     11#  include <iostream>
     12#  define OSTREAM std::ostream
     13# elif defined(HAVE_IOSTREAM_H)
     14#  include <iostream.h>
     15#  define OSTREAM ostream
     16# endif
    1717#endif /* NOSTREAMIO */
    1818
    … …  
    6969    }
    7070#ifndef NOSTREAMIO
    71     friend OSTREAM & operator << ( OSTREAM & os, const Variable & v );
     71   friend OSTREAM & operator << ( OSTREAM & os, const Variable & v );
    7272#endif /* NOSTREAMIO */
    7373    friend void swap_levels();

  • factory/winnt/factory.h

    rfbb0173 re4fe2b  
    2323//}}}
    2424
    25 #include <factoryconf.h>
     25// #include <factoryconf.h>
    2626
    2727#ifndef NOSTREAMIO
    … …  
    3737#endif /* ! NOSTREAMIO */
    3838
    39 #ifdef SINGULAR
    40 #include "cf_gmp.h"
    41 #else
    42 #include <gmp.h>
    43 #endif /* SINGULAR */
     39
     40// #ifdef SINGULAR
     41// #include "cf_gmp.h"
     42// #else
     43// #include <gmp.h>
     44// #endif /* SINGULAR */
    4445
    4546#include <templates/ftmpl_array.h>

  • kernel/test.cc

    rfbb0173 re4fe2b  
    5252#ifdef HAVE_FACTORY
    5353int initializeGMP(){ return 1; } // NEEDED FOR MAIN APP. LINKING!!!
     54int mmInit(void) {return 1; } // ? due to SINGULAR!!!...???
    5455#endif
    5556

  • libpolys/coeffs/si_gmp.h

    rfbb0173 re4fe2b  
    22#define COEFFS_SI_GMP_H
    33
     4
     5// just assume that factory have been built (cplusplus.h!)
     6// instead of duplicating cf_gmp.h here for now...
     7#include <factory/cf_gmp.h>
     8
     9/*
    410#if defined(__cplusplus) && defined(__GNUC__)
    511  #define __cplusplus_backup __cplusplus
    … …  
    1218  #include <gmp.h>
    1319#endif
     20*/
    1421
    1522

  • libpolys/coeffs/test.cc

    rfbb0173 re4fe2b  
    2626
    2727#ifdef HAVE_FACTORY
    28 int initializeGMP(){ return 1; }
     28int initializeGMP(void){ return 1; }
     29int mmInit(void) {return 1; } // ? due to SINGULAR!!!...???
    2930#endif
    3031

  • libpolys/tests/common.h

    rfbb0173 re4fe2b  
    2020#ifdef HAVE_FACTORY
    2121int initializeGMP(){ return 1; }
     22int mmInit(void) {return 1; } // ? due to SINGULAR!!!...???
    2223#endif
    2324
Note: See TracChangeset for help on using the changeset viewer.