updating tests to julia v0.5 and JuMP v0.15

JuliaOpt · Mar 31, 2017 · 341266c · 341266c
1 parent 9f65a13
commit 341266c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,4 +1,4 @@
-julia 0.4
+julia 0.5
 Clp
 Cbc
 Ipopt

diff --git a/test/REQUIRE b/test/REQUIRE
@@ -1,3 +1,3 @@
-JuMP 0.13
+JuMP 0.15
 OffsetArrays 0.2.13
 FactCheck
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -27,10 +27,10 @@ nvar = 10
 solver=OsilSolver(solver = "couenne")
 m = Model(solver=solver)
 @variable(m, -10 <= x[i=1:nvar] <= 10)
-@NLobjective(m, Min, sum{1/(1+exp(-x[i])), i=1:nvar})
-@constraint(m, sum{x[i], i=1:nvar} <= .4*nvar)
+@NLobjective(m, Min, sum(1/(1+exp(-x[i])) for i in 1:nvar))
+@constraint(m, sum(x[i] for i in 1:nvar) <= .4*nvar)
 @test solve(m) == :Optimal
-@test isapprox(getvalue(x[1]),-10.0)
+@test isapprox(getvalue(x[1]), -10.0)
 
 
 include(Pkg.dir("JuMP","test","runtests.jl"))