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

Avoid loading plants names two times

Browse source
This commit is contained in:
Dimitri Lozeve 2020-02-22 20:29:15 +01:00
parent 3a2ba93595
commit d0309486a4
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/loaddata.jl
View file

@ -7,7 +7,7 @@ using JSON
function loadplants()::DataFrame function loadplants()::DataFrame
plants = CSV.read("data/plants.csv") plants = CSV.read("data/plants.csv")
@info "loaded $(size(plants, 1)) plants" @info "Loaded $(size(plants, 1)) plants"
plants.name = Symbol.(plants.name) plants.name = Symbol.(plants.name)
plants plants
end end
@ -20,7 +20,7 @@ function loadgarden(plants::Vector{Symbol})::Tuple{Matrix{Int}, Matrix{Bool}}
garden = indexin(convert(Matrix, garden), String.(plants)) garden = indexin(convert(Matrix, garden), String.(plants))
garden = replace(garden, nothing=>0) garden = replace(garden, nothing=>0)
@assert size(garden) == size(mask) @assert size(garden) == size(mask)
@info "loaded garden of size $(size(garden))" @info "Loaded garden of size $(size(garden))"
garden, mask garden, mask
end end
@ -38,7 +38,7 @@ function loadaffinitiesdf()::DataFrame
rename!(df, colnames) rename!(df, colnames)
df.name = colnames[2:end] df.name = colnames[2:end]
# df = coalesce.(df, 0.0) # df = coalesce.(df, 0.0)
@info "loaded affinity matrix for $(size(df, 1)) plants" @info "Loaded affinity matrix for $(size(df, 1)) plants"
df df
end end
@ -77,9 +77,10 @@ function costsmatrix(plants::Vector{Symbol}, affinities_df::DataFrame, classific
[computecost(plant1, plant2, affinities_df, classification) for plant1 in plants, plant2 in plants] [computecost(plant1, plant2, affinities_df, classification) for plant1 in plants, plant2 in plants]
end end
function loadcosts() function loadcosts(plants::Vector{Symbol})
plants = loadplants()
clf = loadclassification() clf = loadclassification()
affinities_df = loadaffinitiesdf() affinities_df = loadaffinitiesdf()
costs = costsmatrix(plants.name, affinities_df, clf) costs = costsmatrix(plants, affinities_df, clf)
@info "Computed costs matrix for $(size(costs, 1)) plants"
costs
end end