diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d6e044a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +solveurGLPK/ \ No newline at end of file diff --git a/install_glpk.sh b/install_glpk.sh new file mode 100755 index 0000000..beb7526 --- /dev/null +++ b/install_glpk.sh @@ -0,0 +1,22 @@ +mkdir solveurGLPK +cd solveurGLPK +mkdir sources +cd sources + +wget ftp://ftp.gnu.org/gnu/glpk/glpk-5.0.tar.gz +tar -xzvf glpk-5.0.tar.gz +cd glpk-5.0 + +./configure --disable-shared +make +#make --jobs=4 +make check + +cd ../.. +mkdir executables +cp sources/glpk-5.0/examples/glpsol executables/. +cp sources/glpk-5.0/doc/glpk.pdf executables/. +cp sources/glpk-5.0/doc/gmpl.pdf executables/. + +cd executables +./glpsol --help diff --git a/notebook.ipynb b/notebook.ipynb index a19819c..a21fd59 100644 --- a/notebook.ipynb +++ b/notebook.ipynb @@ -110,11 +110,12 @@ "metadata": {}, "outputs": [], "source": [ - "# on teste de lire tous les fichiers .opb\n", + "# on convert tous les .opb et .lp\n", "for (root, dirs, files) in walkdir(\"data\")\n", " for file in files\n", " if endswith(file, \".opb\")\n", - " readKnapInstance(root * \"/\" * file)\n", + " price, weight, capacity = readKnapInstance(root * \"/\" * file)\n", + " \n", " end\n", " end\n", "end"