Merge pull request #44 from SCIP-Interfaces/rs/scip400

update to new CSIP (and SCIP 4.0.0)

Author: rschwarz

.travis.yml

@@ -2,7 +2,6 @@
 language: julia
 os:
   - linux
-  - osx
 julia:
   - 0.5
 notifications:
@@ -12,13 +11,10 @@ dist: trusty
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
   - julia -e 'Pkg.clone(pwd())'
-  - wget http://scip.zib.de/download/release/scipoptsuite-3.2.1.tgz
-  - tar xzf scipoptsuite-3.2.1.tgz
-  - cd scipoptsuite-3.2.1/
-  - rm Makefile.doit
-  - wget http://scip.zib.de/download/bugfixes/scip-3.2.1/Makefile.doit
+  - wget http://scip.zib.de/download/release/scipoptsuite-4.0.0.tgz
+  - tar xzf scipoptsuite-4.0.0.tgz
+  - cd scipoptsuite-4.0.0/
   - make SHARED=true GMP=false READLINE=false ZLIB=false scipoptlib
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then g++ -install_name @rpath/libscipopt.dylib -dynamiclib -undefined suppress -flat_namespace -m64 -shared -o lib/libscipopt.dylib obj/*.o scip-*/obj/*/lib/objscip/*.o soplex-*/obj/*/lib/*o          ; fi
   - export SCIPOPTDIR=`pwd`
   - cd ..
   - julia -e 'Pkg.build("SCIP"); Pkg.test("SCIP"; coverage=true)'

README.md

@@ -20,32 +20,29 @@ Julia interface to [SCIP](http://scip.zib.de) solver.
 
 ## Installation
 
-Follow the steps below to get SCIP.jl working. These instructions are **only tested on GNU/Linux** systems. With minor adjustments, it might also work on OS X.
+Follow the steps below to get SCIP.jl working.
 
-1.The SCIP.jl package requires [SCIP](http://scip.zib.de/) to be installed. [Download](http://scip.zib.de/download.php?fname=scipoptsuite-3.2.1.tgz) the SCIP Optimization Suite, untar it.
+1.The SCIP.jl package requires [SCIP](http://scip.zib.de/) to be installed in the newest version (4.0.0).
+[Download](http://scip.zib.de/download.php?fname=scipoptsuite-4.0.0.tgz) the SCIP Optimization Suite, untar it.
 ```
-wget http://scip.zib.de/download/release/scipoptsuite-3.2.1.tgz
-tar xzf scipoptsuite-3.2.1.tgz
+wget http://scip.zib.de/download/release/scipoptsuite-4.0.0.tgz
+tar xzf scipoptsuite-4.0.0.tgz
 ```
-2.Replace the existing `Makefile.doit` with the [patched file](http://scip.zib.de/download/bugfixes/scip-3.2.1/Makefile.doit)
-```
-cd scipoptsuite-3.2.1/
-rm Makefile.doit
-wget http://scip.zib.de/download/bugfixes/scip-3.2.1/Makefile.doit
-```
-3.Build the shared library with
+2.Build the shared library with
 ```
 make SHARED=true GMP=false READLINE=false ZLIB=false scipoptlib
 ```
-**An additional step for macOS users:** 
+**An additional step for OS X users:**
 ```
 g++ -install_name @rpath/libscipopt.dylib -dynamiclib -undefined suppress -flat_namespace -m64 -shared -o lib/libscipopt.dylib obj/*.o scip-*/obj/*/lib/objscip/*.o soplex-*/obj/*/lib/*o
 ```
-4.Set the **environment variable `SCIPOPTDIR`** to point to the directory that contains the `scipoptsuite` sources. CSIP needs the library in `${SCIPOPTDIR}/lib/scipoptlib.so` and the C header files in `${SCIPOPTDIR}/scip-*/src/`.
+Note that support for OS X is currently broken with the update to SCIP 4.0.0.
+
+3.Set the **environment variable `SCIPOPTDIR`** to point to the directory that contains the `scipoptsuite` sources. CSIP needs the library in `${SCIPOPTDIR}/lib/scipoptlib.so` and the C header files in `${SCIPOPTDIR}/scip-*/src/`.
 ```
 export SCIPOPTDIR=`pwd`
 ```
-5.This package is registered in `METADATA.jl` and can be installed in Julia with
+4.This package is registered in `METADATA.jl` and can be installed in Julia with
 ```
 Pkg.add("SCIP")
 ```

deps/csip_version.jl

@@ -1,5 +1,5 @@
 # required version and utilities in a single location
-CSIP_VERSION = "0.3.6"
+CSIP_VERSION = "0.4.0"
 
 function vn2int(vn::VersionNumber)
     100*vn.major + 10*vn.minor + vn.patch

test/runtests.jl

@@ -10,7 +10,7 @@ include(joinpath(Pkg.dir("JuMP"),"test","solvers.jl"))
 using JuMP
 using OffsetArrays # for JuMP/test/model.jl
 solver = SCIPSolver()
-MathProgBase.setparameters!(solver, Silent=true, TimeLimit=100.0)
+MathProgBase.setparameters!(solver, Silent=true, TimeLimit=300.0)
 heursolver = SCIPSolver("display/verblevel", 0,
                         "presolving/maxrounds", 0,
                         "separating/maxrounds", 0,