Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Master into dev #21

Merged
merged 9 commits into from
Aug 20, 2019
Merged

Master into dev #21

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1d0ccef
CSV allowmissing as optional
YoungFaithful Jun 25, 2019
351b418
Merge pull request #17 from YoungFaithful/CSV
YoungFaithful Jun 25, 2019
9d2981d
allowmissing -> strict
YoungFaithful Jun 25, 2019
fd6c87b
Revert "CSV allowmissing as optional"
YoungFaithful Jun 25, 2019
7a486ae
Update load_data.jl
YoungFaithful Jun 25, 2019
983d339
Merge pull request #19 from YoungFaithful/revert-17-CSV
YoungFaithful Jun 25, 2019
37ebf34
Merge branch 'master' into CSV
holgerteichgraeber Jun 26, 2019
f5a07d7
Bump version to v0.1.5
holgerteichgraeber Jun 26, 2019
d23ffab
Merge pull request #18 from YoungFaithful/CSV
holgerteichgraeber Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ keywords = ["energy", "capacity", "JuMP", "optimization"]
license = "MIT"
desc = "Capacity Expansion Problem Formulation for Julia"
author = ["Elias Kuepper <[email protected]>"]
version = "0.1.4"
version = "0.1.5"

[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Expand Down
8 changes: 4 additions & 4 deletions src/utils/load_data.jl
View file
Open in desktop
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");strict=true)
#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");strict=true)
# 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");strict=true)
#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");strict=true)
check_column(tab,[:tech, :location, :year, :account])
impacts=String.(names(tab)[findfirst(names(tab).==Symbol("|"))+1:end])
#Create empty OptVariable
Expand Down