Skip to content

Commit

Permalink
MAINT: Remove pydstool.
Browse files Browse the repository at this point in the history
  • Loading branch information
WarrenWeckesser committed Nov 6, 2024
1 parent d36a371 commit d80075f
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 266 deletions.
10 changes: 5 additions & 5 deletions dev-notes/cross-compile-on-linux-for-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ The executable `vfgen.exe` is in the `src/` subdirectory:

```
$ wine ./src/vfgen.exe help
VFGEN (Version:2.6.0.dev3)
VFGEN (Version:2.6.0.dev6)
Use: vfgen command vector-field-file.vf
or: vfgen command:option=value,...,option=value vector-field-file.vf
or: vfgen help command
where command is one of:
adolc, auto, boostodeint, check, dde23, dde_solver, ddebiftool,
delay2ode, dstool, evf, gsl, help, javamath, javascript, latex,
lsoda, matcont, matlab, octave, pddecont, pydstool, pygsl, r,
radau5, scilab, scipy, taylor, xml, xpp
adolc, auto, boostodeint, check, cvode7, dde23, dde_solver, ddebiftool,
delay2ode, evf, gsl, help, javamath, javascript, julia, latex,
lsoda, matcont, matlab, octave, pygsl, r, radau5, scilab,
scipy, taylor, xml, xpp
```
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
#
# For convenience, define the list of C++ files in a macro.
#
set(VFGEN_CPP_SRC_FILES codegen_utils.cpp ginac_aux_functions.cpp strutils.cpp MyVec.cpp vf_adolc.cpp vf_auto.cpp vf_boostodeint.cpp vf.cpp vf_cvode7.cpp vf_dde23.cpp vf_ddebiftool.cpp vf_dde_solver.cpp vf_delay2ode.cpp vf_differentials.cpp vf_evf.cpp vfgen.cpp vf_gsl.cpp vf_javamath.cpp vf_javascript.cpp vf_julia.cpp vf_latex.cpp vf_lsoda.cpp vf_matcont.cpp vf_matlab.cpp vf_octave.cpp vf_pydstool.cpp vf_pygsl.cpp vf_r.cpp vf_radau5.cpp vf_scilab.cpp vf_scipy.cpp vf_taylor.cpp vf_xml.cpp vf_xpp.cpp)
set(VFGEN_CPP_SRC_FILES codegen_utils.cpp ginac_aux_functions.cpp strutils.cpp MyVec.cpp vf_adolc.cpp vf_auto.cpp vf_boostodeint.cpp vf.cpp vf_cvode7.cpp vf_dde23.cpp vf_ddebiftool.cpp vf_dde_solver.cpp vf_delay2ode.cpp vf_differentials.cpp vf_evf.cpp vfgen.cpp vf_gsl.cpp vf_javamath.cpp vf_javascript.cpp vf_julia.cpp vf_latex.cpp vf_lsoda.cpp vf_matcont.cpp vf_matlab.cpp vf_octave.cpp vf_pygsl.cpp vf_r.cpp vf_radau5.cpp vf_scilab.cpp vf_scipy.cpp vf_taylor.cpp vf_xml.cpp vf_xpp.cpp)

add_executable(vfgen ${VFGEN_CPP_SRC_FILES})

Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ vfgen_SOURCES = vfgen.cpp vf.cpp vf_adolc.cpp vf_auto.cpp vf_boostodeint.cpp \
vf_evf.cpp vf_gsl.cpp \
vf_javamath.cpp vf_javascript.cpp vf_julia.cpp \
vf_latex.cpp vf_lsoda.cpp vf_matcont.cpp vf_matlab.cpp \
vf_octave.cpp vf_pydstool.cpp vf_pygsl.cpp \
vf_octave.cpp vf_pygsl.cpp \
vf_r.cpp vf_radau5.cpp vf_scilab.cpp vf_scipy.cpp \
vf_taylor.cpp vf_xml.cpp vf_xpp.cpp ginac_aux_functions.cpp \
strutils.cpp codegen_utils.cpp MyVec.cpp vf.h vf_help_text.h \
Expand Down
3 changes: 1 addition & 2 deletions src/Makefile.vfgen
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ OBJ_FILES = vfgen.o vf.o MyVec.o vf_adolc.o vf_auto.o vf_boostodeint.o \
vf_cvode7.o vf_dde23.o vf_ddebiftool.o vf_dde_solver.o \
vf_delay2ode.o vf_differentials.o vf_evf.o vf_gsl.o \
vf_javamath.o vf_javascript.o vf_julia.o vf_latex.o vf_lsoda.o \
vf_matcont.o vf_matlab.o vf_octave.o \
vf_pydstool.o vf_pygsl.o \
vf_matcont.o vf_matlab.o vf_octave.o vf_pygsl.o \
vf_r.o vf_radau5.o vf_scilab.o vf_scipy.o vf_taylor.o vf_xml.o \
vf_xpp.o \
ginac_aux_functions.o strutils.o codegen_utils.o
Expand Down
12 changes: 0 additions & 12 deletions src/vf_help_text.h
Original file line number Diff line number Diff line change
Expand Up @@ -373,18 +373,6 @@ constexpr char help_octave[] =
" If the option func=yes is given, the file [name].m will define a\n"
" function for each user function given in the vector field file.\n";

constexpr char help_pydstool[] =
"use: vfgen pydstool vector_field_file.vf\n"
" vfgen pydstool:demo=yes vector_field_file.vf\n\n"
"This command creates a Python file that can be used to define a differential\n"
"equation for the software package PyDSTool. The file [name].py defines the\n"
"function args(), which creates an 'args' object for the vector field.\n\n"
"Options: (default is list first)\n"
"demo=no|yes\n"
" If the option demo=yes is given, the file [name]_dst.py is also created.\n"
" This file contains a script that uses the function defined in [name].py\n"
" to generate and plot a solution to the differential equation.\n";

constexpr char help_pygsl[] =
"use: vfgen pygsl vector_field_file.vf\n"
" vfgen pygsl:option=value,...,option=value vector_field_file.vf\n\n"
Expand Down
234 changes: 0 additions & 234 deletions src/vf_pydstool.cpp

This file was deleted.

11 changes: 0 additions & 11 deletions src/vfgen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,6 @@ map<string, command_info> commands = {
{"octave",
{{"demo", "func", "parstyle"},
help_octave}},
{"pydstool",
{{"demo"},
help_pydstool}},
{"pygsl",
{{"demo", "func"},
help_pygsl}},
Expand Down Expand Up @@ -488,14 +485,6 @@ int main(int argc, char **argv)
cerr << "Delay equations can not be handled by the " << commandstr << " command.\n";
}
}
else if (commandstr == "pydstool") {
if (vf.IsDelay == false) {
vf.PrintPyDSTool(options);
}
else {
cerr << "Delay equations can not be handled by the " << commandstr << " command.\n";
}
}
else if (commandstr == "taylor") {
if (vf.IsDelay == false) {
vf.PrintTaylor(options);
Expand Down

0 comments on commit d80075f

Please sign in to comment.