[SCM] an open source computer algebra system branch, master, updated. upstream/3-1-3-1-3664-g4d18530
Felix Salfelder
felix at salfelder.org
Wed Feb 8 20:32:21 UTC 2012
The following commit has been merged in the master branch:
commit f3dcbb78ecb66693a4e8ad219ae9fc7e13947dcf
Merge: e3c15f725028a154aff9e3340ee69dcd989b7526 3fae3e37bd5fd0f2f65f5b7098b9a2c8a05a57e3
Author: Felix Salfelder <felix at salfelder.org>
Date: Tue Feb 7 23:45:17 2012 +0100
Merge remote branch 'origin/cleanedupstream' into installpatches
Conflicts:
COPYING
IntegerProgramming/COPYING
IntegerProgramming/si_gmp.h
Makefile.in
Singular/COPYING
Singular/ChangeLog
Singular/LIB/KVequiv.lib
Singular/LIB/absfact.lib
Singular/LIB/ainvar.lib
Singular/LIB/aksaka.lib
Singular/LIB/alexpoly.lib
Singular/LIB/algebra.lib
Singular/LIB/all.lib
Singular/LIB/all.lib.tmpl
Singular/LIB/arcpoint.lib
Singular/LIB/assprimeszerodim.lib
Singular/LIB/atkins.lib
Singular/LIB/bfun.lib
Singular/LIB/binresol.lib
Singular/LIB/brnoeth.lib
Singular/LIB/central.lib
Singular/LIB/cimonom.lib
Singular/LIB/cisimplicial.lib
Singular/LIB/classify.lib
Singular/LIB/compregb.lib
Singular/LIB/control.lib
Singular/LIB/crypto.lib
Singular/LIB/curvepar.lib
Singular/LIB/decodegb.lib
Singular/LIB/deform.lib
Singular/LIB/dmod.lib
Singular/LIB/dmodapp.lib
Singular/LIB/dmodvar.lib
Singular/LIB/ehv.lib
Singular/LIB/elim.lib
Singular/LIB/equising.lib
Singular/LIB/factor.lib
Singular/LIB/findifs.lib
Singular/LIB/finitediff.lib
Singular/LIB/finvar.lib
Singular/LIB/fpadim.lib
Singular/LIB/freegb.lib
Singular/LIB/general.lib
Singular/LIB/gkdim.lib
Singular/LIB/gmspoly.lib
Singular/LIB/gmssing.lib
Singular/LIB/graphics.lib
Singular/LIB/grobcov.lib
Singular/LIB/groups.lib
Singular/LIB/grwalk.lib
Singular/LIB/help.cnf
Singular/LIB/hnoether.lib
Singular/LIB/homolog.lib
Singular/LIB/hyperel.lib
Singular/LIB/inout.lib
Singular/LIB/integralbasis.lib
Singular/LIB/intprog.lib
Singular/LIB/involut.lib
Singular/LIB/jacobson.lib
Singular/LIB/kskernel.lib
Singular/LIB/latex.lib
Singular/LIB/lejeune.lib
Singular/LIB/linalg.lib
Singular/LIB/lll.lib
Singular/LIB/makedbm.lib
Singular/LIB/matrix.lib
Singular/LIB/modstd.lib
Singular/LIB/mondromy.lib
Singular/LIB/monomialideal.lib
Singular/LIB/mprimdec.lib
Singular/LIB/mregular.lib
Singular/LIB/multigrading.lib
Singular/LIB/ncalg.lib
Singular/LIB/ncall.lib
Singular/LIB/ncdecomp.lib
Singular/LIB/ncfactor.lib
Singular/LIB/nchomolog.lib
Singular/LIB/nctools.lib
Singular/LIB/noether.lib
Singular/LIB/normal.lib
Singular/LIB/normaliz.lib
Singular/LIB/ntsolve.lib
Singular/LIB/parallel.lib
Singular/LIB/paraplanecurves.lib
Singular/LIB/perron.lib
Singular/LIB/phindex.lib
Singular/LIB/pointid.lib
Singular/LIB/poly.lib
Singular/LIB/polymake.lib
Singular/LIB/presolve.lib
Singular/LIB/primdec.lib
Singular/LIB/primdecint.lib
Singular/LIB/primitiv.lib
Singular/LIB/qhmoduli.lib
Singular/LIB/qmatrix.lib
Singular/LIB/random.lib
Singular/LIB/ratgb.lib
Singular/LIB/realclassify.lib
Singular/LIB/realrad.lib
Singular/LIB/redcgs.lib
Singular/LIB/reesclos.lib
Singular/LIB/resbinomial.lib
Singular/LIB/resgraph.lib
Singular/LIB/resjung.lib
Singular/LIB/resolve.lib
Singular/LIB/reszeta.lib
Singular/LIB/ring.lib
Singular/LIB/ringgb.lib
Singular/LIB/rinvar.lib
Singular/LIB/rootsmr.lib
Singular/LIB/rootsur.lib
Singular/LIB/sagbi.lib
Singular/LIB/sheafcoh.lib
Singular/LIB/signcond.lib
Singular/LIB/sing.lib
Singular/LIB/sing4ti2.lib
Singular/LIB/solve.lib
Singular/LIB/spcurve.lib
Singular/LIB/spectrum.lib
Singular/LIB/standard.lib
Singular/LIB/stratify.lib
Singular/LIB/surf.lib
Singular/LIB/surfacesignature.lib
Singular/LIB/surfex.lib
Singular/LIB/swalk.lib
Singular/LIB/teachstd.lib
Singular/LIB/template.lib
Singular/LIB/toric.lib
Singular/LIB/triang.lib
Singular/LIB/tropical.lib
Singular/LIB/tst.lib
Singular/LIB/weierstr.lib
Singular/LIB/zeroset.lib
Singular/Makefile.in
Singular/attrib.cc
Singular/attrib.h
Singular/bbcone.cc
Singular/bbfan.cc
Singular/blackbox.cc
Singular/claptmpl.cc
Singular/cntrlc.cc
Singular/cntrlc.h
Singular/configure
Singular/configure.in
Singular/dbm_sl.h
Singular/eigenval_ip.cc
Singular/eigenval_ip.h
Singular/emacs.cc
Singular/extra.cc
Singular/feOpt.cc
Singular/feOpt.h
Singular/fehelp.cc
Singular/fglm.cc
Singular/gentable.cc
Singular/gentable2.cc
Singular/gms.cc
Singular/gms.h
Singular/grammar.cc
Singular/grammar.h
Singular/grammar.y
Singular/interpolation.cc
Singular/interpolation.h
Singular/iparith.cc
Singular/ipassign.cc
Singular/ipconv.cc
Singular/ipconv.h
Singular/ipid.cc
Singular/ipid.h
Singular/iplib.cc
Singular/ipprint.cc
Singular/ipprint.h
Singular/ipshell.cc
Singular/ipshell.h
Singular/libparse.cc
Singular/libparse.h
Singular/libparse.l
Singular/libsingular.h
Singular/lists.cc
Singular/lists.h
Singular/locals.h
Singular/maps_ip.cc
Singular/maps_ip.h
Singular/misc_ip.cc
Singular/mod2.h.in
Singular/mpsr.h
Singular/mpsr_Error.cc
Singular/mpsr_Get.cc
Singular/mpsr_Get.h
Singular/mpsr_GetMisc.cc
Singular/mpsr_GetPoly.cc
Singular/mpsr_Put.cc
Singular/mpsr_Put.h
Singular/mpsr_PutPoly.cc
Singular/mpsr_Timer.cc
Singular/mpsr_Timer.h
Singular/mpsr_Tok.cc
Singular/mpsr_Tok.h
Singular/mpsr_sl.cc
Singular/mpsr_sl.h
Singular/ndbm.cc
Singular/ndbm.h
Singular/omSingularConfig.h
Singular/pcv.cc
Singular/pcv.h
Singular/pipeLink.cc
Singular/pipeLink.h
Singular/scanner.cc
Singular/scanner.l
Singular/sdb.cc
Singular/sdb.h
Singular/silink.cc
Singular/silink.h
Singular/sing_dbm.cc
Singular/sing_dbm.h
Singular/sing_win.cc
Singular/singular-libs
Singular/slInit.h
Singular/slInit_Dynamic.cc
Singular/slInit_Static.cc
Singular/ssiLink.cc
Singular/ssiLink.h
Singular/stype.h
Singular/subexpr.cc
Singular/subexpr.h
Singular/table.h
Singular/tesths.cc
Singular/tok.h
Singular/walk.cc
Singular/walk.h
Singular/walk_ip.cc
Tst/Buch/Example_4_7_7.res.gz.uu
Tst/Buch/Example_4_7_7.stat
Tst/BuchDL/Ex_L9.res.gz.uu
Tst/BuchDL/Ex_L9.stat
Tst/Long/allres_l.tst
Tst/Long/brnoeth_l.tst
Tst/Long/classify_l.tst
Tst/Long/factorizep_l.res.gz.uu
Tst/Long/factorizep_l.stat
Tst/Long/fetch_l.tst
Tst/Long/fglm1_l.tst
Tst/Long/fglmquot1_l.tst
Tst/Long/gcd0_l.tst
Tst/Long/gcdp_l.tst
Tst/Long/intdet_l.tst
Tst/Long/king_3_colors_l.tst
Tst/Long/lres_l.tst
Tst/Long/makedbm_l.tst
Tst/Long/monodromy_l.tst
Tst/Long/ok_l.lst
Tst/Long/primdecint.res.gz.uu
Tst/Long/primdecint.stat
Tst/Long/resultantp_l.tst
Tst/Long/rinvar.tst
Tst/Long/solve_l.tst
Tst/Long/std_l.tst
Tst/Long/triang_l.res.gz.uu
Tst/Long/triang_l.stat
Tst/Long/zeroset1.tst
Tst/Old/lib0.lib
Tst/Old/lib0.test
Tst/Old/m96si.res.gz.uu
Tst/Old/m96si.stat
Tst/Old/proc.res.gz.uu
Tst/Old/proc.stat
Tst/Plural/bern5_slimgb.tst
Tst/Plural/dmod_lib.res.gz.uu
Tst/Plural/dmod_lib.stat
Tst/README
Tst/Short/allres_s.tst
Tst/Short/betti_s.tst
Tst/Short/bug_12.res.gz.uu
Tst/Short/bug_12.stat
Tst/Short/bug_15.res.gz.uu
Tst/Short/bug_15.stat
Tst/Short/bug_17.res.gz.uu
Tst/Short/bug_17.stat
Tst/Short/bug_46.res.gz.uu
Tst/Short/bug_46.stat
Tst/Short/bug_qring.res.gz.uu
Tst/Short/bug_qring.stat
Tst/Short/bug_qring.tst
Tst/Short/dbm_s.tst
Tst/Short/facstd.res.gz.uu
Tst/Short/facstd.stat
Tst/Short/facstd.tst
Tst/Short/factorizep_s.res.gz.uu
Tst/Short/factorizep_s.stat
Tst/Short/fglm1_s.tst
Tst/Short/fglmquot1_s.tst
Tst/Short/finduni_s.tst
Tst/Short/gcd0_s.tst
Tst/Short/gcdp_s.tst
Tst/Short/graphics.tst
Tst/Short/hres_s.tst
Tst/Short/intdet_s.tst
Tst/Short/latex.tst
Tst/Short/lres_s.tst
Tst/Short/modstd.res.gz.uu
Tst/Short/modstd.stat
Tst/Short/monodromy_s.tst
Tst/Short/mres_s.tst
Tst/Short/ok_s.lst
Tst/Short/primdec_s.res.gz.uu
Tst/Short/primdec_s.stat
Tst/Short/resultantp_s.tst
Tst/Short/slimgb_s.tst
Tst/Short/solve_s.tst
Tst/Short/spcurve.tst
Tst/Short/std_s.tst
Tst/Short/triang_s.res.gz.uu
Tst/Short/triang_s.stat
Tst/regress.cmd
configure
configure.in
doc/COPYING.plural.texi
doc/COPYING.texi
doc/INSTALL_mac.texi
doc/INSTALL_osx.texi
doc/INSTALL_rpm.texi
doc/INSTALL_unix.plural.texi
doc/INSTALL_unix.texi
doc/INSTALL_win.plural.texi
doc/INSTALL_win.texi
doc/Makefile.in
doc/Makefile.lib2doc
doc/NEWS.plural.texi
doc/NEWS.texi
doc/README_distribution.texi
doc/README_download.plural.texi
doc/README_download.texi
doc/README_ftp.texi
doc/README_src.texi
doc/STYLEGUIDE
doc/doc2idx.pl
doc/doc2tex.pl
doc/examples.doc
doc/general.doc
doc/letterplace.doc
doc/math.doc
doc/pdata.doc
doc/pl2doc.pl
doc/platform.doc
doc/pyobject.doc
doc/reference.doc
doc/sca.doc
doc/singcard.tex
doc/singular.doc
doc/start.doc
doc/texi2html
doc/tricks.doc
doc/tutor.tex
doc/types.doc
doc/usercard.tex
dox/Doxyfile.html.all
dox/Doxyfile.latex.short
emacs/.emacs-general
emacs/.emacs-singular
emacs/cmpl.pl
emacs/lib.pl
emacs/singular.el
factory/COPYING
factory/GNUmakefile.in
factory/NTLconvert.cc
factory/NTLconvert.h
factory/assert.h
factory/bin/fold-docu.el
factory/bin/makeheader
factory/canonicalform.cc
factory/canonicalform.h
factory/cf_algorithm.cc
factory/cf_algorithm.h
factory/cf_binom.cc
factory/cf_binom.h
factory/cf_char.cc
factory/cf_chinese.cc
factory/cf_defs.h
factory/cf_eval.cc
factory/cf_eval.h
factory/cf_factor.cc
factory/cf_factory.cc
factory/cf_factory.h
factory/cf_gcd.cc
factory/cf_gcd_smallp.h
factory/cf_generator.cc
factory/cf_generator.h
factory/cf_globals.cc
factory/cf_globals.h
factory/cf_hnf.cc
factory/cf_hnf.h
factory/cf_inline.cc
factory/cf_irred.cc
factory/cf_irred.h
factory/cf_iter.cc
factory/cf_iter.h
factory/cf_iter_inline.cc
factory/cf_linsys.cc
factory/cf_map.cc
factory/cf_map.h
factory/cf_ops.cc
factory/cf_primes.cc
factory/cf_primes.h
factory/cf_primetab.cc
factory/cf_primetab.h
factory/cf_random.cc
factory/cf_random.h
factory/cf_resultant.cc
factory/cf_reval.cc
factory/cf_reval.h
factory/cf_switches.cc
factory/cf_switches.h
factory/cf_util.cc
factory/cf_util.h
factory/config.h.in
factory/configure
factory/configure.in
factory/debug.cc
factory/debug.h
factory/examples/application.cc
factory/examples/factorize.cc
factory/examples/gcd.cc
factory/facAlgExt.cc
factory/facBivar.h
factory/facFactorize.cc
factory/facFactorize.h
factory/facFqBivarUtil.cc
factory/facFqFactorize.cc
factory/facFqFactorize.h
factory/facFqFactorizeUtil.cc
factory/facFqFactorizeUtil.h
factory/facFqSquarefree.cc
factory/fac_berlekamp.cc
factory/fac_berlekamp.h
factory/fac_cantzass.cc
factory/fac_cantzass.h
factory/fac_distrib.cc
factory/fac_distrib.h
factory/fac_ezgcd.cc
factory/fac_iterfor.cc
factory/fac_iterfor.h
factory/fac_multihensel.cc
factory/fac_multivar.cc
factory/fac_multivar.h
factory/fac_sqrfree.cc
factory/fac_sqrfree.h
factory/fac_univar.cc
factory/fac_univar.h
factory/fac_util.cc
factory/fac_util.h
factory/factory.cfg
factory/factory.template
factory/factoryconf.template
factory/fex/gcdUnivP.fex
factory/fex/gcdUnivPAlpha.fex
factory/fex/insert.fex
factory/fex/runfex
factory/fex/stdUnivPGcd.in
factory/ffops.cc
factory/ffops.h
factory/ftest/GNUmakefile.in
factory/ftest/bextgcd.m4
factory/ftest/bgcd.m4
factory/ftest/commonden.m4
factory/ftest/degree.m4
factory/ftest/deriv.m4
factory/ftest/divides.m4
factory/ftest/divrem.m4
factory/ftest/extgcd.m4
factory/ftest/factorize.m4
factory/ftest/fbinops.m4
factory/ftest/feval.m4
factory/ftest/ftest_io.cc
factory/ftest/ftest_io.h
factory/ftest/ftest_util.cc
factory/ftest/ftest_util.h
factory/ftest/ftest_util.m4
factory/ftest/gcd.m4
factory/ftest/gcd.ntl.m4
factory/ftest/insert.m4
factory/ftest/norm.m4
factory/ftest/ntl_util.cc
factory/ftest/ntl_util.h
factory/ftest/resultant.m4
factory/ftest/revert.m4
factory/ftest/size.m4
factory/ftest/sqrfree.m4
factory/ftest/totaldegree.m4
factory/ftmpl_inst.cc
factory/gengftables-conway.cc
factory/gengftables.cc
factory/gf_tabutil.cc
factory/gf_tabutil.h
factory/gfops.cc
factory/gfops.h
factory/gmpext.h
factory/imm.cc
factory/imm.h
factory/initgmp.cc
factory/int_cf.cc
factory/int_cf.h
factory/int_int.cc
factory/int_int.h
factory/int_intdiv.cc
factory/int_poly.cc
factory/int_poly.h
factory/int_pp.cc
factory/int_pp.h
factory/int_rat.cc
factory/int_rat.h
factory/memman.h
factory/memutil.c
factory/memutil.h
factory/mmalloc.c
factory/mmallocb.c
factory/mmallocs.c
factory/mmblock.c
factory/mmheap.c
factory/mminit.c
factory/mmprivate.h
factory/mmspec.c
factory/mmutil.c
factory/newdelete.cc
factory/parseutil.cc
factory/parseutil.h
factory/readcf.y
factory/singext.cc
factory/singext.h
factory/sm_sparsemod.cc
factory/sm_sparsemod.h
factory/sm_util.cc
factory/sm_util.h
factory/templates/ftmpl_array.cc
factory/templates/ftmpl_array.h
factory/templates/ftmpl_factor.cc
factory/templates/ftmpl_factor.h
factory/templates/ftmpl_functions.h
factory/templates/ftmpl_list.cc
factory/templates/ftmpl_list.h
factory/templates/ftmpl_matrix.cc
factory/templates/ftmpl_matrix.h
factory/test_install.cc
factory/timing.h
factory/var_intglobal.cc
factory/var_intglobal.h
factory/variable.cc
factory/variable.h
factory/winnt/config.h
factory/winnt/factory.h
factory/winnt/factoryconf.h
gfanlib/Makefile.in
gfanlib/README.txt
gfanlib/configure
gfanlib/configure.ac
gfanlib/gfanlib_matrix.h
gfanlib/gfanlib_polyhedralfan.cpp
gfanlib/gfanlib_symmetriccomplex.cpp
gfanlib/gfanlib_symmetriccomplex.h
gfanlib/gfanlib_vector.h
gfanlib/gfanlib_z.h
gfanlib/gfanlib_zcone.cpp
gfanlib/gfanlib_zcone.h
gfanlib/gfanlib_zfan.cpp
gfanlib/gfanlib_zfan.h
kernel/COPYING
kernel/F4.cc
kernel/F4.h
kernel/Ideal.h
kernel/Makefile.in
kernel/Poly.h
kernel/bbcone.h
kernel/bbfan.h
kernel/clapconv.cc
kernel/clapconv.h
kernel/clapsing.cc
kernel/clapsing.h
kernel/dError.c
kernel/dError.h
kernel/digitech.cc
kernel/eigenval.cc
kernel/eigenval.h
kernel/f5data.cc
kernel/f5data.h
kernel/f5gb.h
kernel/f5lists.h
kernel/fast_maps.cc
kernel/fast_maps.h
kernel/fast_mult.cc
kernel/feResource.cc
kernel/febase.cc
kernel/febase.h
kernel/fegetopt.c
kernel/feread.cc
kernel/fereadl.c
kernel/ffields.cc
kernel/ffields.h
kernel/fglm.h
kernel/fglmcomb.cc
kernel/fglmgauss.cc
kernel/fglmgauss.h
kernel/fglmhom.cc
kernel/fglmvec.cc
kernel/fglmvec.h
kernel/fglmzero.cc
kernel/gfan.cc
kernel/gfan.h
kernel/gnumpc.cc
kernel/gnumpc.h
kernel/gnumpfl.cc
kernel/gnumpfl.h
kernel/gr_kstd2.cc
kernel/gring.cc
kernel/gring.h
kernel/hdegree.cc
kernel/hilb.cc
kernel/hutil.cc
kernel/ideals.cc
kernel/ideals.h
kernel/idrec.h
kernel/int64vec.cc
kernel/int64vec.h
kernel/intvec.cc
kernel/intvec.h
kernel/kInline.cc
kernel/kbuckets.cc
kernel/kbuckets.h
kernel/khstd.cc
kernel/khstd.h
kernel/kspoly.cc
kernel/kstd1.cc
kernel/kstd1.h
kernel/kstd2.cc
kernel/kstdfac.cc
kernel/kstdfac.h
kernel/kutil.cc
kernel/kutil.h
kernel/longalg.cc
kernel/longalg.h
kernel/longrat.cc
kernel/longrat.h
kernel/longrat0.cc
kernel/longtrans.cc
kernel/longtrans.h
kernel/lplist.cc
kernel/lplist.h
kernel/maps.cc
kernel/maps.h
kernel/matpol.cc
kernel/matpol.h
kernel/mmalloc.cc
kernel/mmalloc.h
kernel/mmstd.c
kernel/mod2.h.in
kernel/mod_raw.cc
kernel/mod_raw.h
kernel/modulop.cc
kernel/modulop.h
kernel/mpr_base.cc
kernel/mpr_base.h
kernel/mpr_complex.cc
kernel/mpr_complex.h
kernel/mpr_global.h
kernel/mpr_inout.cc
kernel/mpr_inout.h
kernel/mpr_numeric.cc
kernel/mpr_numeric.h
kernel/ncSACache.cc
kernel/ncSACache.h
kernel/ncSAFormula.cc
kernel/ncSAFormula.h
kernel/ncSAMult.cc
kernel/ncSAMult.h
kernel/numbers.cc
kernel/numbers.h
kernel/options.h
kernel/pDebug.cc
kernel/pInline0.cc
kernel/pInline0.h
kernel/pInline1.cc
kernel/pInline1.h
kernel/pInline2.cc
kernel/pInline2.h
kernel/pShallowCopyDelete.cc
kernel/pShallowCopyDelete.h
kernel/p_Add_q__T.cc
kernel/p_Copy__T.cc
kernel/p_Delete__T.cc
kernel/p_MemAdd.h
kernel/p_MemCmp.h
kernel/p_MemCopy.h
kernel/p_Merge_q__T.cc
kernel/p_Minus_mm_Mult_qq__T.cc
kernel/p_Mult_mm__T.cc
kernel/p_Mult_nn__T.cc
kernel/p_Mult_q.cc
kernel/p_Mult_q.h
kernel/p_Neg__T.cc
kernel/p_Numbers.h
kernel/p_Procs.h
kernel/p_Procs_Dynamic.cc
kernel/p_Procs_Dynamic.h
kernel/p_Procs_Generate.cc
kernel/p_Procs_Impl.h
kernel/p_Procs_Lib.cc
kernel/p_Procs_Set.h
kernel/p_Procs_Static.cc
kernel/p_Procs_Static.h
kernel/p_ShallowCopyDelete__T.cc
kernel/p_kBucketSetLm__T.cc
kernel/p_polys.cc
kernel/p_polys.h
kernel/polys-impl.cc
kernel/polys-impl.h
kernel/polys.cc
kernel/polys.h
kernel/polys0.cc
kernel/polys1.cc
kernel/pp_Mult_Coeff_mm_DivSelectMult__T.cc
kernel/pp_Mult_Coeff_mm_DivSelect__T.cc
kernel/pp_Mult_mm_Noether__T.cc
kernel/pp_Mult_mm__T.cc
kernel/pp_Mult_nn__T.cc
kernel/prCopy.cc
kernel/prCopy.h
kernel/prCopyTemplate.cc
kernel/ratgring.cc
kernel/ratgring.h
kernel/ring.cc
kernel/ring.h
kernel/ringgb.cc
kernel/ringgb.h
kernel/rintegers.cc
kernel/rintegers.h
kernel/rmodulo2m.cc
kernel/rmodulo2m.h
kernel/rmodulon.cc
kernel/rmodulon.h
kernel/sbuckets.cc
kernel/sbuckets.h
kernel/sca.cc
kernel/sca.h
kernel/shiftgb.cc
kernel/shiftgb.h
kernel/shortfl.cc
kernel/shortfl.h
kernel/si_gmp.h
kernel/sparsmat.cc
kernel/sparsmat.h
kernel/stairc.h
kernel/structs.h
kernel/summator.cc
kernel/summator.h
kernel/syz.cc
kernel/syz.h
kernel/syz0.cc
kernel/syz1.cc
kernel/syz2.cc
kernel/syz3.cc
kernel/tgb.cc
kernel/tgb.h
kernel/tgb_internal.h
kernel/tgbgauss.cc
kernel/tgbgauss.h
kernel/timer.cc
kernel/timer.h
kernel/tmult.cc
kernel/units.cc
kernel/units.h
kernel/walkMain.cc
kernel/walkProc.cc
kernel/weight.cc
kernel/weight.h
kernel/weight0.c
libfac/Makefile.dist
libfac/Makefile.in
libfac/charset/alg_factor.cc
libfac/charset/alg_factor.h
libfac/charset/algfactor.cc
libfac/charset/algfactor.h
libfac/charset/charset.cc
libfac/charset/charset.h
libfac/charset/csutil.cc
libfac/charset/csutil.h
libfac/charset/reorder.cc
libfac/charset/reorder.h
libfac/factor.h
libfac/factor/Factor.cc
libfac/factor/Factor.h
libfac/factor/MVMultiHensel.cc
libfac/factor/MVMultiHensel.h
libfac/factor/SqrFree.cc
libfac/factor/SqrFree.h
libfac/factor/Truefactor.cc
libfac/factor/Truefactor.h
libfac/factor/class.cc
libfac/factor/class.h
libfac/factor/debug.h
libfac/factor/helpstuff.cc
libfac/factor/helpstuff.h
libfac/factor/homogfactor.cc
libfac/factor/homogfactor.h
libfac/factor/interrupt.h
libfac/factor/test.cc
libfac/factor/timing.h
libfac/factor/tmpl_inst.cc
libfac/factor/tmpl_inst.h
libfac/factor/version.cc
libfac/test.cc
libfac/testcs.cc
omalloc/COPYING
omalloc/Makefile.in
omalloc/configure.in
omalloc/dlmalloc.c
omalloc/dlmalloc.h
omalloc/gmalloc.c
omalloc/makeheader
omalloc/mylimits.h
omalloc/omAllocDecl.h
omalloc/omAllocEmulate.c
omalloc/omAllocFunc.c
omalloc/omAllocFunc.h
omalloc/omAllocPrivate.h
omalloc/omAllocSystem.c
omalloc/omAllocSystem.h
omalloc/omBin.c
omalloc/omBin.h
omalloc/omBinPage.c
omalloc/omBinPage.h
omalloc/omConfig.h.in
omalloc/omDebug.c
omalloc/omDebug.h
omalloc/omDebugCheck.c
omalloc/omDebugTrack.c
omalloc/omDefaultConfig.h
omalloc/omDerivedConfig.h
omalloc/omError.c
omalloc/omError.h
omalloc/omFindExec.c
omalloc/omFindExec.h
omalloc/omGetBackTrace.c
omalloc/omGetBackTrace.h
omalloc/omGetPageSize.h
omalloc/omInline.h
omalloc/omInlineDecl.h
omalloc/omList.c
omalloc/omList.h
omalloc/omMallocSystem.h
omalloc/omMemOps.h
omalloc/omMmap.c
omalloc/omOpts.c
omalloc/omOpts.h
omalloc/omPage.h
omalloc/omRet2Info.c
omalloc/omRet2Info.h
omalloc/omReturn.h
omalloc/omStats.c
omalloc/omStats.h
omalloc/omStructs.h
omalloc/omTables.c
omalloc/om_Alloc.c
omalloc/om_Alloc.h
omalloc/omalloc.c
omalloc/omalloc_debug.c
omalloc/omalloc_provide.c
omalloc/omlimits.h.in
omalloc/omtTestAlloc.c
omalloc/pmalloc.c
omalloc/pmalloc.h
diff --combined COPYING
index 740c5be,7076a0e..c3d57f4
--- a/COPYING
+++ b/COPYING
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
+ SINGULAR version 3-1-3
++=======
+ SINGULAR version 3-1-4
++>>>>>>> origin/cleanedupstream
University of Kaiserslautern
@@@ -6,7 -6,7 +10,11 @@@
Authors: G.-M. Greuel, G. Pfister, H. Schoenemann
++<<<<<<< HEAD
+ Copyright (C) 1986-2011
++=======
+ Copyright (C) 1986-2012
++>>>>>>> origin/cleanedupstream
@@@ -88,9 -88,9 +96,15 @@@ Hubert Grassmann, Amir Hashemi, Fernand
Dietmar Hillebrand, Tobias Hirsch, Markus Hochstetter, Manuel Kauers,
Simon King, Anen Lakhal, Martin Lamm, Santiago Laplagne, Gregoire
Lecerf, Francisco Javier Lobillo, Christoph Mang, Thomas Markwig, Bernd
++<<<<<<< HEAD
+Martin, Michael Messollen, Andrea Mindnich, Jorge Martin Morales,
+Thomas Nu"ssler, Tetyana Povalyaeva, Carlos Rabelo, J.-J.
+Salazar-Gonzalez, Alfredo Sanchez-Navarro, Ivor Saynisch, Kristina
++=======
+ Martin, Michael Messollen, Andrea Mindnich, Antonio Montes,
+ Jorge Martin Morales, Thomas Nu"ssler, Tetyana Povalyaeva, Carlos Rabelo,
+ J.-J. Salazar-Gonzalez, Alfredo Sanchez-Navarro, Ivor Saynisch, Kristina
++>>>>>>> origin/cleanedupstream
Schindelar, Silke Spang, Stefan Steidel, Henrik Strohmayer, Christian
Stussak, Imade Sulandra, Akira Suzuki, Christine Theis, Enrique Tobis,
Maryna Viazovska, Alberto Vigneron-Tenorio, Moritz Wenk, Denis Yanovich,
diff --combined IntegerProgramming/COPYING
index 072ab1d,dc75b78..6e63e60
--- a/IntegerProgramming/COPYING
+++ b/IntegerProgramming/COPYING
@@@ -7,7 -7,7 +7,11 @@@
Authors: G.-M. Greuel, G. Pfister, H. Schoenemann
++<<<<<<< HEAD
+ Copyright (C) 1986-2011
++=======
+ Copyright (C) 1986-2012
++>>>>>>> origin/cleanedupstream
diff --combined IntegerProgramming/si_gmp.h
index b6cf8a2,2bc6c34..6e36284
--- a/IntegerProgramming/si_gmp.h
+++ b/IntegerProgramming/si_gmp.h
@@@ -1,5 -1,5 +1,10 @@@
++<<<<<<< HEAD
+/* $Id: si_gmp.h 12231 2009-11-02 10:12:22Z hannes $ */
+/* $Id: si_gmp.h 12231 2009-11-02 10:12:22Z hannes $ */
++=======
+ /* $Id$ */
+ /* $Id$ */
++>>>>>>> origin/cleanedupstream
#ifndef INCL_CF_GMP_H
#define INCL_CF_GMP_H
diff --combined configure
index a8275f9,09b5334..c30b404
--- a/configure
+++ b/configure
@@@ -23,7 -23,7 +23,7 @@@ ac_help="$ac_hel
omalloc omalloc memory managment"
ac_help="$ac_help
\
- gmp Gnu Multiple Precision package"
+ gfanlib gfanlib"
ac_help="$ac_help
\
MP Multi Protocol library"
@@@ -593,12 -593,12 +593,12 @@@ pwd=`pwd
# pass them indirectly to subsequent configures
SINGULAR_MAJOR_VERSION=3
SINGULAR_MINOR_VERSION=1
- SINGULAR_SUB_VERSION=3
+ SINGULAR_SUB_VERSION=4
VERSION_SEP="-"
SINGULAR_SHORT_VERSION="${SINGULAR_MAJOR_VERSION}${VERSION_SEP}${SINGULAR_MINOR_VERSION}"
SINGULAR_VERSION="${SINGULAR_SHORT_VERSION}${VERSION_SEP}${SINGULAR_SUB_VERSION}"
SINGULAR_RPM_VERSION="${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}"
- VERSION_DATE="March 2011"
+ VERSION_DATE="Jan 2012"
SINGULAR_ROOT_DIR=$pwd
export SINGULAR_MINOR_VERSION
@@@ -610,12 -610,6 +610,7 @@@ export VERSION_DAT
export SINGULAR_ROOT_DIR
+
-
-
-
-
-
# determine Makefiles to output
OUTPUT_MAKEFILES="Makefile"
if test -d "doc"; then
@@@ -2128,9 -2122,9 +2123,9 @@@ if test "${enable_omalloc+set}" = set;
:
fi
- # Check whether --enable-gmp or --disable-gmp was given.
- if test "${enable_gmp+set}" = set; then
- enableval="$enable_gmp"
+ # Check whether --enable-gfanlib or --disable-gfanlib was given.
+ if test "${enable_gfanlib+set}" = set; then
+ enableval="$enable_gfanlib"
:
fi
@@@ -2218,9 -2212,9 +2213,9 @@@ if test "${with_libfac+set}" = set; the
:
fi
- # Check whether --with-gmp or --without-gmp was given.
- if test "${with_gmp+set}" = set; then
- withval="$with_gmp"
+ # Check whether --with-gfanlib or --without-gfanlib was given.
+ if test "${with_gfanlib+set}" = set; then
+ withval="$with_gfanlib"
:
fi
@@@ -2293,31 -2287,9 +2288,9 @@@ els
echo "$ac_t""no" 1>&6
fi
- if test "$enable_gmp" = yes; then
- # for gmp-3.0 to work for all ix86 processors, set generic target
- if test "$target" = NONE; then
- case "$ac_cv_singuname" in
- ix86*)
- gmp_target=`./config.guess | sed 's/^\w*-/i386-/'`
- ac_configure_args="$ac_configure_args --target=$gmp_target"
- ;;
- esac
- fi
- # furthermore, disable building of dynamic libraries, for we want to
- # link against the static ones
- if test "$enable_shared" != no; then
- ac_configure_args="$ac_configure_args --disable-shared"
- fi
- fi
-
# Check whether we have gmp
- if test "$ac_gmp_ok" != yes && test "$enable_gmp" != yes; then
- { echo "configure: error: can neither find nor built gmp" 1>&2; exit 1; }
- fi
-
- # Check whether we need to cheat subsequent configures with --enable-gmp
- if test "$ac_gmp_ok" != yes && test "$enable_gmp" != yes; then
- ac_configure_args="$ac_configure_args --enable-gmp"
+ if test "$ac_gmp_ok" != yes; then
+ { echo "configure: error: can not find gmp" 1>&2; exit 1; }
fi
#AC_MSG_CHECKING(whether to configure and build MP lib)
@@@ -2370,7 -2342,7 +2343,7 @@@ echo "configure:2389: checking whether
if test "$enable_MP" != yes && test "$enable_MP" != no; then
if test "$with_MP" != no && test "$ac_MP_ok" != yes && test -d MP && \
- (test "$enable_gmp" = yes || test "$ac_gmp_ok" = yes); then
+ (test "$ac_gmp_ok" = yes); then
echo "$ac_t""yes" 1>&6
enable_MP=yes
CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
@@@ -2385,7 -2357,7 +2358,7 @@@ elif test "$enable_MP" = yes; the
echo "$ac_t""no" 1>&6
{ echo "configure: error: can not build MP without MP directory" 1>&2; exit 1; }
fi
- if test "$enable_gmp" = yes || test "$ac_gmp_ok" = yes; then
+ if test "$ac_gmp_ok" = yes; then
echo "$ac_t""yes" 1>&6
CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
BUILD1_SUBDIRS="$BUILD1_SUBDIRS MP"
@@@ -2853,13 -2825,13 +2826,13 @@@ f
echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
echo "configure:2874: checking which apint package to use" >&5
if test "$with_apint" = gmp; then
- if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
+ if test "$ac_gmp_ok" = yes; then
echo "$ac_t""gmp" 1>&6
else
echo "$ac_t""none" 1>&6
- { echo "configure: error: can not use with gmp without finding or building it" 1>&2; exit 1; }
+ { echo "configure: error: can not use with gmp without finding" 1>&2; exit 1; }
fi
- elif test "$ac_gmp_ok" = yes || test "$enable_gmp"; then
+ elif test "$ac_gmp_ok" = yes; then
echo "$ac_t""gmp" 1>&6
ac_configure_args="$ac_configure_args --with-apint=gmp"
else
@@@ -2948,9 -2920,6 +2921,6 @@@ SUBDIRS="
if test -d omalloc; then
SUBDIRS="$SUBDIRS omalloc"
fi
- if test -d gmp; then
- SUBDIRS="$SUBDIRS gmp"
- fi
if test -d MP; then
SUBDIRS="$SUBDIRS MP"
fi
diff --combined emacs/.emacs-general
index a0f8d1d,f25656f..8852ba3
--- a/emacs/.emacs-general
+++ b/emacs/.emacs-general
@@@ -1,5 -1,5 +1,9 @@@
;;; Emacs edit mode for this file is -*- Emacs-Lisp -*-
++<<<<<<< HEAD
+;;; $Id: .emacs-general 12231 2009-11-02 10:12:22Z hannes $
++=======
+ ;;; $Id$
++>>>>>>> origin/cleanedupstream
;;;
;;; .emacs-general - Emacs initialization file for general emacs
diff --combined emacs/.emacs-singular
index 9a44d30,57c4f7c..6476b87
--- a/emacs/.emacs-singular
+++ b/emacs/.emacs-singular
@@@ -1,5 -1,5 +1,9 @@@
;;; Emacs edit mode for this file is -*- Emacs-Lisp -*-
++<<<<<<< HEAD
+;;; $Id: .emacs-singular 12231 2009-11-02 10:12:22Z hannes $
++=======
+ ;;; $Id$
++>>>>>>> origin/cleanedupstream
;;;
;;; .emacs-singular - Emacs initialization file to use for
diff --combined emacs/cmpl.pl
index b87d27a,2f8d658..9b6b495
--- a/emacs/cmpl.pl
+++ b/emacs/cmpl.pl
@@@ -1,5 -1,5 +1,9 @@@
#!/usr/local/bin/perl
++<<<<<<< HEAD
+# $Id: cmpl.pl 12231 2009-11-02 10:12:22Z hannes $
++=======
+ # $Id$
++>>>>>>> origin/cleanedupstream
###################################################################
#
# FILE: cmpl.pl
diff --combined emacs/lib.pl
index 0ce801b,6ae1662..81e3166
--- a/emacs/lib.pl
+++ b/emacs/lib.pl
@@@ -1,5 -1,5 +1,9 @@@
#!/usr/local/bin/perl
++<<<<<<< HEAD
+# $Id: lib.pl 12231 2009-11-02 10:12:22Z hannes $
++=======
+ # $Id$
++>>>>>>> origin/cleanedupstream
###################################################################
#
# FILE: lib.pl
diff --combined emacs/singular.el
index 4233f3d,aa66bc3..6076c58
--- a/emacs/singular.el
+++ b/emacs/singular.el
@@@ -1,6 -1,6 +1,10 @@@
;;; singular.el --- Emacs support for Computer Algebra System Singular
++<<<<<<< HEAD
+;; $Id: singular.el 13177 2010-09-13 10:43:12Z hannes $
++=======
+ ;; $Id$
++>>>>>>> origin/cleanedupstream
;;; Commentary:
diff --combined gfanlib/configure.ac
index 1145fb7,4a0bf6b..4a0bf6b
mode 100644,100755..100644
--- a/gfanlib/configure.ac
+++ b/gfanlib/configure.ac
@@@ -18,8 -18,11 +18,11 @@@ AC_PROG_RANLI
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([gmp.h])
- AC_CHECK_HEADERS([cdd.h])
AC_CHECK_HEADERS([setoper.h])
+ AC_CHECK_HEADERS([cdd.h],,,
+ [
+ # include <setoper.h>
+ ])
if test "$ac_cv_header_gmp_h" == no
then
diff --combined kernel/bbcone.h
index 8910229,84bb001..84bb001
mode 100644,100755..100644
--- a/kernel/bbcone.h
+++ b/kernel/bbcone.h
@@@ -11,7 -11,16 +11,16 @@@ intvec* zVector2Intvec(const gfan::ZVec
intvec* zMatrix2Intvec(const gfan::ZMatrix zm);
gfan::ZMatrix intmat2ZMatrix(const intvec* iMat);
gfan::ZVector intvec2ZVector(const intvec* iVec);
+ std::string toString(gfan::ZMatrix const &m, char *tab=0);
int integerToInt(gfan::Integer const &V, bool &ok);
+ int getDimension(gfan::ZCone* zc);
+ int getCodimension(gfan::ZCone* zc);
+ int getLinealityDimension(gfan::ZCone* zc);
+ int isSimplicial(gfan::ZCone* zc);
+
+ bool containsInSupport(gfan::ZCone* zc, gfan::ZCone* zd);
+ bool containsInSupport(gfan::ZCone* zc, intvec* vec);
+
#endif
#endif
diff --combined kernel/bbfan.h
index 0fc9f1d,86ad31d..86ad31d
mode 100644,100755..100644
--- a/kernel/bbfan.h
+++ b/kernel/bbfan.h
@@@ -1,8 -1,17 +1,17 @@@
#ifndef BBFAN_H
#define BBFAN_H
+ #ifdef HAVE_FANS
+ #include <gfanlib/gfanlib.h>
+
extern int fanID;
void bbfan_setup();
+ int getAmbientDimension(gfan::ZFan* zf);
+ int getCodimension(gfan::ZFan* zf);
+ int getDimension(gfan::ZFan* zf);
+ int getLinealityDimension(gfan::ZFan* zf);
+
+ #endif
#endif
--
an open source computer algebra system
More information about the debian-science-commits
mailing list