Compute mean realized flows #1514
Conversation
|
Last to do: Add test for mean realized user demand |
SouthEndMusic
changed the title
SouthEndMusic
requested review from
verseve,
JoostBuitink and
visr
and removed request for
verseve and
JoostBuitink
core/src/read.jl
Outdated
| mean_realized_flows = Dict{Tuple{NodeID, NodeID}, Base.RefValue{Float64}}() | ||
|
|
||
| # Find edges that realize a demand | ||
| for edge_metadata in values(graph.edge_data) | ||
| (; type, edge) = edge_metadata | ||
|
|
||
| src_id, dst_id = edge | ||
| user_demand_inflow = (type == EdgeType.flow) && (dst_id.type == NodeType.UserDemand) | ||
| level_demand_inflow = | ||
| (type == EdgeType.control) && (src_id.type == NodeType.LevelDemand) | ||
| flow_demand_inflow = | ||
| (type == EdgeType.flow) && has_external_demand(graph, dst_id, :flow_demand)[1] | ||
|
|
||
| if user_demand_inflow || flow_demand_inflow | ||
| mean_realized_flows[edge] = Ref(0.0) | ||
| elseif level_demand_inflow | ||
| mean_realized_flows[(dst_id, dst_id)] = Ref(0.0) | ||
| end |
There was a problem hiding this comment.
Can you explain why you went for Ref here instead of a Float? Is it for the ergonomics of being able to do
value = dict[key]
value[] += x
value[] /= dtvalue = dict[key]
value += x
value /= dt
dict[key] = valuei.e. having to put it back in? I worry a bit about the performance of this approach.
There was a problem hiding this comment.
I got rid of the use of RefValue{Float64}, but now there are more dictionary lookups, e.g.
Lines 487 to 500 in 8e337aa
Is there a way to circumvent this?
There was a problem hiding this comment.
Dict lookups are quite fast, so I doubt it's a serious issue. I haven't looked into it, but perhaps the compiler can figure out it can optimize this with a single lookup. Also I just tried this, and surprisingly it works. Could be of course that there are still two lookups behind this syntax:
julia> dict = Dict{Int, Int}(1 => 1)
Dict{Int64, Int64} with 1 entry:
1 => 1
julia> dict[1] += 1
2
julia> dict
Dict{Int64, Int64} with 1 entry:
1 => 2
Fixes #1356.