diff --git a/README.md b/README.md index 3f66c8d..906d69c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Switching between solvers is done by changing one parameter in the solver config ## How to install the plug-in * Install at least one of the supported ILP solvers: - * 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. * Install [GLPK](https://www.gnu.org/software/glpk/) (free and open-source) in the newest version (`4.65`) and add it to your path. * Install [CPLEX](https://www.ibm.com/analytics/cplex-optimizer) in version `22.1.1` and activate a license for your computer (if necessary). @@ -19,7 +19,7 @@ Switching between solvers is done by changing one parameter in the solver config ## How to build the plugin * Install at least one of the supported ILP solvers: - * 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. * Install [GLPK](https://www.gnu.org/software/glpk/) (free and open-source) in the newest version (`4.65`) and add it to your path. * Install [CPLEX](https://www.ibm.com/analytics/cplex-optimizer) in version `22.1.1` and activate a license for your computer (if necessary). diff --git a/org.emoflon.ilp.dependencies/.classpath b/org.emoflon.ilp.dependencies/.classpath index 25915be..5be738a 100644 --- a/org.emoflon.ilp.dependencies/.classpath +++ b/org.emoflon.ilp.dependencies/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/org.emoflon.ilp.dependencies/META-INF/MANIFEST.MF b/org.emoflon.ilp.dependencies/META-INF/MANIFEST.MF index 9701eb7..fe0a94f 100644 --- a/org.emoflon.ilp.dependencies/META-INF/MANIFEST.MF +++ b/org.emoflon.ilp.dependencies/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-Version: 0.0.1 Bundle-ClassPath: cplex-22.1.1.jar, glpk-java-4.65.jar, glpk-java-javadoc-4.65.jar, - gurobi-11.0.0.jar, - gurobi-javadoc-11.0.0.jar -Export-Package: com.gurobi.gurobi;version="11.0.0", + gurobi-11.0.1.jar, + gurobi-javadoc-11.0.1.jar +Export-Package: com.gurobi.gurobi;version="11.0.1", ilog.concert;version="22.1.1", ilog.cplex;version="22.1.1", org.gnu.glpk;version="4.65.0" diff --git a/org.emoflon.ilp.dependencies/build.properties b/org.emoflon.ilp.dependencies/build.properties index 3814a2b..7efd148 100644 --- a/org.emoflon.ilp.dependencies/build.properties +++ b/org.emoflon.ilp.dependencies/build.properties @@ -2,5 +2,5 @@ bin.includes = META-INF/,\ glpk-java-4.65.jar,\ glpk-java-javadoc-4.65.jar,\ cplex-22.1.1.jar,\ - gurobi-11.0.0.jar,\ - gurobi-javadoc-11.0.0.jar + gurobi-11.0.1.jar,\ + gurobi-javadoc-11.0.1.jar diff --git a/org.emoflon.ilp.dependencies/gurobi-11.0.0.jar b/org.emoflon.ilp.dependencies/gurobi-11.0.1.jar similarity index 89% rename from org.emoflon.ilp.dependencies/gurobi-11.0.0.jar rename to org.emoflon.ilp.dependencies/gurobi-11.0.1.jar index a0f8aa8..0cd7874 100644 Binary files a/org.emoflon.ilp.dependencies/gurobi-11.0.0.jar and b/org.emoflon.ilp.dependencies/gurobi-11.0.1.jar differ diff --git a/org.emoflon.ilp.dependencies/gurobi-javadoc-11.0.0.jar b/org.emoflon.ilp.dependencies/gurobi-javadoc-11.0.0.jar deleted file mode 100644 index 78265c3..0000000 Binary files a/org.emoflon.ilp.dependencies/gurobi-javadoc-11.0.0.jar and /dev/null differ diff --git a/org.emoflon.ilp.dependencies/gurobi-javadoc-11.0.1.jar b/org.emoflon.ilp.dependencies/gurobi-javadoc-11.0.1.jar new file mode 100644 index 0000000..bc1bf48 Binary files /dev/null and b/org.emoflon.ilp.dependencies/gurobi-javadoc-11.0.1.jar differ diff --git a/pom.xml b/pom.xml index 577d307..1c87191 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 4.0.6 UTF-8 3.3.1 - /opt/gurobi1100/linux64/lib/:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/ + /opt/gurobi1101/linux64/lib/:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/ diff --git a/scripts/env.sh b/scripts/env.sh index bf70176..5277d75 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -1,4 +1,4 @@ -LD_LIBRARY_PATH=/opt/gurobi1100/linux64/lib/:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/ -GUROBI_HOME=/opt/gurobi1100/linux64/ +LD_LIBRARY_PATH=/opt/gurobi1101/linux64/lib/:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/ +GUROBI_HOME=/opt/gurobi1101/linux64/ GRB_LICENSE_FILE=/home/mkratz/gurobi.lic -PATH=$PATH:/opt/gurobi1100/linux64/bin:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/ +PATH=$PATH:/opt/gurobi1101/linux64/bin:/opt/ibm/ILOG/CPLEX_Studio2211/cplex/bin/x86-64_linux/