Changeset e76d7a6 in git


Ignore:
Timestamp:
May 10, 2011, 5:49:07 PM (13 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4188d308699580d975efd0f6cca8dcb41c396f70')
Children:
2db7aeea84caf5f3621e15f997e41de267126db7
Parents:
9c68871c5299532f62e3ee9d88efddebac68ccbd
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-05-10 17:49:07+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:44+01:00
Message:
just to get this out of the way, i need to catch my train
Files:
1 added
15 edited
2 moved

Legend:

Unmodified
Added
Removed
  • .gitignore

    r9c6887 re76d7a6  
    1111.libs
    1212doc/
     13factory/readcf.c
     14factory/ylwrap
    1315m4/libtool.m4
    1416m4/ltoptions.m4
  • factory/Makefile.am

    r9c6887 re76d7a6  
     1CXXTEMPLFLAGS      = -fno-implicit-templates --no-exceptions
     2
     3INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
     4
    15lib_LIBRARIES = libfactory.a libfactory_g.a
    26
     7libfactory_a_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${CXXTEMPLFLAGS}
     8libfactory_g_a_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
     9
    310# factory source files
    4 SOURCES := \
     11SOURCES = \
    512                canonicalform.cc \
    613                cf_algorithm.cc \
     
    7380                bifac.cc \
    7481                lgs.cc \
    75                 singext.cc
     82                singext.cc \
     83                parseutil.cc \
     84                readcf.y \
     85                ftmpl_inst.cc
    7686
    7787libfactory_a_SOURCES = $(SOURCES)
     
    7989
    8090# factory header files
    81 HEADERS := \
     91factory_headers = \
    8292                cf_assert.h \
    8393                canonicalform.h \
     
    145155                singext.h
    146156
    147 include_HEADERS = $(HEADERS)
     157noinst_HEADERS = $(factory_headers)
    148158
    149159# Documentation
    150160include $(top_srcdir)/aminclude.am
    151161
    152 doxysrc := $(SOURCES) parseutil.cc
    153 doxyincl := $(HEADERS) parseutil.h
    154 
    155 # files and environment variables to export for doxygen
    156 doxyfiles :=    $(addprefix $(srcdir)/,$(doxysrc) $(doxyincl))
     162doxysrc = $(SOURCES) parseutil.cc
     163doxyincl = $(factory_headers) parseutil.h
    157164
    158165# doxygen targets
     
    165172# Support for building GF(q)-tables
    166173
    167 templatesrc :=  \
     174templatesrc =   \
    168175                ftmpl_array.cc \
    169176                ftmpl_factor.cc \
     
    171178                ftmpl_list.cc \
    172179                ftmpl_matrix.cc
    173 templateincl := \
     180templateincl =  \
    174181                ftmpl_array.h \
    175182                ftmpl_factor.h \
     
    178185
    179186noinst_PROGRAMS = gengftables
     187gengftables_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
    180188
    181189gengftables_SOURCES = gengftables-conway.cc ftmpl_inst.cc
     
    192200
    193201# header templates
    194 hdrtemplsrc := \
     202hdrtemplsrc = \
    195203                factoryconf.template \
    196204                factory.template
    197205
    198206# FTE source files
    199 ftestsrc :=     \
     207ftestsrc =      \
    200208                ftest_io.cc \
    201209                ftest_util.cc \
     
    203211
    204212# FTE header files
    205 ftestincl :=    \
     213ftestincl =     \
    206214                ftest_io.h \
    207215                ftest_util.h \
     
    211219# The variable `$(ftestm4develsrc)' may be already initialized
    212220# from the development `GNUmakefile'.
    213 ftestm4src :=   $(ftestm4develsrc) \
     221ftestm4src =    $(ftestm4develsrc) \
    214222                commonden.m4 \
    215223                degree.m4 \
     
    232240
    233241# other files from the FTE
    234 ftestdistfiles := \
    235                 ChangeLog \
    236                 GNUmakefile.in \
     242ftestdistfiles = \
    237243                ftest_util.m4
    238244
    239 EXTRA_DIST :=   readcf.cc ftmpl_inst.cc \
    240                 gengftables.cc gengftables-conway.cc test_install.cc \
    241                 parseutil.cc \
    242                 readcf.y \
     245EXTRA_DIST =    gengftables.cc gengftables-conway.cc test_install.cc \
    243246                $(templatesrc) $(templateincl) $(hdrtemplsrc) \
    244247                $(ftestsrc) $(ftestincl) $(ftestm4src) $(ftestdistfiles) \
  • factory/cf_gcd_smallp.cc

    r9c6887 re76d7a6  
    4545#ifdef HAVE_NTL
    4646
    47 TIMING_DEFINE_PRINT(gcd_recursion);
    48 TIMING_DEFINE_PRINT(newton_interpolation);
     47TIMING_DEFINE_PRINT(gcd_recursion)
     48TIMING_DEFINE_PRINT(newton_interpolation)
    4949
    5050static const double log2exp= 1.442695041;
  • factory/cf_linsys.cc

    r9c6887 re76d7a6  
    1717
    1818
    19 TIMING_DEFINE_PRINT(det_mapping);
    20 TIMING_DEFINE_PRINT(det_determinant);
    21 TIMING_DEFINE_PRINT(det_chinese);
    22 TIMING_DEFINE_PRINT(det_bound);
    23 TIMING_DEFINE_PRINT(det_numprimes);
     19TIMING_DEFINE_PRINT(det_mapping)
     20TIMING_DEFINE_PRINT(det_determinant)
     21TIMING_DEFINE_PRINT(det_chinese)
     22TIMING_DEFINE_PRINT(det_bound)
     23TIMING_DEFINE_PRINT(det_numprimes)
    2424
    2525
  • factory/cf_random.cc

    r9c6887 re76d7a6  
    148148      result += power( algext, i ) * gen->generate();
    149149    return result;
    150 };
     150}
    151151
    152152CFRandom * AlgExtRandomF::clone () const
  • factory/config.h.in.bak

    r9c6887 re76d7a6  
    8585#undef DEBUGOUTPUT
    8686
    87 /* define type of your compilers 64 bit integer type */
    88 #define INT64 long long int
    89 
    9087#undef HAVE_NTL
    9188
  • factory/configure.ac

    r9c6887 re76d7a6  
    1313# - initialisation.
    1414#
    15 AC_REVISION($Id$)
    16 AC_INIT(canonicalform.cc)
     15AC_INIT([factory], [3.1.2.sw])
     16AC_CONFIG_SRCDIR(canonicalform.cc)
    1717AC_CONFIG_MACRO_DIR([../m4])
    1818AC_CONFIG_HEADER(config.h)
    19 AC_CONFIG_AUX_DIR(bin)
     19AC_CONFIG_AUX_DIR([.])
     20AM_INIT_AUTOMAKE
     21
     22AC_PROG_YACC
    2023
    2124#
     
    348351# Singular
    349352if test "x$with_Singular" = xyes; then
    350   AC_DEFINE(SINGULAR)
     353  AC_DEFINE([SINGULAR],[1],[SINGULAR])
    351354fi
    352355
    353356# arithmetic shift
    354357#if test "x$ac_cv_shift" = xyes; then   
    355 #  AC_DEFINE(HAS_ARITHMETIC_SHIFT)
     358#  AC_DEFINE([HAS_ARITHMETIC_SHIFT],[1],[HAS_ARITHMETIC_SHIFT])
    356359#fi
    357360
     
    379382fi
    380383if test "$with_omalloc" = yes; then
    381   AC_DEFINE(HAVE_OMALLOC)
     384  AC_DEFINE([HAVE_OMALLOC],[1],[HAVE_OMALLOC])
    382385  with_memman=no
    383386fi
     
    393396  installtargets="$installtargets installmem"
    394397  uninstalltargets="$uninstalltargets uninstallmem"
    395   AC_DEFINE(USE_MEMUTIL)
     398  AC_DEFINE([USE_MEMUTIL],[1],[USE_MEMUTIL])
    396399
    397400  if test "x$with_memman" != xnew; then
    398401    memmansrc="$memmansrc \$(oldmemmansrc)"
    399402    memmanincl='$(oldmemmanincl)'
    400     AC_DEFINE(USE_OLD_MEMMAN)
     403    AC_DEFINE([USE_OLD_MEMMAN],[1],[USE_OLD_MEMMAN])
    401404  else
    402405    memmansrc="$memmansrc \$(newmemmansrc)"
     
    404407
    405408    if test "x$enable_memdebug" = xfull; then
    406       AC_DEFINE(MDEBUG, 1)
     409      AC_DEFINE([MDEBUG], [1], [MDEBUG])
    407410    elif test "x$enable_memdebug" != xno; then
    408       AC_DEFINE(MDEBUG, 0)
     411      AC_DEFINE([MDEBUG], [0], [MDEBUG])
    409412    fi
    410413  fi
     
    413416# "configurable inline methods"
    414417if test "x$enable_cf_inline" != xno; then
    415   AC_DEFINE(CF_USE_INLINE)
     418  AC_DEFINE([CF_USE_INLINE],[1],[CF_USE_INLINE])
    416419fi
    417420
    418421# iostream
    419422if test "x$enable_streamio" = xno; then
    420   AC_DEFINE(NOSTREAMIO)
     423  AC_DEFINE([NOSTREAMIO],[1],[NOSTREAMIO])
    421424else
    422425  factorysrc="$factorysrc \$(useiofactorysrc)"
     
    426429# assertions
    427430if test "x$enable_assertions" = xno; then
    428   AC_DEFINE(NOASSERT)
     431  AC_DEFINE([NOASSERT],[1],[NOASSERT])
    429432fi
    430433
    431434# timing
    432435if test "x$enable_timing" != xno; then
    433   AC_DEFINE(TIMING)
     436  AC_DEFINE([TIMING],[1],[TIMING])
    434437fi
    435438
    436439# debugoutput
    437440if test "x$enable_debugoutput" != xno; then
    438   AC_DEFINE(DEBUGOUTPUT)
     441  AC_DEFINE([DEBUGOUTPUT],[1],[DEBUGOUTPUT])
    439442fi
    440443
     
    462465AC_SUBST(uninstalltargets)
    463466
    464 AC_DEFINE_UNQUOTED(FACTORYVERSION, "$factory_version")
    465 AC_DEFINE_UNQUOTED(FACTORYCONFIGURATION, "$factory_configuration")
    466 AC_DEFINE_UNQUOTED(GFTABLEDIR, "$explicit_gftabledir")
    467 
    468 AC_OUTPUT(GNUmakefile ftest/GNUmakefile)
     467AC_DEFINE_UNQUOTED([FACTORYVERSION], "$factory_version", [FACTORYVERSION])
     468AC_DEFINE_UNQUOTED([FACTORYCONFIGURATION], "$factory_configuration", [FACTORYCONFIGURATION])
     469AC_DEFINE_UNQUOTED([GFTABLEDIR], "$explicit_gftabledir", [GFTABLEDIR])
     470
     471AC_OUTPUT(Makefile ftest/GNUmakefile)
  • factory/facFqBivar.cc

    r9c6887 re76d7a6  
    3939#include "NTLconvert.h"
    4040
    41 TIMING_DEFINE_PRINT(fac_uni_factorizer);
    42 TIMING_DEFINE_PRINT(fac_hensel_lift);
    43 TIMING_DEFINE_PRINT(fac_factor_recombination);
     41TIMING_DEFINE_PRINT(fac_uni_factorizer)
     42TIMING_DEFINE_PRINT(fac_hensel_lift)
     43TIMING_DEFINE_PRINT(fac_factor_recombination)
    4444
    4545CanonicalForm prodMod0 (const CFList& L, const CanonicalForm& M)
  • factory/facFqFactorize.cc

    r9c6887 re76d7a6  
    3636#include "NTLconvert.h"
    3737
    38 TIMING_DEFINE_PRINT(fac_bi_factorizer);
    39 TIMING_DEFINE_PRINT(fac_hensel_lift);
    40 TIMING_DEFINE_PRINT(fac_factor_recombination);
     38TIMING_DEFINE_PRINT(fac_bi_factorizer)
     39TIMING_DEFINE_PRINT(fac_hensel_lift)
     40TIMING_DEFINE_PRINT(fac_factor_recombination)
    4141
    4242static inline
  • factory/fac_multihensel.cc

    r9c6887 re76d7a6  
    1616
    1717
    18 TIMING_DEFINE_PRINT(fac_solve);
    19 TIMING_DEFINE_PRINT(fac_modpk);
    20 TIMING_DEFINE_PRINT(fac_corrcoeff);
    21 TIMING_DEFINE_PRINT(fac_extgcd);
     18TIMING_DEFINE_PRINT(fac_solve)
     19TIMING_DEFINE_PRINT(fac_modpk)
     20TIMING_DEFINE_PRINT(fac_corrcoeff)
     21TIMING_DEFINE_PRINT(fac_extgcd)
    2222
    2323static void
  • factory/fac_multivar.cc

    r9c6887 re76d7a6  
    2323void out_cff(CFFList &L);
    2424
    25 TIMING_DEFINE_PRINT(fac_content);
    26 TIMING_DEFINE_PRINT(fac_findeval);
    27 TIMING_DEFINE_PRINT(fac_distrib);
    28 TIMING_DEFINE_PRINT(fac_hensel);
     25TIMING_DEFINE_PRINT(fac_content)
     26TIMING_DEFINE_PRINT(fac_findeval)
     27TIMING_DEFINE_PRINT(fac_distrib)
     28TIMING_DEFINE_PRINT(fac_hensel)
    2929
    3030static CFArray
  • factory/fac_univar.cc

    r9c6887 re76d7a6  
    2020#include "fac_sqrfree.h"
    2121
    22 TIMING_DEFINE_PRINT(fac_choosePrimes);
    23 TIMING_DEFINE_PRINT(fac_facModPrimes);
    24 TIMING_DEFINE_PRINT(fac_liftFactors);
    25 TIMING_DEFINE_PRINT(fac_combineFactors);
     22TIMING_DEFINE_PRINT(fac_choosePrimes)
     23TIMING_DEFINE_PRINT(fac_facModPrimes)
     24TIMING_DEFINE_PRINT(fac_liftFactors)
     25TIMING_DEFINE_PRINT(fac_combineFactors)
    2626
    2727
  • factory/fac_util.cc

    r9c6887 re76d7a6  
    8383    else
    8484        return mapdomain( f, mappk );
    85 };
     85}
    8686
    8787CanonicalForm
  • factory/ffops.h

    r9c6887 re76d7a6  
    1010#ifdef HAVE_NTL
    1111#include <NTL/config.h>
     12#endif
     13
     14/* define type of your compilers 64 bit integer type */
     15#ifndef INT64
     16#define INT64 long long int
    1217#endif
    1318
  • factory/imm.h

    r9c6887 re76d7a6  
    3030const int FFMARK = 2;
    3131const int GFMARK = 3;
     32
     33/* define type of your compilers 64 bit integer type */
     34#ifndef INT64
     35#define INT64 long long int
     36#endif
    3237
    3338const int MINIMMEDIATE = -268435454; // -2^28-2
  • factory/int_poly.cc

    r9c6887 re76d7a6  
    5656{
    5757    ASSERT( 0, "ups there is something wrong in your code" );
    58 };
     58}
    5959
    6060InternalPoly::~InternalPoly()
  • for_Hans_with_love.sh

    r9c6887 re76d7a6  
    3434for d in factory; do
    3535  echo "==============="
    36   echo "run aclocal -I $TOP_DIR/m4, autoconf in $d"
     36  echo "run aclocal -I $TOP_DIR/m4, autotools in $d"
    3737  echo "---------------"
    3838  cd $d;
    3939  aclocal -I $TOP_DIR/m4
    40   autoconf
     40  autotools
    4141  cd $TOP_DIR
    4242  echo
Note: See TracChangeset for help on using the changeset viewer.