dimitri/GardenOptim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add constraints for fixed plants in garden

Browse source
This commit is contained in:
Dimitri Lozeve 2020-02-23 22:20:10 +01:00
parent fc1d2eb792
commit 43b7526497
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/optim.jl
View file

@ -30,7 +30,7 @@ function neighbourmatrix(mask::Matrix)::Matrix{Bool}
d
end
function definemodel(plantcounts::Vector, mask::Matrix, costs::Matrix)
function definemodel(plantcounts::Vector, garden::Matrix, mask::Matrix, costs::Matrix)
N = length(mask)
Q = size(costs, 1)
@ -57,6 +57,9 @@ function definemodel(plantcounts::Vector, mask::Matrix, costs::Matrix)
@constraint(model, x[i, q] == 0)
end
end
if garden[i] != 0
@constraint(model, x[i, garden[i]] == 1)
end
end
for q = 1:Q