Changeset cd6df87 in git


Ignore:
Timestamp:
May 11, 2011, 6:44:55 PM (12 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
686f468cd2868ccd3c847dc0cd0b1417fc7fb0e1
Parents:
e432a0567954893b1c33d7a9943e9921184cefef
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-05-11 18:44:55+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:05+01:00
Message:
fixed linking against factory and commented out chinese remainder

- build gftables if they are not there otherwise we copy from srcdir
- added factory/gftables
Files:
92 added
7 edited

Legend:

Unmodified
Added
Removed

  • factory/Makefile.am

    re432a0 rcd6df87  
    190190gengftables_SOURCES = gengftables-conway.cc ftmpl_inst.cc
    191191
     192data_DATA = gftables
     193
    192194gftables:       gengftables
    193                 @echo "This command will take quite a long time to execute;"
    194                 @echo "maybe you want to get the tables directly via ftp (see"
    195                 @echo "the INSTALL file)."
    196                 $(MKINSTALLDIRS) gftables
    197                 ./gengftables
     195                @if test -r ${srcdir}/gftables; then \
     196                        cp -r ${srcdir}/gftables ${builddir}; \
     197                else \
     198                        echo "This command will take quite a long time to execute;"; \
     199                        echo "maybe you want to get the tables directly via ftp (see"; \
     200                        echo "the INSTALL file)."; \
     201                        ${builddir}/gengftables; \
     202                fi
    198203
    199204.template.h:
    … …  
    256261                examples/factorize.cc examples/gcd.cc \
    257262                bin/folding.el bin/fold-docu.el \
    258                 bin/makeheader bin/gen-readcf
    259 
    260 CLEANFILES = factory.h factoryconf.h readcf.cc
     263                bin/makeheader bin/gen-readcf readcf.cc gftables
     264
     265CLEANFILES = factory.h factoryconf.h

  • factory/cf_hnf.cc

    re432a0 rcd6df87  
    1212#include "config.h"
    1313
    14 #if 0
    1514#ifdef HAVE_NTL
    1615#include "NTLconvert.h"
    … …  
    5655}
    5756#endif
    58 #endif

  • libpolys/coeffs/longrat.h

    re432a0 rcd6df87  
    8888number   nlGetDenom(number &n, const coeffs r);
    8989number   nlGetNumerator(number &n, const coeffs r);
    90 number   nlChineseRemainder(number *x, number *q,int rl);
    9190void     nlCoeffWrite(const coeffs r);
    9291#ifdef LDEBUG

  • libpolys/coeffs/rintegers.cc

    re432a0 rcd6df87  
    384384  r->cfMult  = nrzMult;
    385385  r->cfSub   = nrzSub;
     386  r->nCoeffIsEqual = ndCoeffIsEqual;
    386387  r->cfAdd   = nrzAdd;
    387388  r->cfDiv   = nrzDiv;

  • libpolys/polys/clapsing.cc

    re432a0 rcd6df87  
    375375}
    376376
     377#ifdef HAVE_FACTORY
    377378int singclap_factorize_retry;
     379#if 0
    378380extern int libfac_interruptflag;
     381#endif
     382#endif
    379383
    380384ideal singclap_factorize ( poly f, intvec ** v , int with_exps, const ring r)

  • libpolys/polys/clapsing.h

    re432a0 rcd6df87  
    6262*/
    6363
     64number   nlChineseRemainder(number *x, number *q,int rl);
     65
    6466#endif /* INCL_FACTORYSING_H */
    6567

  • libpolys/polys/simpleideals.cc

    re432a0 rcd6df87  
    16981698*/
    16991699#ifdef HAVE_FACTORY
     1700#if 0
    17001701ideal id_ChineseRemainder(ideal *xx, number *q, int rl, const ring R)
    17011702{
    … …  
    17571758}
    17581759#endif
     1760#endif
    17591761
    17601762/*2
Note: See TracChangeset for help on using the changeset viewer.