ANL-CEEESA/RELOG
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/RELOG.git synced 2025-12-06 07:48:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add disposal cost to product report

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-10-15 09:39:35 -05:00
parent a03b9169fd
commit 57b7d09c08
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -5,7 +5,7 @@ VERSION := 0.5
all: docs test all: docs test
build/sysimage.so: src/sysimage.jl Project.toml Manifest.toml build/sysimage.so: src/sysimage.jl Project.toml Manifest.toml
@$(JULIA) src/sysimage.jl @$(JULIA) src/sysimage.jl test/runtests.jl
clean: clean:
rm -rf build/* rm -rf build/*

2
src/model/getsol.jl
View File

@@ -46,6 +46,8 @@ function get_solution(model::JuMP.Model; marginal_costs = true)
"Amount (tonne)" => n.location.amount, "Amount (tonne)" => n.location.amount,
"Dispose (tonne)" => "Dispose (tonne)" =>
[JuMP.value(model[:collection_dispose][n, t]) for t = 1:T], [JuMP.value(model[:collection_dispose][n, t]) for t = 1:T],
"Disposal cost (\$)" =>
[JuMP.value(model[:collection_dispose][n, t]) * n.location.product.disposal_cost[t] for t = 1:T]
) )
if marginal_costs if marginal_costs
location_dict["Marginal cost (\$/tonne)"] = [ location_dict["Marginal cost (\$/tonne)"] = [

10
src/reports/products.jl
View File

@@ -5,7 +5,7 @@
using DataFrames using DataFrames
using CSV using CSV
function products_report(solution; marginal_costs = true)::DataFrame function products_report(solution)::DataFrame
df = DataFrame() df = DataFrame()
df."product name" = String[] df."product name" = String[]
df."location name" = String[] df."location name" = String[]
@@ -13,17 +13,22 @@ function products_report(solution; marginal_costs = true)::DataFrame
df."longitude (deg)" = Float64[] df."longitude (deg)" = Float64[]
df."year" = Int[] df."year" = Int[]
df."amount (tonne)" = Float64[] df."amount (tonne)" = Float64[]
df."amount disposed (tonne)" = Float64[]
df."marginal cost (\$/tonne)" = Float64[] df."marginal cost (\$/tonne)" = Float64[]
df."amount disposed (tonne)" = Float64[]
df."disposal cost (\$)" = Float64[]
T = length(solution["Energy"]["Plants (GJ)"]) T = length(solution["Energy"]["Plants (GJ)"])
for (prod_name, prod_dict) in solution["Products"] for (prod_name, prod_dict) in solution["Products"]
for (location_name, location_dict) in prod_dict for (location_name, location_dict) in prod_dict
for year = 1:T for year = 1:T
marginal_cost = NaN
if "Marginal cost (\$/tonne)" in keys(location_dict)
marginal_cost = location_dict["Marginal cost (\$/tonne)"][year] marginal_cost = location_dict["Marginal cost (\$/tonne)"][year]
end
latitude = round(location_dict["Latitude (deg)"], digits = 6) latitude = round(location_dict["Latitude (deg)"], digits = 6)
longitude = round(location_dict["Longitude (deg)"], digits = 6) longitude = round(location_dict["Longitude (deg)"], digits = 6)
amount = location_dict["Amount (tonne)"][year] amount = location_dict["Amount (tonne)"][year]
amount_disposed = location_dict["Dispose (tonne)"][year] amount_disposed = location_dict["Dispose (tonne)"][year]
disposal_cost = location_dict["Disposal cost (\$)"][year]
push!( push!(
df, df,
[ [
@@ -35,6 +40,7 @@ function products_report(solution; marginal_costs = true)::DataFrame
amount, amount,
marginal_cost, marginal_cost,
amount_disposed, amount_disposed,
disposal_cost,
], ],
) )
end end