Changeset c1ec9a in git for Singular


Ignore:
Timestamp:
Mar 18, 2013, 6:59:04 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
Children:
a601d5555bc411c2f00957c8f324951e8d88085f
Parents:
ae74d2ae268551f6d008e85e9f2ba78cfc3fa92f5417fff5d4d977443ea13f49a1da1d9de9a2a171
Message:
Merge pull request #307 from malex984/gfanlib

Gfanlib
Location:
Singular
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • Singular/LIB/gitfan.lib

    r5417ff rc1ec9a  
    11////////////////////////////////////////////////////////////////////
    2 version="$Id: gitfan.lib";
     2version="$Id$";
    33category="Algebraic Geometry";
    44info="

  • Singular/Makefile.am

    rae74d2 rc1ec9a  
    1212NODEBUGCFLAGS   = -O3 -w -fomit-frame-pointer $(WARNCFLAGS)
    1313NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer $(WARNCFLAGS)
    14 NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG 
     14NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG
    1515
    1616CXXTEMPLFLAGS =-ftrapv ## -fno-implicit-templates
    … …  
    3434libSingular_la_CXXFLAGS   = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)  $(WARNCFLAGS)
    3535libSingular_g_la_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)   $(WARNCFLAGS)
    36 # -fdiagnostics-show-option 
     36# -fdiagnostics-show-option
    3737
    3838
    … …  
    4545   links/asciiLink.cc\
    4646   attrib.cc\
    47    bbcone.cc\
    48    bbfan.cc\
    4947   bigintm.cc\
    5048   blackbox.cc\
    … …  
    9492   walk_ip.cc\
    9593   wrapper.cc\
    96    fereadl.c mmstd.c claptmpl.cc 
     94   fereadl.c mmstd.c claptmpl.cc
    9795
    9896#   links/slInit_Dynamic.cc
    … …  
    153151   table.h \
    154152   tok.h \
    155    walk.h 
    156 
    157 # plural_cmd.inc 
     153   walk.h
     154
     155# plural_cmd.inc
    158156nodist_libSingular_la_SOURCES = iparith.inc
    159157nodist_libSingular_g_la_SOURCES = iparith.inc
    … …  
    187185feOptES_SOURCES = feOptGen.cc feOptGen.h
    188186feOptES_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    189 feOptES_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR 
     187feOptES_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR
    190188
    191189feOptTS_SOURCES = feOptGen.cc feOptGen.h
    … …  
    199197# the "optional_programs" variable should be defined in the configure
    200198# script, and listed in an AC_SUBST macro
    201 optional_Singular_programs = 
     199optional_Singular_programs =
    202200
    203201bin_PROGRAMS = Singular ESingular TSingular $(optional_Singular_programs)
    … …  
    221219nodist_Singularg_SOURCES =  libSingular_g.la
    222220
    223 Singular_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h 
    224 Singularg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h 
     221Singular_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
     222Singularg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
    225223
    226224Singular_LDADD = libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
    … …  
    228226
    229227Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    230 Singularg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 
     228Singularg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    231229
    232230Singular_LDFLAGS = -static ${AMLDFLAGS}
    … …  
    240238Singulardg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    241239
    242 Singulard_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h 
     240Singulard_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
    243241nodist_Singulard_SOURCES = libSingular.la
    244242
    245 Singulardg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h 
     243Singulardg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
    246244nodist_Singulardg_SOURCES =  libSingular_g.la
    247245
    … …  
    250248
    251249Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    252 Singulardg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 
     250Singulardg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    253251
    254252Singulard_LDFLAGS = ${AMLDFLAGS}
    … …  
    256254
    257255
    258 #### ESingular 
     256#### ESingular
    259257
    260258ESingular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    261259ESingular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    262 ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR -DPROTO 
     260ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR -DPROTO
    263261ESingular_LDFLAGS = -static ${AMLDFLAGS}
    264 ESingular_LDADD =   -lreporter -lmisc -lomalloc -lfindexec 
     262ESingular_LDADD =   -lreporter -lmisc -lomalloc -lfindexec
    265263
    266264ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
    267265
    268 #### same for TSingular 
     266#### same for TSingular
    269267
    270268TSingular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    271269TSingular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    272 TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR -DPROTO 
     270TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR -DPROTO
    273271TSingular_LDFLAGS = -static ${AMLDFLAGS}
    274 TSingular_LDADD =   -lreporter -lmisc -lomalloc -lfindexec 
     272TSingular_LDADD =   -lreporter -lmisc -lomalloc -lfindexec
    275273
    276274TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
    … …  
    278276
    279277
    280 #### libparse 
     278#### libparse
    281279libparse_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DSTANDALONE_PARSER
    282280libparse_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    283281libparse_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    284  
     282
    285283libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc  utils.h
    286284# nodist_libparse_SOURCES = libSingular.la
    287  
    288 # # libSingular.la -lnumeric 
     285
     286# # libSingular.la -lnumeric
    289287libparse_LDADD = -lomalloc
    290288libparse_LDFLAGS = -static ${AMLDFLAGS}
    … …  
    341339
    342340test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    343 test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 
     341test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    344342
    345343test_s_r_LDFLAGS = -static ${AMLDFLAGS}
    … …  
    362360
    363361test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    364 test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 
     362test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    365363
    366364test_d_r_LDFLAGS = ${AMLDFLAGS}
    … …  
    371369# These files are built first
    372370BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc iparith.inc all.lib plural_cmd.inc \
    373                 gftables MOD 
     371                gftables MOD
    374372
    375373CLEANFILES = $(BUILT_SOURCES) $(EXTRA_PROGRAMS)
    … …  
    419417pyobject_g_la_CPPFLAGS = ${AM_CPPFLAGS}
    420418
    421 pyobject_la_CXXFLAGS   = ${NODEBUGCXXFLAGS} @PYTHON_CSPEC@ 
    422 pyobject_g_la_CXXFLAGS = ${DEBUGCXXFLAGS} @PYTHON_CSPEC@ 
     419pyobject_la_CXXFLAGS   = ${NODEBUGCXXFLAGS} @PYTHON_CSPEC@
     420pyobject_g_la_CXXFLAGS = ${DEBUGCXXFLAGS} @PYTHON_CSPEC@
    423421
    424422pyobject_la_LDFLAGS = -export-dynamic -shared -module -avoid-version \

  • Singular/extra.cc

    rae74d2 rc1ec9a  
    9999#ifdef HAVE_RINGS
    100100#include <kernel/ringgb.h>
    101 #endif
    102 
    103 #ifdef HAVE_FANS
    104 #include <kernel/gfan.h>
    105 #include <gfanlib/gfanlib.h>
    106101#endif
    107102
    … …  
    36613656
    36623657  #endif
    3663 
    3664 #ifdef HAVE_FANS
    3665   /*======== GFAN ==============*/
    3666   /*
    3667    WILL HAVE TO CHANGE RETURN TYPE TO LIST_CMD
    3668   */
    3669   if (strcmp(sys_cmd,"grfan")==0)
    3670   {
    3671     /*
    3672     heuristic:
    3673     0 = keep all Gröbner bases in memory
    3674     1 = write all Gröbner bases to disk and read whenever necessary
    3675     2 = use a mixed heuristic, based on length of Gröbner bases
    3676     */
    3677     if( h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
    3678     {
    3679       int heuristic;
    3680       heuristic=(int)(long)h->next->Data();
    3681       ideal I=((ideal)h->Data());
    3682       #ifndef USE_ZFAN
    3683         #define USE_ZFAN
    3684       #endif
    3685       #ifndef USE_ZFAN
    3686         res->rtyp=LIST_CMD; //res->rtyp=coneID; res->data(char*)zcone;
    3687         res->data=(lists) grfan(I,heuristic,FALSE);
    3688       #else
    3689         extern int fanID;
    3690         res->rtyp=fanID;
    3691         res->data=(void*)(grfan(I,heuristic,FALSE));
    3692       #endif
    3693       return FALSE;
    3694     }
    3695     else
    3696     {
    3697       WerrorS("Usage: system(\"grfan\",I,int)");
    3698       return TRUE;
    3699     }
    3700   }
    3701   //Possibility to have only one Gröbner cone computed by specifying a weight vector FROM THE RELATIVE INTERIOR!
    3702   //Needs wp as ordering!
    3703 //   if(strcmp(sys_cmd,"grcone")==0)
    3704 //   {
    3705 //     if(h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
    3706 //     {
    3707 //       ideal I=((ideal)h->Data());
    3708 //       res->rtyp=LIST_CMD;
    3709 //       res->data=(lists)grcone_by_intvec(I);
    3710 //     }
    3711 //   }
    3712   else
    3713 #endif
     3658/*======================= demon_list =====================*/
    37143659  if (strcmp(sys_cmd,"denom_list")==0)
    37153660  {

  • Singular/test.cc

    rae74d2 rc1ec9a  
    9999#include <kernel/shiftgb.h>
    100100#include "mmalloc.h"
    101 #include <kernel/gfan.h>
    102101
    103102#include <kernel/kutil.h>
    … …  
    122121#include <kernel/f5lists.h>
    123122////////#include <kernel/F5cLists.h>
    124 
    125 #include <kernel/gfan.h>
    126123
    127124
    … …  
    348345    {
    349346      printf("iiMake_proc: datetime returned type %d, >>%s<<\n", iiRETURNEXPR.Typ(), (char *)iiRETURNEXPR.Data());
    350       iiRETURNEXPR.CleanUp(); // calls Init afterwards 
    351     }   
     347      iiRETURNEXPR.CleanUp(); // calls Init afterwards
     348    }
    352349  }
    353350

  • Singular/tesths.cc

    rae74d2 rc1ec9a  
    2323#include <kernel/timer.h>
    2424
    25 #ifdef HAVE_FANS
    26 #include <kernel/bbcone.h>
    27 #include <kernel/bbfan.h>
    28 #endif
     25// #ifdef HAVE_FANS
     26// #include <callgfanlib/bbcone.h>
     27// #include <callgfanlib/bbpolytope.h>
     28// #include <callgfanlib/bbfan.h>
     29// #include <callgfanlib/gitfan.h>
     30// #endif
    2931
    3032#include "ipshell.h"
    … …  
    177179  countedref_init();
    178180#endif
    179 #ifdef HAVE_FANS
    180   bbcone_setup();
    181   bbfan_setup();
    182 #endif /* HAVE_FANS */
     181// #ifdef HAVE_FANS
     182//   bbcone_setup();
     183//   bbpolytope_setup();
     184//   bbfan_setup();
     185//   gitfan_setup();
     186// #endif /* HAVE_FANS */
    183187  errorreported = 0;
    184188
Note: See TracChangeset for help on using the changeset viewer.