diff --git a/README.md b/README.md index cdee75d..4d1f1d4 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ * Install [Temurin JDK17](https://adoptium.net/) or newer. * Install [GIPS](https://gips.dev) as described [here](https://github.com/Echtzeitsysteme/gips#installation-development) or use the [pre-built Eclipse](https://github.com/Echtzeitsysteme/gips-eclipse-build). -* Install [Gurobi](https://www.gurobi.com/) in version `11.0.0` and activate a license for your computer. +* Install [Gurobi](https://www.gurobi.com/) in version `11.0.1` and activate a license for your computer. * Currently, Gurobi is the default ILP solver used in **iflye**. * Install [IBM ILOG CPLEX](https://www.ibm.com/products/ilog-cplex-optimization-studio) in version `22.1.1`. * CPLEX is an alternative ILP solver in **iflye**. You do not need it explicitely, but if you did not install and configure it properly, at least one test case will fail. @@ -16,9 +16,9 @@ * Additionally, the runtime workspace needs some environment variables to access the Gurobi and the CPLEX solver. Do not forget to adapt them to your individual setup: ``` GRB_LICENSE_FILE=/home/mkratz/gurobi.lic -GUROBI_HOME=/opt/gurobi1100/linux64/ -LD_LIBRARY_PATH=/opt/gurobi1100/linux64/lib/ -PATH=/opt/gurobi1100/linux64/bin/:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/:$PATH +GUROBI_HOME=/opt/gurobi1101/linux64/ +LD_LIBRARY_PATH=/opt/gurobi1101/linux64/lib/ +PATH=/opt/gurobi1101/linux64/bin/:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/:$PATH ``` ### Project setup (manual) diff --git a/ilp/.classpath b/ilp/.classpath index f6b7f2d..1bcb0c5 100644 --- a/ilp/.classpath +++ b/ilp/.classpath @@ -1,8 +1,8 @@ - - + + diff --git a/ilp/META-INF/MANIFEST.MF b/ilp/META-INF/MANIFEST.MF index 6a6f272..c08d4b5 100644 --- a/ilp/META-INF/MANIFEST.MF +++ b/ilp/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: ilp Bundle-Version: 0.0.3.qualifier Bundle-ClassPath: ilp.jar, lib/cplex/cplex-22.1.1.jar, - lib/gurobi/gurobi-11.0.0.jar, - lib/gurobi/gurobi-javadoc-11.0.0.jar + lib/gurobi/gurobi-11.0.1.jar, + lib/gurobi/gurobi-javadoc-11.0.1.jar Automatic-Module-Name: ilp Bundle-RequiredExecutionEnvironment: JavaSE-16 -Export-Package: com.gurobi.gurobi;version="11.0.0", +Export-Package: com.gurobi.gurobi;version="11.0.1", ilog.concert, ilog.cplex, ilp.solver.examples, diff --git a/ilp/build.properties b/ilp/build.properties index 6db7014..49e15f6 100644 --- a/ilp/build.properties +++ b/ilp/build.properties @@ -2,5 +2,5 @@ source.ilp.jar = src/ bin.includes = META-INF/,\ ilp.jar,\ lib/cplex/cplex-22.1.1.jar,\ - lib/gurobi/gurobi-11.0.0.jar,\ - lib/gurobi/gurobi-javadoc-11.0.0.jar + lib/gurobi/gurobi-11.0.1.jar,\ + lib/gurobi/gurobi-javadoc-11.0.1.jar diff --git a/ilp/lib/gurobi/gurobi-11.0.0.jar b/ilp/lib/gurobi/gurobi-11.0.1.jar similarity index 89% rename from ilp/lib/gurobi/gurobi-11.0.0.jar rename to ilp/lib/gurobi/gurobi-11.0.1.jar index a0f8aa8..0cd7874 100644 Binary files a/ilp/lib/gurobi/gurobi-11.0.0.jar and b/ilp/lib/gurobi/gurobi-11.0.1.jar differ diff --git a/ilp/lib/gurobi/gurobi-javadoc-11.0.0.jar b/ilp/lib/gurobi/gurobi-javadoc-11.0.0.jar deleted file mode 100644 index 78265c3..0000000 Binary files a/ilp/lib/gurobi/gurobi-javadoc-11.0.0.jar and /dev/null differ diff --git a/ilp/lib/gurobi/gurobi-javadoc-11.0.1.jar b/ilp/lib/gurobi/gurobi-javadoc-11.0.1.jar new file mode 100644 index 0000000..bc1bf48 Binary files /dev/null and b/ilp/lib/gurobi/gurobi-javadoc-11.0.1.jar differ diff --git a/scripts/env.sh b/scripts/env.sh index 56e65fb..fc3719d 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -1,8 +1,8 @@ # Environment variables/config for the program export GRB_LICENSE_FILE="/home/mkratz/gurobi.lic" -export GUROBI_HOME="/opt/gurobi1100/linux64/" -export LD_LIBRARY_PATH="/opt/gurobi1100/linux64/lib/" -PATH=$PATH:~/opt/gurobi1100/linux64/bin/:~/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/ +export GUROBI_HOME="/opt/gurobi1101/linux64/" +export LD_LIBRARY_PATH="/opt/gurobi1101/linux64/lib/" +PATH=$PATH:~/opt/gurobi1101/linux64/bin/:~/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/ # Legacy ENVs used by Cardygan-ILP #export GUROBI_JAR_PATH="/opt/gurobi811/linux64/lib/gurobi.jar"