Skip to content

Commit

Permalink
more specific rowvector scalar objective VERSION cutoff
Browse files Browse the repository at this point in the history
  • Loading branch information
tkelman committed Feb 24, 2017
1 parent b8a321e commit 80ab5a4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/model.jl
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ end
@variable(mod, 0 <= x <= 1)
@variable(mod, 0 <= y <= 1)
obj = [5,1]'*[x,y]
if VERSION < v"0.6.0-dev"
if VERSION < v"0.6.0-dev.2074" # julia PR #19670
@objective(mod, Max, obj[1])
else
@objective(mod, Max, obj)
Expand Down Expand Up @@ -709,7 +709,7 @@ end
@variable(modV, y[1:7])
@constraint(modV, A*x + B*y .<= 1)
obj = (x'*2A')*(2A*x) + (B*2y)'*(B*(2y))
if VERSION < v"0.6.0-dev"
if VERSION < v"0.6.0-dev.2074" # julia PR #19670
@objective(modV, Max, obj[1])
else
@objective(modV, Max, obj)
Expand Down Expand Up @@ -741,7 +741,7 @@ end
@variable(mod, 0 <= z[1:p] <= 1)
end
obj = (y-X*β)'*(y-X*β)
if VERSION < v"0.6.0-dev"
if VERSION < v"0.6.0-dev.2074" # julia PR #19670
@objective(mod, Min, obj[1])
else
@objective(mod, Min, obj)
Expand Down

0 comments on commit 80ab5a4

Please sign in to comment.