Merge 8776f30 into 8319f09

.travis.yml

@@ -13,6 +13,8 @@ addons:
         - gfortran
 script:
     - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+    - julia -e 'Pkg.clone("https://github.com/JuliaOpt/MathOptInterface.jl.git")'
+    - julia -e 'Pkg.clone("https://github.com/JuliaOpt/MathOptInterfaceBridges.jl.git")'
     - julia -e 'Pkg.clone(pwd()); Pkg.build("Ipopt")'
     - julia -e 'Pkg.test("Ipopt", coverage=true)'
 after_success:

deps/.gitignore

@@ -0,0 +1,4 @@
+downloads
+src
+usr
+deps.jl

src/Ipopt.jl

@@ -58,9 +58,9 @@ mutable struct IpoptProblem
         ref::Ptr{Void}, n, m,
         eval_f, eval_g, eval_grad_f, eval_jac_g, eval_h)
         prob = new(ref, n, m, zeros(Float64, n), zeros(Float64, m), zeros(Float64,m),
-        zeros(Float64,n), zeros(Float64,n), 0.0, 0,
-        eval_f, eval_g, eval_grad_f, eval_jac_g, eval_h, nothing,
-        :Min)
+                   zeros(Float64,n), zeros(Float64,n), 0.0, 0,
+                   eval_f, eval_g, eval_grad_f, eval_jac_g, eval_h, nothing,
+                   :Min)
         # Free the internal IpoptProblem structure when
         # the Julia IpoptProblem instance goes out of scope
         finalizer(prob, freeProblem)
@@ -324,6 +324,7 @@ function solveProblem(prob::IpoptProblem)
     return Int(ret)
 end
 
-include("IpoptSolverInterface.jl")
+include("mathprogbase_wrapper.jl")
+include("mathoptinterface_wrapper.jl")
 
 end # module