Changeset d92d71 in git


Ignore:
Timestamp:
Dec 14, 2011, 5:19:14 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '5d369c3cbad1a1bf2d5c856a48fb8a30b51cec3b')
Children:
67c1dcaf5b5069c5df300f7898cff740290bf5f1
Parents:
dcccebd9b733616f7e8c8d888299aa4c3073a094
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-14 17:19:14+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:09:33+01:00
Message:
build libfac.a into factory

FIX: libfac builds and uses factory/factory.h
FIX: adaptation of Singular to use libfac staff
Location:
factory
Files:
1 added
16 edited
1 moved

Legend:

Unmodified
Added
Removed

  • factory/Makefile.am

    rdccceb rd92d71  
    88
    99libfactory_la_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${CXXTEMPLFLAGS}
    10 libfactory_la_LIBADD     = ${GMP_LIBS} ${NTL_LIBS}
     10libfactory_la_LIBADD     = ${abs_top_builddir}/libfac/libfac.la ${GMP_LIBS} ${NTL_LIBS}
    1111libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    1212libfactory_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
    13 libfactory_g_la_LIBADD   = ${GMP_LIBS} ${NTL_LIBS}
     13libfactory_g_la_LIBADD   = ${abs_top_builddir}/libfac/libfac_g.la ${GMP_LIBS} ${NTL_LIBS}
    1414libfactory_g_la_LDFLAGS  = -release ${PACKAGE_VERSION}
     15
     16
    1517
    1618# factory source files
    … …  
    299301                examples/factorize.cc examples/gcd.cc \
    300302                bin/folding.el bin/fold-docu.el \
    301                 bin/makeheader bin/gen-readcf readcf.yy
     303                bin/makeheader bin/gen-readcf readcf.yy libfac
    302304
    303305##################################################
    … …  
    332334check_PROGRAMS = $(TESTS)
    333335
    334 TESTSSOURCES = test.cc 
     336TESTSSOURCES = test.cc
    335337
    336338test_s_g_SOURCES = $(TESTSSOURCES)
    … …  
    358360#ftmpl_inst.o
    359361test_d_r_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
     362
     363
     364PACKAGES=libfac
     365SUBDIRS=$(PACKAGES)

  • factory/configure.ac

    rdccceb rd92d71  
    442442AC_DEFINE_UNQUOTED([FACTORYVERSION], "$factory_version")
    443443
     444AH_TEMPLATE([HAVE_LIBFAC], [have libfac])
     445AC_DEFINE_UNQUOTED([HAVE_LIBFAC], 1)
     446
    444447AH_TEMPLATE([FACTORYCONFIGURATION], [factory configuration])
    445448AC_DEFINE_UNQUOTED([FACTORYCONFIGURATION], "$factory_configuration")
    … …  
    452455    [test x$with_Singular != xyes && test x$enable_streamio != xno])
    453456
    454 AC_CONFIG_FILES([Makefile ftest/GNUmakefile])
     457AC_CONFIG_FILES([Makefile libfac/Makefile]) #  ftest/GNUmakefile
    455458AC_OUTPUT
    456459

  • factory/libfac/charset/alg_factor.cc

    rdccceb rd92d71  
    2727#endif
    2828
    29 #include "debug.h"
     29#include <libfac/factor/debug.h>
    3030#include "timing.h"
    3131TIMING_DEFINE_PRINT(newfactoras_time);

  • factory/libfac/charset/algfactor.cc

    rdccceb rd92d71  
    2424#endif
    2525
    26 #include "debug.h"
     26#include <libfac/factor/debug.h>
    2727#include "timing.h"
    2828TIMING_DEFINE_PRINT(newfactoras_time);
    … …  
    7373#  undef DEBUGOUTPUT
    7474#endif
    75 #include "debug.h"
     75#include <libfac/factor/debug.h>
    7676static CFList
    7777charsetnA(const CFList & AS, const CFList &PS, PremForm & Remembern, const Variable & vf ){
    … …  
    123123#  undef DEBUGOUTPUT
    124124#endif
    125 #include "debug.h"
     125#include <libfac/factor/debug.h>
    126126// compute the GCD of f and g over the algebraic field having
    127127// adjoing ascending set as

  • factory/libfac/charset/charset.cc

    rdccceb rd92d71  
    2727#endif
    2828
    29 #include "debug.h"
     29#include <libfac/factor/debug.h>
    3030#include "timing.h"
    3131TIMING_DEFINE_PRINT(subfactorize_time);
    … …  
    4040#  undef DEBUGOUTPUT
    4141#endif
    42 #include "debug.h"
     42#include <libfac/factor/debug.h>
    4343
    4444// the next computes a characteristic set (a basic set in Wang's sense)
    … …  
    9696#  undef DEBUGOUTPUT
    9797#endif
    98 #include "debug.h"
     98#include <libfac/factor/debug.h>
    9999
    100100// The modified CharSet (an extended characteristic set with certain factors
    … …  
    328328#  undef DEBUGOUTPUT
    329329#endif
    330 #include "debug.h"
     330#include <libfac/factor/debug.h>
    331331
    332332ListCFList
    … …  
    474474#endif
    475475
    476 #include "debug.h"
     476#include <libfac/factor/debug.h>
    477477
    478478static CFList

  • factory/libfac/charset/csutil.cc

    rdccceb rd92d71  
    621621#  undef DEBUGOUTPUT
    622622#endif
    623 #include "debug.h"
     623#include <libfac/factor/debug.h>
    624624// examine the irreducibility of as for IrrCharSeries
    625625int

  • factory/libfac/charset/reorder.cc

    rdccceb rd92d71  
    2929#endif
    3030
    31 #include "debug.h"
     31#include <libfac/factor/debug.h>
    3232#include "timing.h"
    3333TIMING_DEFINE_PRINT(neworder_time);

  • factory/libfac/factor.h

    rdccceb rd92d71  
    1111extern int libfac_interruptflag;
    1212
     13/*
    1314// some values you can ask for:
    1415extern const char * libfac_name;
    … …  
    1617extern const char * libfac_date;
    1718extern const char * libfac_author;
     19*/
    1820
     21/*
    1922CFFList Factorize( const CanonicalForm & F, const CanonicalForm & mipo, int is_SqrFree=0 ) ;
    2023CFFList newfactoras( const CanonicalForm & f, const CFList & as, int &success);
    2124CFFList newcfactor( const CanonicalForm & f, const CFList & as, int &success);
     25*/
     26
    2227
    2328//// Note: InternalSqrFree does only the work needed for factorization.
    … …  
    2631typedef List<CFList> ListCFList;
    2732typedef List<int> IntList ;
    28 typedef ListIterator<int> IntListIterator ;
    29 typedef List<Variable> Varlist;
    30 typedef ListIterator<Variable> VarlistIterator;
     33
     34// typedef ListIterator<int> IntListIterator ;
     35// typedef List<Variable> Varlist;
     36// typedef ListIterator<Variable> VarlistIterator;
    3137
    3238////////////////////////////////////////
    3339/// from charsets:
    34 
     40/*
    3541class PremForm {
    3642public:
    … …  
    4652};
    4753
     54
    4855CanonicalForm  Prem( const CanonicalForm &f, const CanonicalForm &g );
    4956CanonicalForm  Prem( const CanonicalForm &f, const CFList &L );
    5057CFList         Prem( const CFList &AS, const CFList &L );
    5158CFList     MCharSetN( const CFList &PS, PremForm & Remembern );
     59*/
     60
     61
     62/// Char. set
    5263ListCFList IrrCharSeries( const CFList &PS, int opt=0 );
    5364
     65/*
    5466// the next three give you a heuristically optimal reorderd list of the
    5567// variables. For internal and external (e.g. Singular/Macaulay2) library use.
    … …  
    6375// (i.e. the variables as CanonicalForms)
    6476CFList   newordercf(const CFList & PolyList );
    65 // the same as neworder(...) only returning a list of int 's (i.e. the levels)
     77*/
     78
     79/// the same as neworder(...) only returning a list of int 's (i.e. the levels)
    6680IntList  neworderint(const CFList & PolyList );
    6781
     82/*
    6883// for library internal use only:
    6984// next function reorders the variables in PS:
    … …  
    8196CFFList reorder( const Varlist & betterorder, const CFFList & PS);
    8297ListCFList reorder(const Varlist & betterorder, const ListCFList & Q);
    83 
     98*/
    8499
    85100#endif /* FACTOR_H */

  • factory/libfac/factor/Factor.cc

    rdccceb rd92d71  
    3838#endif
    3939
    40 #include "debug.h"
     40#include <libfac/factor/debug.h>
    4141#include "timing.h"
    4242TIMING_DEFINE_PRINT(factorize_time);

  • factory/libfac/factor/MVMultiHensel.cc

    rdccceb rd92d71  
    3838#endif
    3939
    40 #include "debug.h"
     40#include <libfac/factor/debug.h>
    4141#include "interrupt.h"
    4242#include "timing.h"

  • factory/libfac/factor/SqrFree.cc

    rdccceb rd92d71  
    55///////////////////////////////////////////////////////////////////////////////
    66// FACTORY - Includes
    7 #include<factory.h>
     7
     8#include<factory/factory.h>
     9
    810#ifndef NOSTREAMIO
    911#ifdef HAVE_IOSTREAM
    … …  
    3335#endif
    3436
    35 #include "debug.h"
     37#include <libfac/factor/debug.h>
    3638#include "timing.h"
    3739TIMING_DEFINE_PRINT(squarefree_time);

  • factory/libfac/factor/Truefactor.cc

    rdccceb rd92d71  
    3232#endif
    3333
    34 #include "debug.h"
     34#include <libfac/factor/debug.h>
    3535#include "timing.h"
    3636

  • factory/libfac/factor/homogfactor.cc

    rdccceb rd92d71  
    3232#endif
    3333
    34 #include "debug.h"
     34#include <libfac/factor/debug.h>
    3535#include "timing.h"
    3636TIMING_DEFINE_PRINT(hfactorize_time);

  • factory/libfac/factor/tmpl_inst.cc

    rdccceb rd92d71  
    44////////////////////////////////////////////////////////////
    55
     6// #include <factory/templates/ftmpl_array.cc>
    67
    7 #include <templates/ftmpl_array.cc>
    8 #include <templates/ftmpl_factor.cc>
    9 #include <templates/ftmpl_list.cc>
    10 #include <templates/ftmpl_functions.h>
    11 #include <templates/ftmpl_matrix.cc>
     8#include <factory/factory.h>
    129
    13 #include <factory.h>
     10
     11
     12#include <factory/templates/ftmpl_array.cc>
     13#include <factory/templates/ftmpl_factor.cc>
     14#include <factory/templates/ftmpl_list.cc>
     15#include <factory/templates/ftmpl_functions.h>
     16#include <factory/templates/ftmpl_matrix.cc>
    1417
    1518template class Factor<CanonicalForm>;
    … …  
    4750
    4851// place here your own template stuff, not instantiated by factory
    49 #include "tmpl_inst.h"
    50 #include "class.cc"
     52#include <libfac/factor/tmpl_inst.h>
     53#include <libfac/factor/class.cc>
    5154
    5255template class List<int>;

  • factory/libfac/factor/tmpl_inst.h

    rdccceb rd92d71  
    55#ifndef TMPL_INST_H
    66#define TMPL_INST_H
    7 #include "class.h"
     7
     8#include <libfac/factor/class.h>
    89//typedef CanonicalForm CF;
    910//typedef List<CanonicalForm> CFList;

  • factory/libfac/factor/version.cc

    rdccceb rd92d71  
    33// $Id$
    44///////////////////////////////////////////////////////////////////////////////
     5
     6/*
    57#include "version.h"
    68
    … …  
    911const char * libfac_date = LIBFAC_DATE;
    1012const char * libfac_author = "M. Messollen";
     13*/
    1114
    12 int    libfac_interruptflag=0;
     15int    libfac_interruptflag = 0;
Note: See TracChangeset for help on using the changeset viewer.