Skip to content

Commit

Permalink
Revert "CSV allowmissing as optional"
Browse files Browse the repository at this point in the history
  • Loading branch information
YoungFaithful authored Jun 25, 2019
1 parent 351b418 commit fd6c87b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/utils/load_data.jl
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ load the `techs.csv` in the folder `data_path` with the following columns:
returns `techs::OptVariable` techs[tech] - OptDataCEPTech
"""
function load_cep_data_techs(data_path::String)
tab=CSV.read(joinpath(data_path,"techs.csv");allowmissing=:none)
tab=CSV.read(joinpath(data_path,"techs.csv"),allowmissing=:none)
#Check existance of necessary column
:tech in names(tab) || throw(@error "No column called `tech` in `techs.csv`")
#Build empty OptVariable
Expand Down Expand Up @@ -88,7 +88,7 @@ returns `nodes::OptVariable` nodes[tech, node] - OptDataCEPNode
"""
function load_cep_data_nodes(data_path::String,
techs::OptVariable)
tab=CSV.read(joinpath(data_path,"nodes.csv");allowmissing=:none)
tab=CSV.read(joinpath(data_path,"nodes.csv"),allowmissing=:none)
# Check exisistance of columns
check_column(tab,[:node, :infrastruct])
#Create empty OptVariable
Expand Down Expand Up @@ -131,7 +131,7 @@ returns `lines::OptVarible` lines[tech, line] - OptDataCEPLine
function load_cep_data_lines(data_path::String,
techs::OptVariable)
if isfile(joinpath(data_path,"lines.csv"))
tab=CSV.read(joinpath(data_path,"lines.csv");allowmissing=:none)
tab=CSV.read(joinpath(data_path,"lines.csv"),allowmissing=:none)
#Check existance of necessary column
check_column(tab, [:line])

Expand Down Expand Up @@ -211,7 +211,7 @@ returns `costs::OptVariable` costs[tech,node,year,account,impact] - Number
function load_cep_data_costs(data_path::String,
techs::OptVariable,
nodes::OptVariable)
tab=CSV.read(joinpath(data_path,"costs.csv");allowmissing=:none)
tab=CSV.read(joinpath(data_path,"costs.csv"),allowmissing=:none)
check_column(tab,[:tech, :location, :year, :account])
impacts=String.(names(tab)[findfirst(names(tab).==Symbol("|"))+1:end])
#Create empty OptVariable
Expand Down

0 comments on commit fd6c87b

Please sign in to comment.