Skip to content

Commit

Permalink
Remove Pelican implementation
Browse files Browse the repository at this point in the history
The distribution has contained Pelican by Birk Huber as part of the suite for
solving polynomial systems.  Use of this was actually disabled in 2000 (commit 1cee1c5), and neither reinstated or removed.

Pelican is not 64-bit compatible and would take a huge effort to make it so.  Meanwhile the Gambit-native implementation
for solving polynomial systems appears completely viable,
so retaining Pelican is no longer necessary.
  • Loading branch information
tturocy committed Feb 7, 2024
1 parent 6681860 commit 8adeab0
Show file tree
Hide file tree
Showing 39 changed files with 4 additions and 29,920 deletions.
6 changes: 0 additions & 6 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ Other sources of code in this distribution:
Gambit incorporates portions of other software packages in this distribution.
These are acknowledged individually below.

Pelican:
--------
The code in sources/pelican is the Pelican system,
copyright (C) 1995 by Birk Huber, modified only to work within the
Gambit build system.

Integer/Rational classes:
-------------------------
The files integer.(cc,h), rational.(cc,h), and gnulib.(cc,h) in
Expand Down
46 changes: 2 additions & 44 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -377,13 +377,8 @@ endif

bin_PROGRAMS = \
gambit-convert \
gambit-enummixed

if WITH_ENUMPOLY
bin_PROGRAMS += gambit-enumpoly
endif

bin_PROGRAMS += \
gambit-enummixed \
gambit-enumpoly \
gambit-enumpure \
gambit-gnm \
gambit-ipa \
Expand Down Expand Up @@ -419,43 +414,8 @@ gambit_enummixed_SOURCES = \
src/solvers/enummixed/enummixed.h \
src/tools/enummixed/enummixed.cc


# For enumpoly, sources starting in 'pel' are from Pelican;
# sources from gpartltr to quiksolv were formerly in convenience lib libpoly.
gambit_enumpoly_SOURCES = \
${core_SOURCES} ${game_SOURCES} \
src/solvers/enumpoly/pelican/pelclhpk.cc \
src/solvers/enumpoly/pelican/pelclhpk.h \
src/solvers/enumpoly/pelican/pelclqhl.cc \
src/solvers/enumpoly/pelican/pelclqhl.h \
src/solvers/enumpoly/pelican/pelclyal.cc \
src/solvers/enumpoly/pelican/pelclyal.h \
src/solvers/enumpoly/pelican/pelconv.cc \
src/solvers/enumpoly/pelican/pelconv.h \
src/solvers/enumpoly/pelican/peleval.cc \
src/solvers/enumpoly/pelican/peleval.h \
src/solvers/enumpoly/pelican/pelgennd.cc \
src/solvers/enumpoly/pelican/pelgennd.h \
src/solvers/enumpoly/pelican/pelgmatr.cc \
src/solvers/enumpoly/pelican/pelgmatr.h \
src/solvers/enumpoly/pelican/pelgntyp.h \
src/solvers/enumpoly/pelican/pelhomot.cc \
src/solvers/enumpoly/pelican/pelhomot.h \
src/solvers/enumpoly/pelican/pelpred.cc \
src/solvers/enumpoly/pelican/pelpred.h \
src/solvers/enumpoly/pelican/pelprgen.cc \
src/solvers/enumpoly/pelican/pelprgen.h \
src/solvers/enumpoly/pelican/pelproc.cc \
src/solvers/enumpoly/pelican/pelproc.h \
src/solvers/enumpoly/pelican/pelpscon.h \
src/solvers/enumpoly/pelican/pelpsys.cc \
src/solvers/enumpoly/pelican/pelpsys.h \
src/solvers/enumpoly/pelican/pelqhull.cc \
src/solvers/enumpoly/pelican/pelqhull.h \
src/solvers/enumpoly/pelican/pelsymbl.cc \
src/solvers/enumpoly/pelican/pelsymbl.h \
src/solvers/enumpoly/pelican/pelutils.cc \
src/solvers/enumpoly/pelican/pelutils.h \
src/solvers/enumpoly/gpartltr.cc \
src/solvers/enumpoly/gpartltr.h \
src/solvers/enumpoly/gpartltr.imp \
Expand All @@ -478,8 +438,6 @@ gambit_enumpoly_SOURCES = \
src/solvers/enumpoly/monomial.cc \
src/solvers/enumpoly/monomial.h \
src/solvers/enumpoly/monomial.imp \
src/solvers/enumpoly/pelclass.cc \
src/solvers/enumpoly/pelclass.h \
src/solvers/enumpoly/poly.cc \
src/solvers/enumpoly/poly.h \
src/solvers/enumpoly/poly.imp \
Expand Down
11 changes: 0 additions & 11 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@ AC_ARG_ENABLE(gui,
esac], [with_gui=true])
AM_CONDITIONAL(WITH_GUI, test x$with_gui = xtrue)

dnl Disable building enumpoly by default -- considered experimental
AC_ARG_ENABLE(enumpoly,
[ --enable-enumpoly build gambit-enumpoly (experimental!) ],
[ case "${enableval}" in
yes) with_enumpoly=true ;;
no) with_enumpoly=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-enumpoly) ;;
esac], [with_enumpoly=false])
AM_CONDITIONAL(WITH_ENUMPOLY, test x$with_enumpoly = xtrue)

AC_DEFUN([MINGW_AC_WIN32_NATIVE_HOST],
[AC_CACHE_CHECK([whether we are building for a Win32 host],
[mingw_cv_win32_host],
Expand Down Expand Up @@ -152,7 +142,6 @@ fi
AC_SUBST(WX_LIBS)
AC_SUBST(WX_LIBS_STATIC)
AC_SUBST(WX_CXXFLAGS)
AC_SUBST(ENUMPOLY_PROGS)


REZFLAGS=`echo $CXXFLAGS $WX_CXXFLAGS | sed 's/-mthreads//g' | sed 's/-g//g' | sed 's/-O. / /g' | sed 's/-I/--include-dir /g'`
Expand Down
Loading

0 comments on commit 8adeab0

Please sign in to comment.