From 45fd886033c15ad51ef728f2d35966e752e90238 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Thu, 31 Aug 2023 02:44:39 -0600 Subject: [PATCH 01/23] Created Stratification DSL. Required adding getter methods for lss, lssv, etc to StockFlow.jl, several methods to Syntax.jl (incl infer_links, which is now exported), and a Stratification.jl file. Also created a Stratification tests file and added more tests to Syntax. --- src/StockFlow.jl | 21 ++- src/Syntax.jl | 223 ++++++++++++++++++++++- src/syntax/Stratification.jl | 295 ++++++++++++++++++++++++++++++ test/Stratification.jl | 341 +++++++++++++++++++++++++++++++++++ test/Syntax.jl | 210 ++++++++++++++++++++- 5 files changed, 1087 insertions(+), 3 deletions(-) create mode 100755 src/syntax/Stratification.jl create mode 100755 test/Stratification.jl mode change 100644 => 100755 test/Syntax.jl diff --git a/src/StockFlow.jl b/src/StockFlow.jl index 3665ad51..b04e073a 100644 --- a/src/StockFlow.jl +++ b/src/StockFlow.jl @@ -9,7 +9,9 @@ funcDynam, flowVariableIndex, funcFlow, funcFlows, funcSV, funcSVs, TransitionMa vectorfield, funcFlowsRaw, funcFlowRaw, inflowsAll, outflowsAll,instock,outstock, stockssv, stocksv, svsv, svsstock, vsstock, vssv, svsstockAllF, vsstockAllF, vssvAllF, StockAndFlowUntyped, StockAndFlowFUntyped, StockAndFlowStructureUntyped, StockAndFlowStructureFUntyped, StockAndFlowUntyped0, Open, snames, fnames, svnames, vnames, object_shift_right, foot, leg, lsnames, OpenStockAndFlow, OpenStockAndFlowOb, fv, fvs, nlvv, nlpv, vtgt, vsrc, vpsrc, vptgt, pname, pnames, make_v_expr, -vop, lvvposition, lvtgtposition, lsvvposition, lpvvposition, recreate_stratified, set_snames!, set_fnames!, set_svnames!, set_vnames!, set_pnames!, set_sname!, set_fname!, set_svname!, set_vname!, set_pname! +vop, lvvposition, lvtgtposition, lsvvposition, lpvvposition, recreate_stratified, set_snames!, set_fnames!, set_svnames!, set_vnames!, set_pnames!, set_sname!, set_fname!, set_svname!, set_vname!, set_pname!, +get_lss, get_lssv, get_lsvsv, get_lsvv, get_lvs, get_lvv, get_is, get_ifn, get_os, get_ofn, get_lpvp, get_lpvv, get_lvsrc, get_lvtgt, get_links + using Catlab using Catlab.CategoricalAlgebra @@ -252,6 +254,23 @@ nlvv(p::AbstractStockAndFlowStructureF) = nparts(p,:LVV) #links from dynamic var nlpv(p::AbstractStockAndFlowStructureF) = nparts(p,:LPV) #links from dynamic variable to dynamic varibale np(p::AbstractStockAndFlowStructureF) = nparts(p,:P) #parameters + +get_lss(sf::StockAndFlowF) = collect(values(sf.subparts[:lss].m)) +get_lssv(sf::StockAndFlowF) = collect(values(sf.subparts[:lssv].m)) +get_lsvsv(sf::StockAndFlowF) = collect(values(sf.subparts[:lsvsv].m)) +get_lsvv(sf::StockAndFlowF) = collect(values(sf.subparts[:lsvv].m)) +get_lvs(sf::StockAndFlowF) = collect(values(sf.subparts[:lvs].m)) +get_lvv(sf::StockAndFlowF) = collect(values(sf.subparts[:lvv].m)) +get_is(sf::StockAndFlowF) = collect(values(sf.subparts[:is].m)) +get_ifn(sf::StockAndFlowF) = collect(values(sf.subparts[:ifn].m)) +get_os(sf::StockAndFlowF) = collect(values(sf.subparts[:os].m)) +get_ofn(sf::StockAndFlowF) = collect(values(sf.subparts[:ofn].m)) +get_lpvp(sf::StockAndFlowF) = collect(values(sf.subparts[:lpvp].m)) +get_lpvv(sf::StockAndFlowF) = collect(values(sf.subparts[:lpvv].m)) +get_lvsrc(sf::StockAndFlowF) = collect(values(sf.subparts[:lvsrc].m)) +get_lvtgt(sf::StockAndFlowF) = collect(values(sf.subparts[:lvtgt].m)) + + #EXAMPLE: #sir_StockAndFlow=StockAndFlow(((:S, 990)=>(:birth,(:inf,:deathS),(:v_inf,:v_deathS),:N), (:I, 10)=>(:inf,(:rec,:deathI),(:v_rec,:v_deathI,:v_fractionNonS),:N),(:R, 0)=>(:rec,:deathR,(:v_deathR,:v_fractionNonS),:N)), # (:birth=>:v_birth,:inf=>:v_inf,:rec=>:v_rec,:deathS=>:v_deathS,:deathI=>:v_deathI,:deathR=>:v_deathR), diff --git a/src/Syntax.jl b/src/Syntax.jl index ec5aa14f..be94482a 100644 --- a/src/Syntax.jl +++ b/src/Syntax.jl @@ -103,11 +103,13 @@ end ``` """ module Syntax -export @stock_and_flow, @foot, @feet +export @stock_and_flow, @foot, @feet, infer_links using ..StockFlow using MLStyle +import Base: ==, Iterators.flatmap + """ stock_and_flow(block :: Expr) @@ -1030,6 +1032,225 @@ function match_foot_format(footblock::Expr) end end +############################################# + +ISSUB_DEFAULT::String = "_" +USE_ISSUB::Bool = true +STRICT_MAPPINGS::Bool = false # whether you need to include all, or if you can infer those which only have one thing to map to. +STRICT_MATCHES::Bool = false # each value is only allowed to match one line in its section, vs matching the first. EG, if you had f_death as a stock: +# :stocks +# ~f_death => f_death <= fdeath +# _ => f_id <= fid +# +# would throw an error if true, wouldn't if false. + + +""" + infer_particular_link!(sfsrc, sftgt, f1, f2, map1, map2, destination_vector, posf=nothing) + +infer_particular_link!(sfsrc, sftgt, get_lvs, get_lvv, stockmaps, dyvarmaps, lvmaps, get_lvvposition) # LV + +If we're mapping the same value to multiple positions, it doesn't matter which one goes where. +We have a few options, on how we want to distribute mappings. Way it's done here, always goes to the last position. + +""" +function infer_particular_link!(sfsrc, sftgt, f1, f2, map1, map2, destination_vector) + + hom1′_mappings = f1(sftgt) + hom2′_mappings = f2(sftgt) + + tgt::Dict{Tuple{Int, Int}, Int} = Dict((hom1′, hom2′) => i for (i, (hom1′, hom2′)) in enumerate(zip(hom1′_mappings, hom2′_mappings))) # ISSUE: If there are two matches, second one overwrites the first. + # SOLUTION: Who cares. Just map to the last. + for (i, (hom1, hom2)) in enumerate(zip(f1(sfsrc), f2(sfsrc))) + mapped_index1 = map1[hom1] + mapped_index2 = map2[hom2] + + linkmap = tgt[(mapped_index1, mapped_index2)] + + + + destination_vector[i] = linkmap # updated + end + return destination_vector + +end + + +""" + infer_links(sfsrc :: StockAndFlowF, sftgt :: StockAndFlowF, NecMaps :: Dict{Symbol, Vector{Int64}}) + +Infer LS, I, O, LV, LSV, LVV, LPV mappings for an ACSetTransformation. +Returns dictionary of Symbols to lists of indices, corresponding to an ACSetTransformation argument. +If there exist no such mappings (eg, no LVV), that pairing will not be included in the returned dictionary. + +If A <- C -> B, and we have A -> A' and B -> B' and a unique C' such that A' <- C' -> B', we can assume C -> C'. + +:S => [2,4,1,3], :F => [1,2,4,3], ... + +NecMaps must contain keys S, F, SV, P, V, each pointing to a (possibly empty) array of indices +""" +function infer_links(sfsrc :: StockAndFlowF, sftgt :: StockAndFlowF, NecMaps :: Dict{Symbol, Vector{Int64}}) + + + stockmaps = NecMaps[:S] + flowmaps = NecMaps[:F] + summaps = NecMaps[:SV] + parammaps = NecMaps[:P] + dyvarmaps = NecMaps[:V] + + lsmaps = zeros(Int, nls(sfsrc)) + imaps = zeros(Int, ni(sfsrc)) + omaps = zeros(Int, no(sfsrc)) + lvmaps = zeros(Int, nlv(sfsrc)) + lsvmaps = zeros(Int, nlsv(sfsrc)) + lvvmaps = zeros(Int, nlvv(sfsrc)) + lpvmaps = zeros(Int, nlpv(sfsrc)) + # After the following calls, there should be no zeroes. + + + infer_particular_link!(sfsrc, sftgt, get_lss, get_lssv, stockmaps, summaps, lsmaps) # LS + infer_particular_link!(sfsrc, sftgt, get_ifn, get_is, flowmaps, stockmaps, imaps) # I + infer_particular_link!(sfsrc, sftgt, get_ofn, get_os, flowmaps, stockmaps, omaps) # O + infer_particular_link!(sfsrc, sftgt, get_lvs, get_lvv, stockmaps, dyvarmaps, lvmaps) # LV + infer_particular_link!(sfsrc, sftgt, get_lsvsv, get_lsvv, summaps, dyvarmaps, lsvmaps) # LSV + infer_particular_link!(sfsrc, sftgt, get_lvsrc, get_lvtgt, dyvarmaps, dyvarmaps, lvvmaps) # LVV + infer_particular_link!(sfsrc, sftgt, get_lpvp, get_lpvv, parammaps, dyvarmaps, lpvmaps) # LPV + + return Dict(:LS => lsmaps, :LSV => lsvmaps, :LV => lvmaps, :I => imaps, :O => omaps, :LPV => lpvmaps, :LVV => lvvmaps) + + +end + + +struct DSLArgument + key::Symbol + value::Symbol + flags::Set{Symbol} # At present, the only flag that exists is ~ + DSLArgument(kv::Pair{Union{Expr, Symbol}, Symbol}) = begin # this constructor seemed to fail... need to figure out why. Maybe it can't call other constructors. + key, flags = unwrap_expression(first(kv)) + new(key, second(kv), flags) + end + DSLArgument(k::Union{Expr, Symbol}, v::Symbol) = begin + key, flags = unwrap_expression(k) + new(key, v, flags) + end + DSLArgument(k::Symbol, v::Symbol, f::Set{Symbol}) = new(k, v, f) +end + +==(a::DSLArgument, b::DSLArgument) = a.key == b.key && a.value == b.value && a.flags == b.flags +function unwrap_expression(x::Union{Symbol, Expr}, flags::Set{Symbol}=Set{Symbol}())::Tuple{Symbol, Set{Symbol}} # No mutable default arguments. + if typeof(x) == Symbol + return (x, flags) + else + return unwrap_expression(x.args[2], push!(flags, x.args[1])) + end end + + +""" +S₁ => I₁ +S₂ => I₂ +S₁ => S₂ + +⊢ + +I₁ => I₂ + +Determine what index an element e maps to based upon what f we have in the mapping such that e -> f +""" +function connect_by_value(; src::Dict{T,U}, mapping::Dict{T,T}, tgt::Dict{T,U})::Dict{U, U} where {T, U} + @assert allunique(values(src)) + + @assert all(x -> x ∈ keys(mapping), keys(src)) + @assert all(x -> x ∈ keys(tgt), values(mapping)) + + return Dict(src[key] => tgt[value] for (key, value) in mapping) + +end + + +""" +Filter a vector for all elements with substr as a substring. +""" +function substring_matches(v::Vector, substr::String)::Vector + return filter(x -> occursin(substr, string(x)), v) +end + + +""" +Takes a symbol 'key', applys flags, finds matches in s, and returns a vector of matching keys. +Currently, there are two options: no flags, in which case [key] is returned, or ~ is the only flag, in which case +""" +function apply_flags(key::Symbol, flags::Set{Symbol}, s::Vector{Symbol})::Vector{Symbol} # Could make this a generator? + + if isempty(flags) + @assert (key ∈ s) "$s does not contain key $key ! Did you forget to prefix ~?" + return [key] # potentially inefficient + elseif :~ ∈ flags + + matches = collect(substring_matches(s, string(key))) + + new_flags = copy(flags) # copy isn't necessary, probably + pop!(new_flags, :~) + + return collect(flatmap(x -> apply_flags(x, new_flags, s), matches)) # this is just in case we add additional flags. As is, the recursion is unnecessary. + else + error("Unknown flag found! $(flags)") + end +end + +""" + substitute_symbols(s::Dict{Symbol, Int}, t::Dict{Symbol, Int}, m::Vector{DSLArgument} ; use_flags::Bool=true)::Dict{Int, Int} + +Convert Dict(SymA => IntA), Dict(SymB => IntB), Dict(SymA => SymB) into Dict{IntA => IntB} +Using original sf defintions, and the user defined mappings, transform user defined symbol mappings to index mappings. +""" +function substitute_symbols(s::Dict{Symbol, Int}, t::Dict{Symbol, Int}, m::Vector{DSLArgument} ; use_flags::Bool=true)::Dict{Int, Int} + if !use_flags + mapping = Dict(arg.key => arg.value for arg in m) + return connect_by_value(src=s, mapping=mapping, tgt=t) + else + master_dict::Dict{Int, Int} = Dict() + for statement in m + key_matches = apply_flags(statement.key, statement.flags, collect(keys(s))) # Vector of Symbol + if isempty(key_matches) + println("WARNING! No matches on $(statement.key) with flags $(statement.flags)") + else + mergewith!((x...) -> first(x), master_dict, Dict(s[match] => t[statement.value] for match ∈ key_matches)) + end + end + return master_dict + end +end + + +""" +Convert a vector of unique elements to a dictionary with each element pointing to their original index. +""" +function invert_vector(v::Vector{K})::Dict{K, Int} where {K} # Elements of v must be hashable + new_dict = Dict(val => i for (i, val) ∈ enumerate(v)) + @assert length(new_dict) == length(v) "Nonunique key in vector v: $v" + return new_dict +end + + +""" +Takes any arguments and returns nothing. +Used so we can maintain equality when making ACSetTransformations. +""" +NothingFunction(x...) = nothing; + + + + + +include("syntax/Stratification.jl") + +end + + + + + diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl new file mode 100755 index 00000000..284fddb5 --- /dev/null +++ b/src/syntax/Stratification.jl @@ -0,0 +1,295 @@ +module Stratification +export sfstratify + +using ...StockFlow +using ..Syntax +using MLStyle +import Base: get +using Catlab.CategoricalAlgebra +import ..Syntax: STRICT_MAPPINGS, STRICT_MATCHES, infer_links, substitute_symbols, DSLArgument, NothingFunction, invert_vector + +# Possible other settings: USE_FLAGS, USE_TEMP_STRAT_DEFAULT + +RETURN_HOMS = false + +TEMP_STRAT_DEFAULT = :_ + + +""" + interpret_stratification_notation(mapping_pair::Expr)::Tuple{Vector{DSLArgument}, Vector{DSLArgument}} +Take an expression of the form a1, ..., => t <= s1, ..., where every element is a symbol, and return a 2-tuple of form ((a1 => t, a2 => t, ...), (s1 => t, ...)) +""" +function interpret_stratification_notation(mapping_pair::Expr)::Tuple{Vector{DSLArgument}, Vector{DSLArgument}} + @match mapping_pair begin + + + :($s => $t <= $a) => return ([DSLArgument(s,t)], [DSLArgument(a,t)]) + :($s => $t <= $a, $(atail...)) => ([DSLArgument(s,t)], [DSLArgument(a,t) ; [DSLArgument(as,t) for as in atail] ])#return (Dict(unwrap_key_expression(s, t)), push!(Dict(unwrap_key_expression(as, t) for as in atail), unwrap_key_expression(a, t))) + :($(shead...), $s => $t <= $a) => ([[DSLArgument(ss, t) for ss in shead] ; DSLArgument(s, t)], [DSLArgument(a, t)])#return (push!(Dict(unwrap_key_expression(ss, t) for ss in shead), unwrap_key_expression(s, t)), Dict(unwrap_key_expression(a, t))) + + if mapping_pair.head == :tuple end => begin + middle_index = findfirst(x -> typeof(x) == Expr && length(x.args) == 3, mapping_pair.args) # still isn't specific enough + if isnothing(middle_index) + error("Malformed line $mapping_pair, could not find center.") + end + @match mapping_pair.args[middle_index] begin + :($stail => $t <= $ahead) => begin + sdict = [[DSLArgument(ss, t) for ss in mapping_pair.args[1:middle_index-1]] ; DSLArgument(stail, t)] + adict = [DSLArgument(ahead, t) ; [DSLArgument(as, t) for as in mapping_pair.args[middle_index+1:end]]] + return (sdict, adict) + end + _ => "Unknown format found for match; middle three values formatted incorrectly." + end + end + _ => error("Unknown line format found in stratification notation.") + end +end + + + + +function read_stratification_line_and_update_dictionaries!(line::Expr, strata_names::Dict{Symbol, Int}, type_names::Dict{Symbol, Int}, aggregate_names::Dict{Symbol, Int}, strata_mappings::Dict{Int, Int}, aggregate_mappings::Dict{Int, Int}) + current_strata_symbol_dict, current_aggregate_symbol_dict = interpret_stratification_notation(line) + + current_strata_dict = substitute_symbols(strata_names, type_names, current_strata_symbol_dict ; use_flags=true) + current_aggregate_dict = substitute_symbols(aggregate_names, type_names, current_aggregate_symbol_dict ; use_flags=true) + + if STRICT_MATCHES + @assert (all(x -> x ∉ keys(strata_mappings), keys(current_strata_dict))) "Attempt to overwrite a mapping in strata!" + # check that we're not overwriting a value which has already been assigned + merge!(strata_mappings, current_strata_dict) # accumulate dictionary keys + + + @assert (all(x -> x ∉ keys(aggregate_mappings), keys(current_aggregate_dict))) "Attempt to overwrite a mapping in aggregate!" + merge!(aggregate_mappings, current_aggregate_dict) + + else + mergewith!((x, y) -> x, strata_mappings, current_strata_dict) # alternatively, can use: only ∘ first + mergewith!((x, y) -> x, aggregate_mappings, current_aggregate_dict) + end + +end + + + + +""" + @stratify (strata, type, aggregate) begin ... end + + Ok, so the general idea here is: + 1. Grab all names from strata, type and aggregate, and create dictionaries which map them to their indices + 2. iterate over each line in the block + 2a. Split each line into a dictionary which maps all strata to that type and all aggregate to that type + 2b. Convert from two Symbol => Symbol dictionaries to two Int => Int dictionaries, using the dictionaries from step 1 + 2bα. If applicable, for symbols with TEMP_STRAT_DEFAULT as a prefix, find all matching symbols in the symbol dictionaries, and map all those + 2c. Accumulate respective dictionaries (optionally, only allow first match vs throw an error (STRICT_MATCHES = false vs true)) + 3. Create an array of 0s for stocks, flows, parameters, dyvars and sums for strata and aggregate. Insert into arrays all values from the two Int => Int dictionaries + 3a. If STRICT_MAPPINGS = false, if there only exists one option in type to map to, and it hasn't been explicitly specified, add it. If STRICT_MAPPINGS = true and it hasn't been specified, throw an error. + 4. Do a once-over of arrays and ensure there aren't any zeroes (unmapped values) remaining (helps with debugging when you screw up stratifying) + 5. Deal with attributes (create a copy of type sf with attributes mapped to nothing) + 6. Infer LS, LSV, etc., if possible. + 7. Construct strata -> type and aggregate -> type ACSetTransformations + 8. Return pullback (with flattened attributes) +""" +function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockAndFlowStructureF, aggregate::AbstractStockAndFlowStructureF, block::Expr) + + Base.remove_linenums!(block) + + # STEP 1 + + # invert_vector: Vector{K} -> Dict{K, Int} where int is original index and all K (symbols, in this case) are unique. + strata_snames::Dict{Symbol, Int} = invert_vector(snames(strata)) + strata_svnames::Dict{Symbol, Int} = invert_vector(svnames(strata)) + strata_vnames::Dict{Symbol, Int} = invert_vector(vnames(strata)) + strata_fnames::Dict{Symbol, Int} = invert_vector(fnames(strata)) + strata_pnames::Dict{Symbol, Int} = invert_vector(pnames(strata)) + + type_snames::Dict{Symbol, Int} = invert_vector(snames(type)) + type_svnames::Dict{Symbol, Int} = invert_vector(svnames(type)) + type_vnames::Dict{Symbol, Int} = invert_vector(vnames(type)) + type_fnames::Dict{Symbol, Int} = invert_vector(fnames(type)) + type_pnames::Dict{Symbol, Int} = invert_vector(pnames(type)) + + aggregate_snames::Dict{Symbol, Int} = invert_vector(snames(aggregate)) + aggregate_svnames::Dict{Symbol, Int} = invert_vector(svnames(aggregate)) + aggregate_vnames::Dict{Symbol, Int} = invert_vector(vnames(aggregate)) + aggregate_fnames::Dict{Symbol, Int} = invert_vector(fnames(aggregate)) + aggregate_pnames::Dict{Symbol, Int} = invert_vector(pnames(aggregate)) + + + strata_stock_mappings_dict::Dict{Int, Int} = Dict() + strata_flow_mappings_dict::Dict{Int, Int} = Dict() + strata_dyvar_mappings_dict::Dict{Int, Int} = Dict() + strata_param_mappings_dict::Dict{Int, Int} = Dict() + strata_sum_mappings_dict::Dict{Int, Int} = Dict() + + aggregate_stock_mappings_dict::Dict{Int, Int} = Dict() + aggregate_flow_mappings_dict::Dict{Int, Int} = Dict() + aggregate_dyvar_mappings_dict::Dict{Int, Int} = Dict() + aggregate_param_mappings_dict::Dict{Int, Int} = Dict() + aggregate_sum_mappings_dict::Dict{Int, Int} = Dict() + + + strata_all_names = [snames(strata), svnames(strata), vnames(strata), fnames(strata), pnames(strata)] + type_all_names = [snames(type), svnames(type), vnames(type), fnames(type), pnames(type)] + aggregate_all_names = [snames(aggregate), svnames(aggregate), vnames(aggregate), fnames(aggregate), pnames(aggregate)] + + @assert all(x -> TEMP_STRAT_DEFAULT ∉ keys(x), strata_all_names) "Strata contains $TEMP_STRAT_DEFAULT ! Please change TEMP_STRAT_DEFAULT to a different symbol or rename offending object." + @assert all(x -> TEMP_STRAT_DEFAULT ∉ keys(x), type_all_names) "Type contains $TEMP_STRAT_DEFAULT ! Please change TEMP_STRAT_DEFAULT to a different symbol or rename offending object." + @assert all(x -> TEMP_STRAT_DEFAULT ∉ keys(x), aggregate_all_names) "Aggregate contains $TEMP_STRAT_DEFAULT ! Please change TEMP_STRAT_DEFAULT to a different symbol or rename offending object." + + map(x -> (push!(x, (TEMP_STRAT_DEFAULT => -1))), [strata_snames, strata_svnames, strata_vnames, strata_fnames, strata_pnames]) + map(x -> (push!(x, (TEMP_STRAT_DEFAULT => -1))), [type_snames, type_svnames, type_vnames, type_fnames, type_pnames]) + map(x -> (push!(x, (TEMP_STRAT_DEFAULT => -1))), [aggregate_snames, aggregate_svnames, aggregate_vnames, aggregate_fnames, aggregate_pnames]) + + + # STEP 2 + current_phase = (_, _) -> () + for statement in block.args + @match statement begin + QuoteNode(:stocks) => begin + current_phase = s -> read_stratification_line_and_update_dictionaries!(s, strata_snames, type_snames, aggregate_snames, strata_stock_mappings_dict, aggregate_stock_mappings_dict) + end + QuoteNode(:parameters) => begin + current_phase = p -> read_stratification_line_and_update_dictionaries!(p, strata_pnames, type_pnames, aggregate_pnames, strata_param_mappings_dict, aggregate_param_mappings_dict) + end + QuoteNode(:dynamic_variables) => begin + current_phase = v -> read_stratification_line_and_update_dictionaries!(v, strata_vnames, type_vnames, aggregate_vnames, strata_dyvar_mappings_dict, aggregate_dyvar_mappings_dict) + end + QuoteNode(:flows) => begin + current_phase = f -> read_stratification_line_and_update_dictionaries!(f, strata_fnames, type_fnames, aggregate_fnames, strata_flow_mappings_dict, aggregate_flow_mappings_dict) + end + + QuoteNode(:sums) => begin + current_phase = sv -> read_stratification_line_and_update_dictionaries!(sv, strata_svnames, type_svnames, aggregate_svnames, strata_sum_mappings_dict, aggregate_sum_mappings_dict) + end + QuoteNode(kw) => + error("Unknown block type for stratify syntax: " * String(kw)) + _ => current_phase(statement) + end + end + + + # get the default value, if it has been assigned. Use 0 if it hasn't. + default_index_strata_stock = get(strata_stock_mappings_dict, -1, 0) + default_index_strata_flow = get(strata_flow_mappings_dict, -1, 0) + default_index_strata_dyvar = get(strata_dyvar_mappings_dict, -1, 0) + default_index_strata_param = get(strata_param_mappings_dict, -1, 0) + default_index_strata_sum = get(strata_sum_mappings_dict, -1, 0) + + default_index_aggregate_stock = get(aggregate_stock_mappings_dict, -1, 0) + default_index_aggregate_flow = get(aggregate_flow_mappings_dict, -1, 0) + default_index_aggregate_dyvar = get(aggregate_dyvar_mappings_dict, -1, 0) + default_index_aggregate_param = get(aggregate_param_mappings_dict, -1, 0) + default_index_aggregate_sum = get(aggregate_sum_mappings_dict, -1, 0) + + + # STEP 3 + if !STRICT_MAPPINGS + one_type_stock = length(snames(type)) == 1 ? 1 : 0 # if there is only one stock, it needs to have index 1 + one_type_flow = length(fnames(type)) == 1 ? 1 : 0 + one_type_dyvar = length(vnames(type)) == 1 ? 1 : 0 + one_type_param = length(pnames(type)) == 1 ? 1 : 0 + one_type_sum = length(svnames(type)) == 1 ? 1 : 0 + else + one_type_stock = one_type_flow = one_type_dyvar = one_type_param = one_type_sum = 0 + end + + # Convert back to vectors. If you find a zero, check if there's a default and use that. If there isn't a default, check if there's only one option and use that. + # Otherwise, there's an unassigned value which can't be inferred. + # Taking max because it's less verbose than ternary and accomplishes the same thing: + # - If both default_index and one_type are mapped, they must be mapped to the same thing, because one_type being mapped implies there's only one option. + # - If only one_type is mapped, then it will be positive, and default_infex will be 0 + # - If only default_index is mapped, it will be positive and one_type will be 0 + + strata_stock_mappings::Vector{Int} = [get(strata_stock_mappings_dict, i, max(default_index_strata_stock, one_type_stock)) for i in 1:ns(strata)] + strata_flow_mappings::Vector{Int} = [get(strata_flow_mappings_dict, i, max(default_index_strata_flow, one_type_flow)) for i in 1:nf(strata)] + strata_dyvar_mappings::Vector{Int} = [get(strata_dyvar_mappings_dict, i, max(default_index_strata_dyvar, one_type_dyvar)) for i in 1:nvb(strata)] + strata_param_mappings::Vector{Int} = [get(strata_param_mappings_dict, i, max(default_index_strata_param, one_type_param)) for i in 1:np(strata)] + strata_sum_mappings::Vector{Int} = [get(strata_sum_mappings_dict, i, max(default_index_strata_sum, one_type_sum)) for i in 1:nsv(strata)] + + aggregate_stock_mappings::Vector{Int} = [get(aggregate_stock_mappings_dict, i, max(default_index_aggregate_stock, one_type_stock)) for i in 1:ns(aggregate)] + aggregate_flow_mappings::Vector{Int} = [get(aggregate_flow_mappings_dict, i, max(default_index_aggregate_flow, one_type_flow)) for i in 1:nf(aggregate)] + aggregate_dyvar_mappings::Vector{Int} = [get(aggregate_dyvar_mappings_dict, i, max(default_index_aggregate_dyvar, one_type_dyvar)) for i in 1:nvb(aggregate)] + aggregate_param_mappings::Vector{Int} = [get(aggregate_param_mappings_dict, i, max(default_index_aggregate_param, one_type_param)) for i in 1:np(aggregate)] + aggregate_sum_mappings::Vector{Int} = [get(aggregate_sum_mappings_dict, i, max(default_index_aggregate_sum, one_type_sum)) for i in 1:nsv(aggregate)] + + + # This bit is a bit verbose, but makes debugging when making a stratification easier. Tells you exactly which ones you forgot to map. + + all_mappings = [strata_stock_mappings..., strata_flow_mappings..., strata_dyvar_mappings..., strata_param_mappings..., strata_sum_mappings..., aggregate_stock_mappings..., aggregate_flow_mappings..., aggregate_dyvar_mappings..., aggregate_param_mappings..., aggregate_sum_mappings...] + + strata_mappings = [strata_stock_mappings => snames(strata), strata_flow_mappings => fnames(strata), strata_dyvar_mappings => vnames(strata), strata_param_mappings => pnames(strata), strata_sum_mappings => svnames(strata)] + aggregate_mappings = [aggregate_stock_mappings => snames(aggregate), aggregate_flow_mappings => fnames(aggregate), aggregate_dyvar_mappings => vnames(aggregate), aggregate_param_mappings => pnames(aggregate), aggregate_sum_mappings => svnames(aggregate)] + + # STEP 4 + + #unmapped: + if !(all(x -> x != 0, all_mappings)) + for (ints, dicts) in strata_mappings + for (i, val) in enumerate(ints) + if val == 0 + println("UNMAPPED IN STRATA:") + println(dicts[i]) + end + end + end + for (ints, dicts) in aggregate_mappings + for (i, val) in enumerate(ints) + if val == 0 + println("UNMAPPED IN AGGREGATE:") + println(dicts[i]) + end + end + end + error("There is an unmapped value!") + end + + + # STEP 5 + # NothingFunction(x...) = nothing; + no_attribute_type = map(type, Name=NothingFunction, Op=NothingFunction, Position=NothingFunction) + + # STEP 6/7 + # This is where we pull out the magic to infer links. + # + # A <- C -> B + # || || + # v v + # A'<- C'-> B' + # + # implies + # + # A <- C -> B + # || || || + # v v v + # A'<- C'-> B' + # + + strata_necmaps = Dict(:S => strata_stock_mappings, :F => strata_flow_mappings, :V => strata_dyvar_mappings, :P => strata_param_mappings, :SV => strata_sum_mappings) + strata_inferred_links = infer_links(strata, type, strata_necmaps) + strata_to_type = ACSetTransformation(strata, no_attribute_type; strata_necmaps..., strata_inferred_links..., Op = NothingFunction, Position = NothingFunction, Name = NothingFunction) + + + aggregate_necmaps = Dict(:S => aggregate_stock_mappings, :F => aggregate_flow_mappings, :V => aggregate_dyvar_mappings, :P => aggregate_param_mappings, :SV => aggregate_sum_mappings) + aggregate_inferred_links = infer_links(aggregate, type, aggregate_necmaps) + aggregate_to_type = ACSetTransformation(aggregate, no_attribute_type; aggregate_necmaps..., aggregate_inferred_links..., Op = NothingFunction, Position = NothingFunction, Name =NothingFunction) + + + + # STEP 8 + pullback_model = pullback(strata_to_type, aggregate_to_type) |> apex |> rebuildStratifiedModelByFlattenSymbols; + + if RETURN_HOMS + return pullback_model, strata_to_type, aggregate_to_type + else + return pullback_model + end + +end + + + + + +end \ No newline at end of file diff --git a/test/Stratification.jl b/test/Stratification.jl new file mode 100755 index 00000000..0c7ff151 --- /dev/null +++ b/test/Stratification.jl @@ -0,0 +1,341 @@ +using StockFlow.Syntax.Stratification + +using StockFlow.Syntax.Stratification: interpret_stratification_notation +using StockFlow.Syntax: NothingFunction, DSLArgument, unwrap_expression, substitute_symbols + +using Catlab.WiringDiagrams +using Catlab.ACSets +using Catlab.CategoricalAlgebra + + + + +@testset "Pullback computed in standard way is equal to DSL pullbacks" begin + + + l_type = @stock_and_flow begin + :stocks + pop + + :parameters + μ + δ + rFstOrder + rage + + :dynamic_variables + v_aging = pop * rage + v_fstOrder = pop * rFstOrder + v_birth = N * μ + v_death = pop * δ + + :flows + pop => f_aging(v_aging) => pop + pop => f_fstOrder(v_fstOrder) => pop + CLOUD => f_birth(v_birth) => pop + pop => f_death(v_death) => CLOUD + + :sums + N = [pop] + + end; + l_type_noatts = map(l_type, Name=NothingFunction, Op=NothingFunction, Position=NothingFunction); + + + WeightModel = @stock_and_flow begin + :stocks + NormalWeight + OverWeight + Obese + + :parameters + μ + δw + rw + ro + δo + rage + + :dynamic_variables + v_NewBorn = N * μ + v_DeathNormalWeight = NormalWeight * δw + v_BecomingOverWeight = NormalWeight * rw + v_DeathOverWeight = OverWeight * δw + v_BecomingObese = OverWeight * ro + v_DeathObese = Obese * δo + v_idNW = NormalWeight * rage + v_idOW = OverWeight * rage + v_idOb = Obese * rage + + :flows + CLOUD => f_NewBorn(v_NewBorn) => NormalWeight + NormalWeight => f_DeathNormalWeight(v_DeathNormalWeight) => ClOUD + NormalWeight => f_BecomingOverWeight(v_BecomingOverWeight) => OverWeight + OverWeight => f_DeathOverWeight(v_DeathOverWeight) => CLOUD + + OverWeight => f_BecomingObese(v_BecomingObese) => Obese + Obese => f_DeathObese(v_DeathObese) => CLOUD + NormalWeight => f_idNW(v_idNW) => NormalWeight + OverWeight => f_idOW(v_idOW) => OverWeight + Obese => f_idOb(v_idOb) => Obese + + :sums + N = [NormalWeight, OverWeight, Obese] + + end; + + + ageWeightModel = @stock_and_flow begin + :stocks + Child + Adult + Senior + + :parameters + μ + δC + δA + δS + rageCA + rageAS + r + + :dynamic_variables + v_NB = N * μ + v_DeathC = Child * δC + v_idC = Child * r + v_agingCA = Child * rageCA + v_DeathA = Adult * δA + v_idA = Adult * r + v_agingAS = Adult * rageAS + v_DeathS = Senior * δS + v_idS = Senior * r + + :flows + CLOUD => f_NB(v_NB) => Child + Child => f_idC(v_idC) => Child + Child => f_DeathC(v_DeathC) => CLOUD + Child => f_agingCA(v_agingCA) => Adult + Adult => f_idA(v_idA) => Adult + Adult => f_DeathA(v_DeathA) => CLOUD + Adult => f_agingAS(v_agingAS) => Senior + Senior => f_idS(v_idS) => Senior + Senior => f_DeathS(v_DeathS) => CLOUD + + :sums + N = [Child, Adult, Senior] + + end; + + begin + s, = parts(l_type, :S) + N, = parts(l_type, :SV) + lsn, = parts(l_type, :LS) + f_aging, f_fstorder, f_birth, f_death = parts(l_type, :F) + i_aging, i_fstorder, i_birth = parts(l_type, :I) + o_aging, o_fstorder, o_death = parts(l_type, :O) + v_aging, v_fstorder, v_birth, v_death = parts(l_type, :V) + lv_aging1, lv_fstorder1, lv_death1 = parts(l_type, :LV) + lsv_birth1, = parts(l_type, :LSV) + p_μ, p_δ, p_rfstOrder, p_rage = parts(l_type, :P) + lpv_aging2, lpv_fstorder2, lpv_birth2, lpv_death2 = parts(l_type, :LPV) + end; + + typed_WeightModel=ACSetTransformation(WeightModel, l_type_noatts, + S = [s,s,s], + SV = [N], + LS = [lsn,lsn,lsn], + F = [f_birth, f_death, f_fstorder, f_death, f_fstorder, f_death, f_aging, f_aging, f_aging], + I = [i_birth, i_aging, i_fstorder, i_aging, i_fstorder, i_aging], + O = [o_death, o_fstorder, o_aging, o_death, o_fstorder, o_aging, o_death, o_aging], + V = [v_birth, v_death, v_fstorder, v_death, v_fstorder, v_death, v_aging, v_aging, v_aging], + LV = [lv_death1, lv_fstorder1, lv_death1, lv_fstorder1, lv_death1, lv_aging1, lv_aging1, lv_aging1], + LSV = [lsv_birth1], + P = [p_μ, p_δ, p_rfstOrder, p_rfstOrder, p_δ, p_rage], + LPV = [lpv_birth2, lpv_death2, lpv_fstorder2, lpv_death2, lpv_fstorder2, lpv_death2, lpv_aging2, lpv_aging2, lpv_aging2], + Name=NothingFunction, Op=NothingFunction, Position=NothingFunction + ); + @assert is_natural(typed_WeightModel); + + + + typed_ageWeightModel=ACSetTransformation(ageWeightModel, l_type_noatts, + S = [s,s,s], + SV = [N], + LS = [lsn,lsn,lsn], + F = [f_birth, f_fstorder, f_death, f_aging, f_fstorder, f_death, f_aging, f_fstorder, f_death], + I = [i_birth, i_fstorder, i_aging, i_fstorder, i_aging, i_fstorder], + O = [o_fstorder, o_death, o_aging, o_fstorder, o_death, o_aging, o_fstorder, o_death], + V = [v_birth, v_death, v_fstorder, v_aging, v_death, v_fstorder, v_aging, v_death, v_fstorder], + LV = [lv_death1, lv_fstorder1, lv_aging1, lv_death1, lv_fstorder1, lv_aging1, lv_death1, lv_fstorder1], + LSV = [lsv_birth1], + P = [p_μ, p_δ, p_δ, p_δ, p_rage, p_rage, p_rfstOrder], + LPV = [lpv_birth2, lpv_death2, lpv_fstorder2, lpv_aging2, lpv_death2, lpv_fstorder2, lpv_aging2, lpv_death2, lpv_fstorder2], + Name =NothingFunction, Op=NothingFunction, Position=NothingFunction + ); + @assert is_natural(typed_ageWeightModel); + + aged_weight = pullback(typed_WeightModel, typed_ageWeightModel) |> apex |> rebuildStratifiedModelByFlattenSymbols; + + # ######################################### + + age_weight_2 = sfstratify(WeightModel, l_type, ageWeightModel, quote + :stocks + NormalWeight, OverWeight, Obese => pop <= Child, Adult, Senior + + :flows + f_NewBorn => f_birth <= f_NB + f_DeathNormalWeight, f_DeathOverWeight, f_DeathObese => f_death <= f_DeathC, f_DeathA, f_DeathS + f_idNW, f_idOW, f_idOb => f_aging <= f_agingCA, f_agingAS + f_BecomingOverWeight, f_BecomingObese => f_fstOrder <= f_idC, f_idA, f_idS + + :dynamic_variables + v_NewBorn => v_birth <= v_NB + v_DeathNormalWeight, v_DeathOverWeight, v_DeathObese => v_death <= v_DeathC, v_DeathA, v_DeathS + v_idNW, v_idOW, v_idOb => v_aging <= v_agingCA, v_agingAS + v_BecomingOverWeight, v_BecomingObese => v_fstOrder <= v_idC, v_idA, v_idS + + :parameters + μ => μ <= μ + δw, δo => δ <= δC, δA, δS + rw, ro => rFstOrder <= r + rage => rage <= rageCA, rageAS + + :sums + N => N <= N + + end) + ######################################### + + age_weight_3 = sfstratify(WeightModel, l_type, ageWeightModel, quote + + :flows + f_NewBorn => f_birth <= f_NB + ~Death => f_death <= ~Death + ~id => f_aging <= ~aging + ~Becoming => f_fstOrder <= ~id + + :dynamic_variables + v_NewBorn => v_birth <= v_NB + ~Death => v_death <= ~Death + ~id => v_aging <= ~aging + ~Becoming => v_fstOrder <= ~id + + :parameters + μ => μ <= μ + ~δ => δ <= ~δ + rage => rage <= rageCA, rageAS + _ => rFstOrder <= _ + + end) + + age_weight_4 = sfstratify(WeightModel, l_type, ageWeightModel, quote + + :flows + ~NO_MATCHES => f_birth <= ~NO_MATCHES + f_NewBorn => f_birth <= f_NB + ~Death => f_death <= ~Death + ~id => f_aging <= ~aging + ~Becoming => f_fstOrder <= ~id + ~Becoming => f_aging <= ~id # Everything already matched; ignored + _ => f_aging <= _ # also ignored + + :dynamic_variables + v_NewBorn => v_birth <= v_NB + ~Death => v_death <= ~Death + ~id => v_aging <= ~aging + _ => v_fstOrder <= _ + + :parameters + μ => μ <= μ + ~δ => δ <= ~δ + rage => rage <= rageCA, rageAS + _ => rFstOrder <= _ + + end) + + + + + @test aged_weight == age_weight_2 + @test aged_weight == age_weight_3 + @test aged_weight == age_weight_4 +end + +@testset "Ensuring interpret_stratification_notation correctly reads lines" begin # This should be all valid cases. There's always going to be at least one value on both sides. + # Note the orders. The lists produced go left to right. A1, A2 => B <= C1, C2 results in [A1 => B, A2 => B], [C1 => B. C2 => B] + + + @test interpret_stratification_notation(:(A => B <= C)) == ([DSLArgument(:A, :B, Set{Symbol}())], [DSLArgument(:C, :B, Set{Symbol}())]) + + @test interpret_stratification_notation(:(A1, A2 => B <= C)) == ( + [DSLArgument(:A1, :B, Set{Symbol}()), DSLArgument(:A2, :B, Set{Symbol}())], + [DSLArgument(:C, :B, Set{Symbol}())] + ) + @test interpret_stratification_notation(:(A => B <= C1, C2)) == ( + [DSLArgument(:A, :B, Set{Symbol}())], + [DSLArgument(:C1, :B, Set{Symbol}()), DSLArgument(:C2, :B, Set{Symbol}())], + ) + @test interpret_stratification_notation(:(_ => B <= _)) == ( + [DSLArgument(:_, :B, Set{Symbol}())], + [DSLArgument(:_, :B, Set{Symbol}())], + ) + @test interpret_stratification_notation(:(~A => B <= ~C)) == ( + [DSLArgument(:A, :B, Set{Symbol}([:~]))], + [DSLArgument(:C, :B, Set{Symbol}([:~]))], + ) + @test interpret_stratification_notation(:(~A1, A2 => B <= ~C)) == ( + [DSLArgument(:A1, :B, Set{Symbol}([:~])), DSLArgument(:A2, :B, Set{Symbol}())], + [DSLArgument(:C, :B, Set{Symbol}([:~]))], + ) + + @test interpret_stratification_notation(:(~_ => B <= ~_, C)) == ( # Weird case. Matches everything with _ as a substring. + [DSLArgument(:_, :B, Set{Symbol}([:~]))], + [DSLArgument(:_, :B, Set{Symbol}([:~])), DSLArgument(:C, :B, Set{Symbol}())] + ) + +end + + +@testset "Unwrapping expressions works correctly" begin + @test unwrap_expression(:S) == (:S, Set{Symbol}()) + @test unwrap_expression(:(~S)) == (:S, Set{Symbol}([:~])) + @test unwrap_expression(:(~_)) == (:_, Set{Symbol}([:~])) +end + + +# function substitute_symbols(s::Dict{Symbol, Int}, t::Dict{Symbol, Int}, m::Vector{DSLArgument} ; use_flags::Bool=true)::Dict{Int, Int} + +@testset "Testing substituting symbols" begin # underscore matching occurs at the very end, after this step. + s1 = Dict(:A => 1) + t1 = Dict(:B => 2) + m1₁ = [DSLArgument(:A, :B, Set{Symbol}())] + m1₂ = [DSLArgument(:A, :B, Set{Symbol}([:~]))] + + @test substitute_symbols(s1, t1, m1₁) == Dict(1 => 2) # A=>B -> 1=>2 + @test substitute_symbols(s1, t1, m1₂) == Dict(1 => 2) # A=>B -> 1=>2 + @test substitute_symbols(s1, t1, m1₂, use_flags=false) == Dict(1 => 2) # A=>B -> 1=>2 + + s2 = Dict(:A1 => 10, :A2 => 20, :A3 => 30) # Unfortunately, cannot do substring matches starting with numbers, since it would require a symbol starting with a numbre. Might need to add something for this... + t2 = Dict(:B1 => 1, :B2 => 2) + m2₁ = [DSLArgument(:A, :B1, Set{Symbol}([:~]))] + + @test substitute_symbols(s2, t2, m2₁) == Dict(10 => 1, 20 => 1, 30 => 1) #~A=>B -> 10=>1, 20=>1, 30=>1 + # @test substitute_symbols(s2, t2, m2₁, use_flags=false) == Dict() # deliberately throws an error + + s3 = Dict{Symbol, Int}() + t3 = Dict{Symbol, Int}() + m3 = Vector{DSLArgument}() + + @test substitute_symbols(s3, t3, m3) == Dict() + @test substitute_symbols(s3, t3, m3, use_flags=false) == Dict() + + s4 = Dict(:A1 => 1, :A2 => 2, :AB3 => 3, :AB4 => 4, :A5 => 5) + t4 = Dict(:B1 => 1, :B2 => 2, :B3 => 3) + m4 = [DSLArgument(:A1, :B1, Set{Symbol}()), DSLArgument(:B, :B2, Set{Symbol}([:~])), DSLArgument(:A, :B3, Set{Symbol}([:~]))] + + # always goes with first match. A1 is taken, B matches AB3 and AB4, then A matches A2 and A5 + @test substitute_symbols(s4, t4, m4) == Dict(1 => 1, 3 => 2, 4 => 2, 2 => 3, 5 => 3) +end + + diff --git a/test/Syntax.jl b/test/Syntax.jl old mode 100644 new mode 100755 index 36df5324..bbcbf76a --- a/test/Syntax.jl +++ b/test/Syntax.jl @@ -2,7 +2,11 @@ using Base: is_unary_and_binary_operator using Test using StockFlow using StockFlow.Syntax -using StockFlow.Syntax: is_binop_or_unary, sum_variables, infix_expression_to_binops, fnone_value_or_vector, extract_function_name_and_args_expr, is_recursive_dyvar, create_foot +using StockFlow.Syntax: is_binop_or_unary, sum_variables, infix_expression_to_binops, fnone_value_or_vector, extract_function_name_and_args_expr, is_recursive_dyvar, create_foot, apply_flags, substitute_symbols + +@testset "Stratification DSL" begin + include("Stratification.jl") +end @testset "is_binop_or_unary recognises binops" begin @test is_binop_or_unary(:(a + b)) @@ -337,5 +341,209 @@ end @test_throws Exception @eval @feet begin A => B; 1 => 2; end end +########################### + +@testset "infer_links works as expected" begin + # No prior mappings means no inferred mappings + @test (infer_links(StockAndFlowF(), StockAndFlowF(), Dict{Symbol, Vector{Int64}}(:S => [], :F => [], :SV => [], :P => [], :V => [])) + == Dict(:LS => [], :LSV => [], :LV => [], :I => [], :O => [], :LPV => [], :LVV => [])) + + # S: 1 -> 1 and SV: 1 -> 1 implies LS: 1 -> 1 + @test (infer_links( + (@stock_and_flow begin; :stocks; A; :sums; NA = [A]; end), + (@stock_and_flow begin; :stocks; B; :sums; NB = [B]; end), + Dict{Symbol, Vector{Int64}}(:S => [1], :F => [], :SV => [1], :P => [], :V => [])) + == Dict(:LS => [1], :LSV => [], :LV => [], :I => [], :O => [], :LPV => [], :LVV => [])) + + # annoying exanmple, required me to add code to disambiguate using position + # that is, vA = A + A, vA -> vB, A -> implies that the As in the vA definition map to the Bs in the vB definition + # But both As link to the same stock and dynamic variable so just looking at those isn't enough to figure out what it maps to. + # There will exist cases where it's impossible to tell - eg, when there exist multiple duplicate links, and some positions don't match up. + + # It does not currently look at the operator. You could therefore map vA = A + A -> vB = B * B + # I can see this being useful, actually, specifically when mapping between + and -, * and /, etc. Probably logs and powers too. + # Just need to be aware that it won't say it's invalid. + @test (infer_links( + (@stock_and_flow begin; :stocks; A; :dynamic_variables; vA = A + A; end), + (@stock_and_flow begin; :stocks; B; :dynamic_variables; vB = B + B; end), + Dict{Symbol, Vector{Int64}}(:S => [1], :F => [], :SV => [], :P => [], :V => [1])) + == Dict(:LS => [], :LSV => [], :LV => [2,2], :I => [], :O => [], :LPV => [], :LVV => [])) # If duplicate values, always map to end. + + @test (infer_links( + (@stock_and_flow begin; :stocks; A; :parameters; pA; :dynamic_variables; vA = A + pA; end), + (@stock_and_flow begin; :stocks; B; :parameters; pB; :dynamic_variables; vB = pB + B; end), + Dict{Symbol, Vector{Int64}}(:S => [1], :F => [], :SV => [], :P => [1], :V => [1])) + == Dict(:LS => [], :LSV => [], :LV => [1], :I => [], :O => [], :LPV => [1], :LVV => [])) + + @test (infer_links( + (@stock_and_flow begin + :stocks + S + I + R + + :parameters + p_inf + p_rec + + + :flows + S => f_StoI(p_inf * S) => I + I => f_ItoR(I * p_rec) => R + + :sums + N = [S,I,R] + NI = [I] + NS = [S,I,R] + end), + (@stock_and_flow begin + :stocks + pop + + :parameters + p_generic + + + :flows + pop => f_generic(p_generic * pop) => pop + + :sums + N = [pop] + NI = [pop] + NS = [pop] + end), + + Dict{Symbol, Vector{Int64}}(:S => [1,1,1], :F => [1,1], :SV => [1,2,3], :P => [1,1], :V => [1,1])) + == Dict(:LS => [1,3,1,2,3,1,3], :LSV => [], :LV => [1,1], :I => [1,1], :O => [1,1], :LPV => [1,1], :LVV => [])) + + +end + + +@testset "Applying flags can correctly find substring matches" begin + @test apply_flags(:f_, Set([:~]), Vector{Symbol}()) == [] + @test apply_flags(:f_, Set([:~]), [:f_death, :f_birth]) == [:f_death, :f_birth] + @test apply_flags(:NOMATCH, Set([:~]), [:f_death, :f_birth]) == [] + @test apply_flags(:f_birth, Set([:~]), [:f_death, :f_birth]) == [:f_birth] + @test apply_flags(:f_birth, Set{Symbol}(), [:f_death, :f_birth]) == [:f_birth] + + # Note, apply_flags is specifically meant to work on vectors without duplicates; the vector which is input are the keys of a dictionary. + # Regardless, the following will hold: + @test apply_flags(:f_birth, Set{Symbol}(), [:f_death, :f_birth, :f_birth, :f_birth]) == [:f_birth] + @test apply_flags(:f_birth, Set{Symbol}([:~]), [:f_death, :f_birth, :f_birth, :f_birth]) == [:f_birth, :f_birth, :f_birth] +end + + +@testset "substitute_symbols will correctly associate values of the two provided dictionaries based on user defined mappings" begin + # substitute_symbols(s::Dict{Symbol, Int}, t::Dict{Symbol, Int}, m::Vector{DSLArgument} ; use_flags::Bool=true)::Dict{Int, Int} + + + # Note, these dictionaries represent a vector where all the entries are unique, and the values are the original indices. + # So, both keys and values should be unique. + # For stratification, first dictionary is strata or aggregate, second is type, and the vector of DSLArgument are the user-defined maps. + # For homomorphism, first argument is src, second is dest, vector are user-defined maps. + @test substitute_symbols(Dict{Symbol, Int}(), Dict{Symbol, Int}(), Vector{DSLArgument}()) == Dict{Int, Int}() + @test substitute_symbols(Dict{Symbol, Int}(), Dict(:B => 2), Vector{DSLArgument}()) == Dict{Int, Int}() + + @test substitute_symbols(Dict(:A => 1), Dict(:B => 1), [DSLArgument(:A, :B, Set{Symbol}())]) == Dict(1 => 1) + @test substitute_symbols(Dict(:A1 => 1, :A2 => 2), Dict(:B => 1), [DSLArgument(:A1, :B, Set{Symbol}()), DSLArgument(:A2, :B, Set{Symbol}())]) == Dict(1 => 1, 2 => 1) + @test substitute_symbols(Dict(:A1 => 1), Dict(:B1 => 1, :B2 => 2), [DSLArgument(:A1, :B2, Set{Symbol}())]) == Dict(1 => 2) + + + @test substitute_symbols(Dict(:A1 => 1, :A2 => 2), Dict(:B1 => 1, :B2 => 2), [DSLArgument(:A, :B2, Set{Symbol}([:~]))]) == Dict(1 => 2, 2 => 2) + + # 1:100 + # 1:50 + # All multiples x of 14 below 100 go to x % 10 + 1 + @test (substitute_symbols(Dict(Symbol(i) => i for i ∈ 1:100), Dict(Symbol(-i) => i for i ∈ 1:50), [DSLArgument(Symbol(i), Symbol(-((i%10) + 1)), Set{Symbol}()) for i ∈ 1:100 if i % 14 == 0]) + == Dict(14 => 5, 28 => 9, 42 => 3, 56 => 7, 70 => 1, 84 => 5, 98 => 9)) + + # Captures everything with a 7 as a digit + @test (substitute_symbols(Dict(Symbol(i) => i for i ∈ 1:100), Dict(Symbol(-i) => i for i ∈ 1:50), [DSLArgument(Symbol(7), Symbol(-1), Set{Symbol}([:~]))]) + == Dict(7 => 1, 17 => 1, 27 => 1, 37 => 1, 47 => 1, 57 => 1, 67 => 1, 70 => 1, 71 => 1, 72 => 1, 73 => 1, 74 => 1, 75 => 1, 76 => 1, 77 => 1, 78 => 1, 79 => 1, 87 => 1, 97 => 1)) + + @test substitute_symbols(Dict(Symbol("~") => 1), Dict(:R => 1), [DSLArgument(Symbol("~"), :R, Set([:~]))], ; use_flags = false) == Dict(1 => 1) # Note, the Set([:~]) is ignored because use_flags is false + +end + + +@testset "non-natural transformations fail infer_links" begin + + # Map both dynamic variables to the same + # Obviously, this will fail, as the new dynamic variable needs a LVV and one LV, but instead has two LV + @test_throws KeyError (infer_links( + (@stock_and_flow begin + :stocks + A + + :dynamic_variables + v1 = A + A + v2 = v1 + A + end), + (@stock_and_flow begin + :stocks + A + + :dynamic_variables + v1 = A + A + end), + Dict{Symbol, Vector{Int64}}(:S => [1], :V => [1,1]))) + + + + # Mapping it all to I + + # This one fails when trying to figure out the inflow. Stock maps to 2, and flow maps to 2, + # But inflows on the target have (1,2) and (2,3) + + # This also wouldn't work if we tried mapping flow to 1 instead. Outflows expect 1,1 or 2,2, + # so it fails on (2,1). + @test_throws KeyError (infer_links( + (@stock_and_flow begin + :stocks + pop + + :parameters + p_generic + + + :flows + pop => f_generic(p_generic * pop) => pop + + :sums + N = [pop] + NI = [pop] + NS = [pop] + end), + (@stock_and_flow begin + :stocks + S + I + R + + :parameters + p_inf + p_rec + + + :flows + S => f_StoI(p_inf * S) => I + I => f_ItoR(I * p_rec) => R + + :sums + N = [S,I,R] + NI = [I] + NS = [S,I,R] + end), + Dict{Symbol, Vector{Int64}}(:S => [2], :F => [2], :SV => [1,2,3], :P => [2], :V => [2]))) + +end + +@testset "Applying flags throws on invalid inputs" begin + @test_throws ErrorException apply_flags(:f_, Set([:+]), [:f_death, :f_birth]) # fails because :+ is not a defined operation + @test_throws ErrorException apply_flags(:f_birth, Set([:~, :+]), [:f_death, :f_birth]) # also fails for same reason + @test_throws AssertionError apply_flags(:NOMATCH, Set{Symbol}(), Vector{Symbol}()) # fails because it's not looking for substrings, and :NOMATCH isn't in the list of options. + @test_throws AssertionError apply_flags(:NOMATCH, Set{Symbol}(), [:nomatch]) # same reason +end \ No newline at end of file From 7638748954dd8828ceb4e6199d4cf0eea8343825 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Thu, 31 Aug 2023 03:00:49 -0600 Subject: [PATCH 02/23] Replaced StockAndFlowF with AbstractStockAndFlowF in get_lss, get_lssv, etc. getter methods --- src/StockFlow.jl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/StockFlow.jl b/src/StockFlow.jl index b04e073a..cae235ed 100644 --- a/src/StockFlow.jl +++ b/src/StockFlow.jl @@ -255,20 +255,20 @@ nlpv(p::AbstractStockAndFlowStructureF) = nparts(p,:LPV) #links from dynamic var np(p::AbstractStockAndFlowStructureF) = nparts(p,:P) #parameters -get_lss(sf::StockAndFlowF) = collect(values(sf.subparts[:lss].m)) -get_lssv(sf::StockAndFlowF) = collect(values(sf.subparts[:lssv].m)) -get_lsvsv(sf::StockAndFlowF) = collect(values(sf.subparts[:lsvsv].m)) -get_lsvv(sf::StockAndFlowF) = collect(values(sf.subparts[:lsvv].m)) -get_lvs(sf::StockAndFlowF) = collect(values(sf.subparts[:lvs].m)) -get_lvv(sf::StockAndFlowF) = collect(values(sf.subparts[:lvv].m)) -get_is(sf::StockAndFlowF) = collect(values(sf.subparts[:is].m)) -get_ifn(sf::StockAndFlowF) = collect(values(sf.subparts[:ifn].m)) -get_os(sf::StockAndFlowF) = collect(values(sf.subparts[:os].m)) -get_ofn(sf::StockAndFlowF) = collect(values(sf.subparts[:ofn].m)) -get_lpvp(sf::StockAndFlowF) = collect(values(sf.subparts[:lpvp].m)) -get_lpvv(sf::StockAndFlowF) = collect(values(sf.subparts[:lpvv].m)) -get_lvsrc(sf::StockAndFlowF) = collect(values(sf.subparts[:lvsrc].m)) -get_lvtgt(sf::StockAndFlowF) = collect(values(sf.subparts[:lvtgt].m)) +get_lss(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:lss].m)) +get_lssv(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:lssv].m)) +get_lsvsv(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:lsvsv].m)) +get_lsvv(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:lsvv].m)) +get_lvs(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:lvs].m)) +get_lvv(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:lvv].m)) +get_is(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:is].m)) +get_ifn(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:ifn].m)) +get_os(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:os].m)) +get_ofn(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:ofn].m)) +get_lpvp(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:lpvp].m)) +get_lpvv(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:lpvv].m)) +get_lvsrc(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:lvsrc].m)) +get_lvtgt(sf::AbstractStockAndFlowF) = collect(values(sf.subparts[:lvtgt].m)) #EXAMPLE: From 593ac608f912a4872dd7dfb942543c324c996239 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Fri, 1 Sep 2023 10:51:50 -0600 Subject: [PATCH 03/23] Global flags are now kwargs. Fixed a typo where sfstratify was @stratify, --- src/Syntax.jl | 11 -------- src/syntax/Stratification.jl | 51 ++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 39 deletions(-) diff --git a/src/Syntax.jl b/src/Syntax.jl index be94482a..973a74e9 100644 --- a/src/Syntax.jl +++ b/src/Syntax.jl @@ -1034,17 +1034,6 @@ end ############################################# -ISSUB_DEFAULT::String = "_" -USE_ISSUB::Bool = true -STRICT_MAPPINGS::Bool = false # whether you need to include all, or if you can infer those which only have one thing to map to. -STRICT_MATCHES::Bool = false # each value is only allowed to match one line in its section, vs matching the first. EG, if you had f_death as a stock: -# :stocks -# ~f_death => f_death <= fdeath -# _ => f_id <= fid -# -# would throw an error if true, wouldn't if false. - - """ infer_particular_link!(sfsrc, sftgt, f1, f2, map1, map2, destination_vector, posf=nothing) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index 284fddb5..b3020ce0 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -6,13 +6,7 @@ using ..Syntax using MLStyle import Base: get using Catlab.CategoricalAlgebra -import ..Syntax: STRICT_MAPPINGS, STRICT_MATCHES, infer_links, substitute_symbols, DSLArgument, NothingFunction, invert_vector - -# Possible other settings: USE_FLAGS, USE_TEMP_STRAT_DEFAULT - -RETURN_HOMS = false - -TEMP_STRAT_DEFAULT = :_ +import ..Syntax: infer_links, substitute_symbols, DSLArgument, NothingFunction, invert_vector """ @@ -48,13 +42,13 @@ end -function read_stratification_line_and_update_dictionaries!(line::Expr, strata_names::Dict{Symbol, Int}, type_names::Dict{Symbol, Int}, aggregate_names::Dict{Symbol, Int}, strata_mappings::Dict{Int, Int}, aggregate_mappings::Dict{Int, Int}) +function read_stratification_line_and_update_dictionaries!(line::Expr, strata_names::Dict{Symbol, Int}, type_names::Dict{Symbol, Int}, aggregate_names::Dict{Symbol, Int}, strata_mappings::Dict{Int, Int}, aggregate_mappings::Dict{Int, Int} ; strict_matches = false, use_flags = true) current_strata_symbol_dict, current_aggregate_symbol_dict = interpret_stratification_notation(line) - current_strata_dict = substitute_symbols(strata_names, type_names, current_strata_symbol_dict ; use_flags=true) - current_aggregate_dict = substitute_symbols(aggregate_names, type_names, current_aggregate_symbol_dict ; use_flags=true) + current_strata_dict = substitute_symbols(strata_names, type_names, current_strata_symbol_dict ; use_flags=use_flags) + current_aggregate_dict = substitute_symbols(aggregate_names, type_names, current_aggregate_symbol_dict ; use_flags=use_flags) - if STRICT_MATCHES + if strict_matches @assert (all(x -> x ∉ keys(strata_mappings), keys(current_strata_dict))) "Attempt to overwrite a mapping in strata!" # check that we're not overwriting a value which has already been assigned merge!(strata_mappings, current_strata_dict) # accumulate dictionary keys @@ -74,14 +68,14 @@ end """ - @stratify (strata, type, aggregate) begin ... end + sfstratify(strata, type, aggregate, block ; kwargs) Ok, so the general idea here is: 1. Grab all names from strata, type and aggregate, and create dictionaries which map them to their indices 2. iterate over each line in the block 2a. Split each line into a dictionary which maps all strata to that type and all aggregate to that type 2b. Convert from two Symbol => Symbol dictionaries to two Int => Int dictionaries, using the dictionaries from step 1 - 2bα. If applicable, for symbols with TEMP_STRAT_DEFAULT as a prefix, find all matching symbols in the symbol dictionaries, and map all those + 2bα. If applicable, for symbols with temp_strat_default as a prefix, find all matching symbols in the symbol dictionaries, and map all those 2c. Accumulate respective dictionaries (optionally, only allow first match vs throw an error (STRICT_MATCHES = false vs true)) 3. Create an array of 0s for stocks, flows, parameters, dyvars and sums for strata and aggregate. Insert into arrays all values from the two Int => Int dictionaries 3a. If STRICT_MAPPINGS = false, if there only exists one option in type to map to, and it hasn't been explicitly specified, add it. If STRICT_MAPPINGS = true and it hasn't been specified, throw an error. @@ -91,7 +85,7 @@ end 7. Construct strata -> type and aggregate -> type ACSetTransformations 8. Return pullback (with flattened attributes) """ -function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockAndFlowStructureF, aggregate::AbstractStockAndFlowStructureF, block::Expr) +function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockAndFlowStructureF, aggregate::AbstractStockAndFlowStructureF, block::Expr ; strict_mappings = false, strict_matches = false, temp_strat_default = :_, use_temp_strat_default = true, use_flags = true, return_homs = false) Base.remove_linenums!(block) @@ -134,34 +128,35 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA type_all_names = [snames(type), svnames(type), vnames(type), fnames(type), pnames(type)] aggregate_all_names = [snames(aggregate), svnames(aggregate), vnames(aggregate), fnames(aggregate), pnames(aggregate)] - @assert all(x -> TEMP_STRAT_DEFAULT ∉ keys(x), strata_all_names) "Strata contains $TEMP_STRAT_DEFAULT ! Please change TEMP_STRAT_DEFAULT to a different symbol or rename offending object." - @assert all(x -> TEMP_STRAT_DEFAULT ∉ keys(x), type_all_names) "Type contains $TEMP_STRAT_DEFAULT ! Please change TEMP_STRAT_DEFAULT to a different symbol or rename offending object." - @assert all(x -> TEMP_STRAT_DEFAULT ∉ keys(x), aggregate_all_names) "Aggregate contains $TEMP_STRAT_DEFAULT ! Please change TEMP_STRAT_DEFAULT to a different symbol or rename offending object." - - map(x -> (push!(x, (TEMP_STRAT_DEFAULT => -1))), [strata_snames, strata_svnames, strata_vnames, strata_fnames, strata_pnames]) - map(x -> (push!(x, (TEMP_STRAT_DEFAULT => -1))), [type_snames, type_svnames, type_vnames, type_fnames, type_pnames]) - map(x -> (push!(x, (TEMP_STRAT_DEFAULT => -1))), [aggregate_snames, aggregate_svnames, aggregate_vnames, aggregate_fnames, aggregate_pnames]) + if use_temp_strat_default + @assert all(x -> temp_strat_default ∉ keys(x), strata_all_names) "Strata contains $temp_strat_default ! Please change temp_strat_default to a different symbol or rename offending object." + @assert all(x -> temp_strat_default ∉ keys(x), type_all_names) "Type contains $temp_strat_default ! Please change temp_strat_default to a different symbol or rename offending object." + @assert all(x -> temp_strat_default ∉ keys(x), aggregate_all_names) "Aggregate contains $temp_strat_default ! Please change temp_strat_default to a different symbol or rename offending object." + map(x -> (push!(x, (temp_strat_default => -1))), [strata_snames, strata_svnames, strata_vnames, strata_fnames, strata_pnames]) + map(x -> (push!(x, (temp_strat_default => -1))), [type_snames, type_svnames, type_vnames, type_fnames, type_pnames]) + map(x -> (push!(x, (temp_strat_default => -1))), [aggregate_snames, aggregate_svnames, aggregate_vnames, aggregate_fnames, aggregate_pnames]) + end # STEP 2 current_phase = (_, _) -> () for statement in block.args @match statement begin QuoteNode(:stocks) => begin - current_phase = s -> read_stratification_line_and_update_dictionaries!(s, strata_snames, type_snames, aggregate_snames, strata_stock_mappings_dict, aggregate_stock_mappings_dict) + current_phase = s -> read_stratification_line_and_update_dictionaries!(s, strata_snames, type_snames, aggregate_snames, strata_stock_mappings_dict, aggregate_stock_mappings_dict; strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:parameters) => begin - current_phase = p -> read_stratification_line_and_update_dictionaries!(p, strata_pnames, type_pnames, aggregate_pnames, strata_param_mappings_dict, aggregate_param_mappings_dict) + current_phase = p -> read_stratification_line_and_update_dictionaries!(p, strata_pnames, type_pnames, aggregate_pnames, strata_param_mappings_dict, aggregate_param_mappings_dict; strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:dynamic_variables) => begin - current_phase = v -> read_stratification_line_and_update_dictionaries!(v, strata_vnames, type_vnames, aggregate_vnames, strata_dyvar_mappings_dict, aggregate_dyvar_mappings_dict) + current_phase = v -> read_stratification_line_and_update_dictionaries!(v, strata_vnames, type_vnames, aggregate_vnames, strata_dyvar_mappings_dict, aggregate_dyvar_mappings_dict; strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:flows) => begin - current_phase = f -> read_stratification_line_and_update_dictionaries!(f, strata_fnames, type_fnames, aggregate_fnames, strata_flow_mappings_dict, aggregate_flow_mappings_dict) + current_phase = f -> read_stratification_line_and_update_dictionaries!(f, strata_fnames, type_fnames, aggregate_fnames, strata_flow_mappings_dict, aggregate_flow_mappings_dict; strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:sums) => begin - current_phase = sv -> read_stratification_line_and_update_dictionaries!(sv, strata_svnames, type_svnames, aggregate_svnames, strata_sum_mappings_dict, aggregate_sum_mappings_dict) + current_phase = sv -> read_stratification_line_and_update_dictionaries!(sv, strata_svnames, type_svnames, aggregate_svnames, strata_sum_mappings_dict, aggregate_sum_mappings_dict; strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(kw) => error("Unknown block type for stratify syntax: " * String(kw)) @@ -185,7 +180,7 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA # STEP 3 - if !STRICT_MAPPINGS + if !strict_mappings one_type_stock = length(snames(type)) == 1 ? 1 : 0 # if there is only one stock, it needs to have index 1 one_type_flow = length(fnames(type)) == 1 ? 1 : 0 one_type_dyvar = length(vnames(type)) == 1 ? 1 : 0 @@ -280,7 +275,7 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA # STEP 8 pullback_model = pullback(strata_to_type, aggregate_to_type) |> apex |> rebuildStratifiedModelByFlattenSymbols; - if RETURN_HOMS + if return_homs return pullback_model, strata_to_type, aggregate_to_type else return pullback_model From 725b9eac8a03d133b47cd9a41b1a56fa004c29f3 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Fri, 1 Sep 2023 14:11:39 -0600 Subject: [PATCH 04/23] Added tests for flags. Changed capitalization of some names in docstrings. --- src/syntax/Stratification.jl | 4 +-- test/Stratification.jl | 64 ++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index b3020ce0..acfc540d 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -76,9 +76,9 @@ end 2a. Split each line into a dictionary which maps all strata to that type and all aggregate to that type 2b. Convert from two Symbol => Symbol dictionaries to two Int => Int dictionaries, using the dictionaries from step 1 2bα. If applicable, for symbols with temp_strat_default as a prefix, find all matching symbols in the symbol dictionaries, and map all those - 2c. Accumulate respective dictionaries (optionally, only allow first match vs throw an error (STRICT_MATCHES = false vs true)) + 2c. Accumulate respective dictionaries (optionally, only allow first match vs throw an error (strict_matches = false vs true)) 3. Create an array of 0s for stocks, flows, parameters, dyvars and sums for strata and aggregate. Insert into arrays all values from the two Int => Int dictionaries - 3a. If STRICT_MAPPINGS = false, if there only exists one option in type to map to, and it hasn't been explicitly specified, add it. If STRICT_MAPPINGS = true and it hasn't been specified, throw an error. + 3a. If strict_mappings = false, if there only exists one option in type to map to, and it hasn't been explicitly specified, add it. If strict_mappings = true and it hasn't been specified, throw an error. 4. Do a once-over of arrays and ensure there aren't any zeroes (unmapped values) remaining (helps with debugging when you screw up stratifying) 5. Deal with attributes (create a copy of type sf with attributes mapped to nothing) 6. Infer LS, LSV, etc., if possible. diff --git a/test/Stratification.jl b/test/Stratification.jl index 0c7ff151..2c3191d2 100755 --- a/test/Stratification.jl +++ b/test/Stratification.jl @@ -339,3 +339,67 @@ end end +@testset "nondefault flags work as expected" begin + A_ = (@stock_and_flow begin + :stocks + A + _ + end) + + X_ = (@stock_and_flow begin + :stocks + X + _ + end) + + B_ = (@stock_and_flow begin + :stocks + B + _ + end) + + strat_AXB = (quote + :stocks + _ => _ <= _ + A => X <= B + ~A => X <= ~B # everything is already assigned, so does nothing (or throws error if strict_matches is true) + end) + + + sfA = (@stock_and_flow begin; stocks; A; end;) + + @test (sfstratify(A_, X_, B_, strat_AXB, use_temp_strat_default=false) + == (@stock_and_flow begin + :stocks + AB + __ + end)) + + # doesn't show up anywhere, so doesn't affect anything. Could also set it to something untypable in the DSL, like Symbol("") + @test (sfstratify(A_, X_, B_, strat_AXB, temp_strat_default=:ABABABABA) + == (@stock_and_flow begin + :stocks + AB + __ + end)) + + @test_throws ErrorException (sfstratify(A_, X_, B_, strat_AXB, strict_matches=true) # A matches against A and ~A, which is disallowed with this flag. + == (@stock_and_flow begin + :stocks + AB + __ + end)) + + @test_throws ErrorException (sfstratify(sfA,sfA,sfA,(quote end), strict_mappings=true)) # strict_mappings=false wouldn't throw an error, and would infer strata and aggregate need to map to the only stock. + + @test (sfstratify(sfA,sfA,sfA,(quote end), return_homs=true) == ( + (@stock_and_flow begin + :stocks + AA + end), + ACSetTransformation(sfA, sfA, S=[1], Position=NothingFunction, Op=NothingFunction, Name=NothingFunction), # strata -> type + ACSetTransformation(sfA, sfA, S=[1], Position=NothingFunction, Op=NothingFunction, Name=NothingFunction) # aggregate -> type + )) + +end + From 51618931ea870209cd726ca350657842897565ae Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Fri, 1 Sep 2023 14:32:49 -0600 Subject: [PATCH 05/23] homomorphisms in test now defined from SfA -> sfA with attributes mapped to nothing --- test/Stratification.jl | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/test/Stratification.jl b/test/Stratification.jl index 2c3191d2..f9f1d48d 100755 --- a/test/Stratification.jl +++ b/test/Stratification.jl @@ -366,7 +366,7 @@ end end) - sfA = (@stock_and_flow begin; stocks; A; end;) + sfA = (@stock_and_flow begin; :stocks; A; end;) @test (sfstratify(A_, X_, B_, strat_AXB, use_temp_strat_default=false) == (@stock_and_flow begin @@ -383,23 +383,20 @@ end __ end)) - @test_throws ErrorException (sfstratify(A_, X_, B_, strat_AXB, strict_matches=true) # A matches against A and ~A, which is disallowed with this flag. - == (@stock_and_flow begin - :stocks - AB - __ - end)) + @test_throws AssertionError (sfstratify(A_, X_, B_, strat_AXB, strict_matches=true)) # A matches against A and ~A, which is disallowed with this flag. @test_throws ErrorException (sfstratify(sfA,sfA,sfA,(quote end), strict_mappings=true)) # strict_mappings=false wouldn't throw an error, and would infer strata and aggregate need to map to the only stock. + nothing_sfA = map(sfA, Position=NothingFunction, Op=NothingFunction, Name=NothingFunction) + @test (sfstratify(sfA,sfA,sfA,(quote end), return_homs=true) == ( (@stock_and_flow begin :stocks AA end), - ACSetTransformation(sfA, sfA, S=[1], Position=NothingFunction, Op=NothingFunction, Name=NothingFunction), # strata -> type - ACSetTransformation(sfA, sfA, S=[1], Position=NothingFunction, Op=NothingFunction, Name=NothingFunction) # aggregate -> type - )) + ACSetTransformation(sfA, nothing_sfA ; S=[1], F=Vector{Int}(),V =Vector{Int}(),SV=Vector{Int}(),P=Vector{Int}(),LS=Vector{Int}(),I=Vector{Int}(),O=Vector{Int}(),LV=Vector{Int}(),LSV=Vector{Int}(),LVV=Vector{Int}(),LPV=Vector{Int}(), Position=NothingFunction, Op=NothingFunction, Name=NothingFunction), # strata -> type + ACSetTransformation(sfA, nothing_sfA ; S=[1], F=Vector{Int}(),V =Vector{Int}(),SV=Vector{Int}(),P=Vector{Int}(),LS=Vector{Int}(),I=Vector{Int}(),O=Vector{Int}(),LV=Vector{Int}(),LSV=Vector{Int}(),LVV=Vector{Int}(),LPV=Vector{Int}(), Position=NothingFunction, Op=NothingFunction, Name=NothingFunction) # aggregate -> type + )) # the empty lists are necessary for equality, but it'd still be an equivalent homomorphism if you didn't specify them. end From ae267f53b87e960a4bd636d94c77de9b9f957533 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Fri, 1 Sep 2023 14:54:51 -0600 Subject: [PATCH 06/23] Created print_unmapped to stratification, which prints all values which are unmapped. Was previously two separate loops. --- src/syntax/Stratification.jl | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index acfc540d..1abe0e10 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -65,7 +65,16 @@ function read_stratification_line_and_update_dictionaries!(line::Expr, strata_na end - +function print_unmapped(mappings, name="STOCKFLOW") + for (ints, dicts) in mappings + for (i, val) in enumerate(ints) + if val == 0 + println("UNMAPPED IN $(name):") + println(dicts[i]) + end + end + end +end """ sfstratify(strata, type, aggregate, block ; kwargs) @@ -221,22 +230,8 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA #unmapped: if !(all(x -> x != 0, all_mappings)) - for (ints, dicts) in strata_mappings - for (i, val) in enumerate(ints) - if val == 0 - println("UNMAPPED IN STRATA:") - println(dicts[i]) - end - end - end - for (ints, dicts) in aggregate_mappings - for (i, val) in enumerate(ints) - if val == 0 - println("UNMAPPED IN AGGREGATE:") - println(dicts[i]) - end - end - end + print_unmapped(strata_mappings, "STRATA") + print_unmapped(aggregate_mappings, "AGGREGATE") error("There is an unmapped value!") end From 96347b2aa6792483aea53a94e2e725146ca33cc1 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Fri, 1 Sep 2023 15:48:36 -0600 Subject: [PATCH 07/23] Factored out iteration over stratification lines. Removed some unnecessary variables. Additional type annotations. --- src/syntax/Stratification.jl | 89 +++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index 1abe0e10..ca74355f 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -28,8 +28,8 @@ function interpret_stratification_notation(mapping_pair::Expr)::Tuple{Vector{DSL end @match mapping_pair.args[middle_index] begin :($stail => $t <= $ahead) => begin - sdict = [[DSLArgument(ss, t) for ss in mapping_pair.args[1:middle_index-1]] ; DSLArgument(stail, t)] - adict = [DSLArgument(ahead, t) ; [DSLArgument(as, t) for as in mapping_pair.args[middle_index+1:end]]] + sdict = [[DSLArgument(ss, t) for ss in mapping_pair.args[1:middle_index-1]] ; DSLArgument(stail, t)] + adict = [DSLArgument(ahead, t) ; [DSLArgument(as, t) for as in mapping_pair.args[middle_index+1:end]]] return (sdict, adict) end _ => "Unknown format found for match; middle three values formatted incorrectly." @@ -64,8 +64,10 @@ function read_stratification_line_and_update_dictionaries!(line::Expr, strata_na end +""" -function print_unmapped(mappings, name="STOCKFLOW") +""" +function print_unmapped(mappings::Vector{Pair{Vector{Int}, Vector{Symbol}}}, name="STOCKFLOW") for (ints, dicts) in mappings for (i, val) in enumerate(ints) if val == 0 @@ -76,6 +78,36 @@ function print_unmapped(mappings, name="STOCKFLOW") end end +""" +Iterates over each line in a stratification quoteblock and updates the appropriate dictionaries +""" +function iterate_over_stratification_lines!(block, strata_names, type_names, aggregate_names, strata_mappings, aggregate_mappings; strict_matches=false, use_flags=true) + current_phase = (_, _) -> () + for statement in block.args + @match statement begin + QuoteNode(:stocks) => begin + current_phase = s -> read_stratification_line_and_update_dictionaries!(s, strata_names[1], type_names[1], aggregate_names[1], strata_mappings[1], aggregate_mappings[1]; strict_matches=strict_matches, use_flags=use_flags) + end + QuoteNode(:sums) => begin + current_phase = sv -> read_stratification_line_and_update_dictionaries!(sv, strata_names[2], type_names[2], aggregate_names[2], strata_mappings[2], aggregate_mappings[2]; strict_matches=strict_matches, use_flags=use_flags) + end + QuoteNode(:dynamic_variables) => begin + current_phase = v -> read_stratification_line_and_update_dictionaries!(v, strata_names[3], type_names[3], aggregate_names[3], strata_mappings[3], aggregate_mappings[3]; strict_matches=strict_matches, use_flags=use_flags) + end + QuoteNode(:flows) => begin + current_phase = f -> read_stratification_line_and_update_dictionaries!(f, strata_names[4], type_names[4], aggregate_names[4], strata_mappings[4], aggregate_mappings[4]; strict_matches=strict_matches, use_flags=use_flags) + end + QuoteNode(:parameters) => begin + current_phase = p -> read_stratification_line_and_update_dictionaries!(p, strata_names[5], type_names[5], aggregate_names[5], strata_mappings[5], aggregate_mappings[5]; strict_matches=strict_matches, use_flags=use_flags) + end + QuoteNode(kw) => + error("Unknown block type for stratify syntax: " * String(kw)) + _ => current_phase(statement) + end + end +end + + """ sfstratify(strata, type, aggregate, block ; kwargs) @@ -107,7 +139,7 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA strata_fnames::Dict{Symbol, Int} = invert_vector(fnames(strata)) strata_pnames::Dict{Symbol, Int} = invert_vector(pnames(strata)) - type_snames::Dict{Symbol, Int} = invert_vector(snames(type)) + type_snames::Dict{Symbol, Int} = invert_vector(snames(type)) type_svnames::Dict{Symbol, Int} = invert_vector(svnames(type)) type_vnames::Dict{Symbol, Int} = invert_vector(vnames(type)) type_fnames::Dict{Symbol, Int} = invert_vector(fnames(type)) @@ -133,45 +165,28 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA aggregate_sum_mappings_dict::Dict{Int, Int} = Dict() - strata_all_names = [snames(strata), svnames(strata), vnames(strata), fnames(strata), pnames(strata)] - type_all_names = [snames(type), svnames(type), vnames(type), fnames(type), pnames(type)] - aggregate_all_names = [snames(aggregate), svnames(aggregate), vnames(aggregate), fnames(aggregate), pnames(aggregate)] + strata_all_name_mappings::Vector{Dict{Symbol, Int}} = [strata_snames, strata_svnames, strata_vnames, strata_fnames, strata_pnames] + type_all_name_mappings::Vector{Dict{Symbol, Int}} = [type_snames, type_svnames, type_vnames, type_fnames, type_pnames] + aggregate_all_name_mappings::Vector{Dict{Symbol, Int}} = [aggregate_snames, aggregate_svnames, aggregate_vnames, aggregate_fnames, aggregate_pnames] + + strata_all_index_mappings = [strata_stock_mappings_dict, strata_sum_mappings_dict, strata_dyvar_mappings_dict, strata_flow_mappings_dict, strata_param_mappings_dict] + aggregate_all_index_mappings = [aggregate_stock_mappings_dict, aggregate_sum_mappings_dict, aggregate_dyvar_mappings_dict, aggregate_flow_mappings_dict, aggregate_param_mappings_dict] + if use_temp_strat_default + + strata_all_names::Vector{Vector{Symbol}} = [snames(strata), svnames(strata), vnames(strata), fnames(strata), pnames(strata)] + aggregate_all_names::Vector{Vector{Symbol}} = [snames(aggregate), svnames(aggregate), vnames(aggregate), fnames(aggregate), pnames(aggregate)] + @assert all(x -> temp_strat_default ∉ keys(x), strata_all_names) "Strata contains $temp_strat_default ! Please change temp_strat_default to a different symbol or rename offending object." - @assert all(x -> temp_strat_default ∉ keys(x), type_all_names) "Type contains $temp_strat_default ! Please change temp_strat_default to a different symbol or rename offending object." @assert all(x -> temp_strat_default ∉ keys(x), aggregate_all_names) "Aggregate contains $temp_strat_default ! Please change temp_strat_default to a different symbol or rename offending object." - map(x -> (push!(x, (temp_strat_default => -1))), [strata_snames, strata_svnames, strata_vnames, strata_fnames, strata_pnames]) - map(x -> (push!(x, (temp_strat_default => -1))), [type_snames, type_svnames, type_vnames, type_fnames, type_pnames]) - map(x -> (push!(x, (temp_strat_default => -1))), [aggregate_snames, aggregate_svnames, aggregate_vnames, aggregate_fnames, aggregate_pnames]) + map(x -> (push!(x, (temp_strat_default => -1))), strata_all_name_mappings) + map(x -> (push!(x, (temp_strat_default => -1))), aggregate_all_name_mappings) end # STEP 2 - current_phase = (_, _) -> () - for statement in block.args - @match statement begin - QuoteNode(:stocks) => begin - current_phase = s -> read_stratification_line_and_update_dictionaries!(s, strata_snames, type_snames, aggregate_snames, strata_stock_mappings_dict, aggregate_stock_mappings_dict; strict_matches=strict_matches, use_flags=use_flags) - end - QuoteNode(:parameters) => begin - current_phase = p -> read_stratification_line_and_update_dictionaries!(p, strata_pnames, type_pnames, aggregate_pnames, strata_param_mappings_dict, aggregate_param_mappings_dict; strict_matches=strict_matches, use_flags=use_flags) - end - QuoteNode(:dynamic_variables) => begin - current_phase = v -> read_stratification_line_and_update_dictionaries!(v, strata_vnames, type_vnames, aggregate_vnames, strata_dyvar_mappings_dict, aggregate_dyvar_mappings_dict; strict_matches=strict_matches, use_flags=use_flags) - end - QuoteNode(:flows) => begin - current_phase = f -> read_stratification_line_and_update_dictionaries!(f, strata_fnames, type_fnames, aggregate_fnames, strata_flow_mappings_dict, aggregate_flow_mappings_dict; strict_matches=strict_matches, use_flags=use_flags) - end - - QuoteNode(:sums) => begin - current_phase = sv -> read_stratification_line_and_update_dictionaries!(sv, strata_svnames, type_svnames, aggregate_svnames, strata_sum_mappings_dict, aggregate_sum_mappings_dict; strict_matches=strict_matches, use_flags=use_flags) - end - QuoteNode(kw) => - error("Unknown block type for stratify syntax: " * String(kw)) - _ => current_phase(statement) - end - end + iterate_over_stratification_lines!(block, strata_all_name_mappings, type_all_name_mappings, aggregate_all_name_mappings, strata_all_index_mappings, aggregate_all_index_mappings ; strict_matches=strict_matches, use_flags=use_flags) # get the default value, if it has been assigned. Use 0 if it hasn't. @@ -223,8 +238,8 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA all_mappings = [strata_stock_mappings..., strata_flow_mappings..., strata_dyvar_mappings..., strata_param_mappings..., strata_sum_mappings..., aggregate_stock_mappings..., aggregate_flow_mappings..., aggregate_dyvar_mappings..., aggregate_param_mappings..., aggregate_sum_mappings...] - strata_mappings = [strata_stock_mappings => snames(strata), strata_flow_mappings => fnames(strata), strata_dyvar_mappings => vnames(strata), strata_param_mappings => pnames(strata), strata_sum_mappings => svnames(strata)] - aggregate_mappings = [aggregate_stock_mappings => snames(aggregate), aggregate_flow_mappings => fnames(aggregate), aggregate_dyvar_mappings => vnames(aggregate), aggregate_param_mappings => pnames(aggregate), aggregate_sum_mappings => svnames(aggregate)] + strata_mappings::Vector{Pair{Vector{Int}, Vector{Symbol}}} = [strata_stock_mappings => snames(strata), strata_flow_mappings => fnames(strata), strata_dyvar_mappings => vnames(strata), strata_param_mappings => pnames(strata), strata_sum_mappings => svnames(strata)] + aggregate_mappings::Vector{Pair{Vector{Int}, Vector{Symbol}}} = [aggregate_stock_mappings => snames(aggregate), aggregate_flow_mappings => fnames(aggregate), aggregate_dyvar_mappings => vnames(aggregate), aggregate_param_mappings => pnames(aggregate), aggregate_sum_mappings => svnames(aggregate)] # STEP 4 From 4e98b9ffba1d5b791f919c4c9713460e81a9212e Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Fri, 1 Sep 2023 16:22:52 -0600 Subject: [PATCH 08/23] Factored out converting mappings to Vector{Int} --- src/syntax/Stratification.jl | 121 +++++++++++++++++++---------------- 1 file changed, 67 insertions(+), 54 deletions(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index ca74355f..f022e909 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -65,7 +65,7 @@ function read_stratification_line_and_update_dictionaries!(line::Expr, strata_na end """ - +Print all symbols such that the corresponding int is 0, representing an unmapped object. """ function print_unmapped(mappings::Vector{Pair{Vector{Int}, Vector{Symbol}}}, name="STOCKFLOW") for (ints, dicts) in mappings @@ -79,7 +79,7 @@ function print_unmapped(mappings::Vector{Pair{Vector{Int}, Vector{Symbol}}}, nam end """ -Iterates over each line in a stratification quoteblock and updates the appropriate dictionaries +Iterates over each line in a stratification quoteblock and updates the appropriate dictionaries. """ function iterate_over_stratification_lines!(block, strata_names, type_names, aggregate_names, strata_mappings, aggregate_mappings; strict_matches=false, use_flags=true) current_phase = (_, _) -> () @@ -107,6 +107,59 @@ function iterate_over_stratification_lines!(block, strata_names, type_names, agg end end +""" +Apply default mappings, infer mapping if there's only a single option, and convert from Dict{Int, Int} to vector{Int} +""" +function complete_mappings(strata_all_index_mappings::Vector{Dict{Int, Int}}, aggregate_all_index_mappings::Vector{Dict{Int, Int}}, sfstrata::AbstractStockAndFlowF, sftype::AbstractStockAndFlowF, sfaggregate::AbstractStockAndFlowF; strict_mappings = false) + # get the default value, if it has been assigned. Use 0 if it hasn't. + default_index_strata_stock = get(strata_all_index_mappings[1], -1, 0) + default_index_strata_sum = get(strata_all_index_mappings[2], -1, 0) + default_index_strata_dyvar = get(strata_all_index_mappings[3], -1, 0) + default_index_strata_flow = get(strata_all_index_mappings[4], -1, 0) + default_index_strata_param = get(strata_all_index_mappings[5], -1, 0) + + default_index_aggregate_stock = get(aggregate_all_index_mappings[1], -1, 0) + default_index_aggregate_sum = get(aggregate_all_index_mappings[2], -1, 0) + default_index_aggregate_dyvar = get(aggregate_all_index_mappings[3], -1, 0) + default_index_aggregate_flow = get(aggregate_all_index_mappings[4], -1, 0) + default_index_aggregate_param = get(aggregate_all_index_mappings[5], -1, 0) + + + # STEP 3 + if !strict_mappings + one_type_stock = length(snames(sftype)) == 1 ? 1 : 0 # if there is only one stock, it needs to have index 1 + one_type_flow = length(fnames(sftype)) == 1 ? 1 : 0 + one_type_dyvar = length(vnames(sftype)) == 1 ? 1 : 0 + one_type_param = length(pnames(sftype)) == 1 ? 1 : 0 + one_type_sum = length(svnames(sftype)) == 1 ? 1 : 0 + else + one_type_stock = one_type_flow = one_type_dyvar = one_type_param = one_type_sum = 0 + end + + # Convert back to vectors. If you find a zero, check if there's a default and use that. If there isn't a default, check if there's only one option and use that. + # Otherwise, there's an unassigned value which can't be inferred. + # Taking max because it's less verbose than ternary and accomplishes the same thing: + # - If both default_index and one_type are mapped, they must be mapped to the same thing, because one_type being mapped implies there's only one option. + # - If only one_type is mapped, then it will be positive, and default_infex will be 0 + # - If only default_index is mapped, it will be positive and one_type will be 0 + + strata_stock_mappings::Vector{Int} = [get(strata_all_index_mappings[1], i, max(default_index_strata_stock, one_type_stock)) for i in 1:ns(sfstrata)] + strata_sum_mappings::Vector{Int} = [get(strata_all_index_mappings[2], i, max(default_index_strata_sum, one_type_sum)) for i in 1:nsv(sfstrata)] + strata_dyvar_mappings::Vector{Int} = [get(strata_all_index_mappings[3], i, max(default_index_strata_dyvar, one_type_dyvar)) for i in 1:nvb(sfstrata)] + strata_flow_mappings::Vector{Int} = [get(strata_all_index_mappings[4], i, max(default_index_strata_flow, one_type_flow)) for i in 1:nf(sfstrata)] + strata_param_mappings::Vector{Int} = [get(strata_all_index_mappings[5], i, max(default_index_strata_param, one_type_param)) for i in 1:np(sfstrata)] + + aggregate_stock_mappings::Vector{Int} = [get(aggregate_all_index_mappings[1], i, max(default_index_aggregate_stock, one_type_stock)) for i in 1:ns(sfaggregate)] + aggregate_sum_mappings::Vector{Int} = [get(aggregate_all_index_mappings[2], i, max(default_index_aggregate_sum, one_type_sum)) for i in 1:nsv(sfaggregate)] + aggregate_dyvar_mappings::Vector{Int} = [get(aggregate_all_index_mappings[3], i, max(default_index_aggregate_dyvar, one_type_dyvar)) for i in 1:nvb(sfaggregate)] + aggregate_flow_mappings::Vector{Int} = [get(aggregate_all_index_mappings[4], i, max(default_index_aggregate_flow, one_type_flow)) for i in 1:nf(sfaggregate)] + aggregate_param_mappings::Vector{Int} = [get(aggregate_all_index_mappings[5], i, max(default_index_aggregate_param, one_type_param)) for i in 1:np(sfaggregate)] + + + return ((strata_stock_mappings, strata_sum_mappings, strata_dyvar_mappings, strata_flow_mappings, strata_param_mappings), (aggregate_stock_mappings, aggregate_sum_mappings, aggregate_dyvar_mappings, aggregate_flow_mappings, aggregate_param_mappings)) +end + + """ sfstratify(strata, type, aggregate, block ; kwargs) @@ -169,8 +222,8 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA type_all_name_mappings::Vector{Dict{Symbol, Int}} = [type_snames, type_svnames, type_vnames, type_fnames, type_pnames] aggregate_all_name_mappings::Vector{Dict{Symbol, Int}} = [aggregate_snames, aggregate_svnames, aggregate_vnames, aggregate_fnames, aggregate_pnames] - strata_all_index_mappings = [strata_stock_mappings_dict, strata_sum_mappings_dict, strata_dyvar_mappings_dict, strata_flow_mappings_dict, strata_param_mappings_dict] - aggregate_all_index_mappings = [aggregate_stock_mappings_dict, aggregate_sum_mappings_dict, aggregate_dyvar_mappings_dict, aggregate_flow_mappings_dict, aggregate_param_mappings_dict] + strata_all_index_mappings::Vector{Dict{Int, Int}} = [strata_stock_mappings_dict, strata_sum_mappings_dict, strata_dyvar_mappings_dict, strata_flow_mappings_dict, strata_param_mappings_dict] + aggregate_all_index_mappings::Vector{Dict{Int, Int}} = [aggregate_stock_mappings_dict, aggregate_sum_mappings_dict, aggregate_dyvar_mappings_dict, aggregate_flow_mappings_dict, aggregate_param_mappings_dict] if use_temp_strat_default @@ -189,64 +242,24 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA iterate_over_stratification_lines!(block, strata_all_name_mappings, type_all_name_mappings, aggregate_all_name_mappings, strata_all_index_mappings, aggregate_all_index_mappings ; strict_matches=strict_matches, use_flags=use_flags) - # get the default value, if it has been assigned. Use 0 if it hasn't. - default_index_strata_stock = get(strata_stock_mappings_dict, -1, 0) - default_index_strata_flow = get(strata_flow_mappings_dict, -1, 0) - default_index_strata_dyvar = get(strata_dyvar_mappings_dict, -1, 0) - default_index_strata_param = get(strata_param_mappings_dict, -1, 0) - default_index_strata_sum = get(strata_sum_mappings_dict, -1, 0) - - default_index_aggregate_stock = get(aggregate_stock_mappings_dict, -1, 0) - default_index_aggregate_flow = get(aggregate_flow_mappings_dict, -1, 0) - default_index_aggregate_dyvar = get(aggregate_dyvar_mappings_dict, -1, 0) - default_index_aggregate_param = get(aggregate_param_mappings_dict, -1, 0) - default_index_aggregate_sum = get(aggregate_sum_mappings_dict, -1, 0) - - - # STEP 3 - if !strict_mappings - one_type_stock = length(snames(type)) == 1 ? 1 : 0 # if there is only one stock, it needs to have index 1 - one_type_flow = length(fnames(type)) == 1 ? 1 : 0 - one_type_dyvar = length(vnames(type)) == 1 ? 1 : 0 - one_type_param = length(pnames(type)) == 1 ? 1 : 0 - one_type_sum = length(svnames(type)) == 1 ? 1 : 0 - else - one_type_stock = one_type_flow = one_type_dyvar = one_type_param = one_type_sum = 0 - end - - # Convert back to vectors. If you find a zero, check if there's a default and use that. If there isn't a default, check if there's only one option and use that. - # Otherwise, there's an unassigned value which can't be inferred. - # Taking max because it's less verbose than ternary and accomplishes the same thing: - # - If both default_index and one_type are mapped, they must be mapped to the same thing, because one_type being mapped implies there's only one option. - # - If only one_type is mapped, then it will be positive, and default_infex will be 0 - # - If only default_index is mapped, it will be positive and one_type will be 0 - - strata_stock_mappings::Vector{Int} = [get(strata_stock_mappings_dict, i, max(default_index_strata_stock, one_type_stock)) for i in 1:ns(strata)] - strata_flow_mappings::Vector{Int} = [get(strata_flow_mappings_dict, i, max(default_index_strata_flow, one_type_flow)) for i in 1:nf(strata)] - strata_dyvar_mappings::Vector{Int} = [get(strata_dyvar_mappings_dict, i, max(default_index_strata_dyvar, one_type_dyvar)) for i in 1:nvb(strata)] - strata_param_mappings::Vector{Int} = [get(strata_param_mappings_dict, i, max(default_index_strata_param, one_type_param)) for i in 1:np(strata)] - strata_sum_mappings::Vector{Int} = [get(strata_sum_mappings_dict, i, max(default_index_strata_sum, one_type_sum)) for i in 1:nsv(strata)] - - aggregate_stock_mappings::Vector{Int} = [get(aggregate_stock_mappings_dict, i, max(default_index_aggregate_stock, one_type_stock)) for i in 1:ns(aggregate)] - aggregate_flow_mappings::Vector{Int} = [get(aggregate_flow_mappings_dict, i, max(default_index_aggregate_flow, one_type_flow)) for i in 1:nf(aggregate)] - aggregate_dyvar_mappings::Vector{Int} = [get(aggregate_dyvar_mappings_dict, i, max(default_index_aggregate_dyvar, one_type_dyvar)) for i in 1:nvb(aggregate)] - aggregate_param_mappings::Vector{Int} = [get(aggregate_param_mappings_dict, i, max(default_index_aggregate_param, one_type_param)) for i in 1:np(aggregate)] - aggregate_sum_mappings::Vector{Int} = [get(aggregate_sum_mappings_dict, i, max(default_index_aggregate_sum, one_type_sum)) for i in 1:nsv(aggregate)] - + strata_mappings, aggregate_mappings = complete_mappings(strata_all_index_mappings, aggregate_all_index_mappings, strata, type, aggregate ; strict_mappings=strict_mappings) + strata_stock_mappings, strata_sum_mappings, strata_dyvar_mappings, strata_flow_mappings, strata_param_mappings = strata_mappings + aggregate_stock_mappings, aggregate_sum_mappings, aggregate_dyvar_mappings, aggregate_flow_mappings, aggregate_param_mappings = aggregate_mappings - # This bit is a bit verbose, but makes debugging when making a stratification easier. Tells you exactly which ones you forgot to map. all_mappings = [strata_stock_mappings..., strata_flow_mappings..., strata_dyvar_mappings..., strata_param_mappings..., strata_sum_mappings..., aggregate_stock_mappings..., aggregate_flow_mappings..., aggregate_dyvar_mappings..., aggregate_param_mappings..., aggregate_sum_mappings...] - strata_mappings::Vector{Pair{Vector{Int}, Vector{Symbol}}} = [strata_stock_mappings => snames(strata), strata_flow_mappings => fnames(strata), strata_dyvar_mappings => vnames(strata), strata_param_mappings => pnames(strata), strata_sum_mappings => svnames(strata)] - aggregate_mappings::Vector{Pair{Vector{Int}, Vector{Symbol}}} = [aggregate_stock_mappings => snames(aggregate), aggregate_flow_mappings => fnames(aggregate), aggregate_dyvar_mappings => vnames(aggregate), aggregate_param_mappings => pnames(aggregate), aggregate_sum_mappings => svnames(aggregate)] - + # STEP 4 + # This bit makes debugging when making a stratification easier. Tells you exactly which ones you forgot to map. + #unmapped: if !(all(x -> x != 0, all_mappings)) - print_unmapped(strata_mappings, "STRATA") - print_unmapped(aggregate_mappings, "AGGREGATE") + strata_mappings_to_names::Vector{Pair{Vector{Int}, Vector{Symbol}}} = [strata_stock_mappings => snames(strata), strata_flow_mappings => fnames(strata), strata_dyvar_mappings => vnames(strata), strata_param_mappings => pnames(strata), strata_sum_mappings => svnames(strata)] + aggregate_mappings_to_names::Vector{Pair{Vector{Int}, Vector{Symbol}}} = [aggregate_stock_mappings => snames(aggregate), aggregate_flow_mappings => fnames(aggregate), aggregate_dyvar_mappings => vnames(aggregate), aggregate_param_mappings => pnames(aggregate), aggregate_sum_mappings => svnames(aggregate)] + print_unmapped(strata_mappings_to_names, "STRATA") + print_unmapped(aggregate_mappings_to_names, "AGGREGATE") error("There is an unmapped value!") end From 181327570fe696f221aba4c27ca23f191f35068e Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Fri, 1 Sep 2023 16:48:05 -0600 Subject: [PATCH 09/23] Minor docstring and formatting fixes --- src/syntax/Stratification.jl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index f022e909..0c1f103f 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -41,7 +41,9 @@ end - +""" +Gets mapping information from each line and updates dictionaries. If a symbol already has a mapping and another is found, keep the first, or throw an error if strict_matches = true. +""" function read_stratification_line_and_update_dictionaries!(line::Expr, strata_names::Dict{Symbol, Int}, type_names::Dict{Symbol, Int}, aggregate_names::Dict{Symbol, Int}, strata_mappings::Dict{Int, Int}, aggregate_mappings::Dict{Int, Int} ; strict_matches = false, use_flags = true) current_strata_symbol_dict, current_aggregate_symbol_dict = interpret_stratification_notation(line) @@ -108,7 +110,7 @@ function iterate_over_stratification_lines!(block, strata_names, type_names, agg end """ -Apply default mappings, infer mapping if there's only a single option, and convert from Dict{Int, Int} to vector{Int} +Apply default mappings, infer mapping if there's only a single option, and convert from Dict{Int, Int} to Vector{Int} """ function complete_mappings(strata_all_index_mappings::Vector{Dict{Int, Int}}, aggregate_all_index_mappings::Vector{Dict{Int, Int}}, sfstrata::AbstractStockAndFlowF, sftype::AbstractStockAndFlowF, sfaggregate::AbstractStockAndFlowF; strict_mappings = false) # get the default value, if it has been assigned. Use 0 if it hasn't. @@ -160,7 +162,6 @@ function complete_mappings(strata_all_index_mappings::Vector{Dict{Int, Int}}, ag end - """ sfstratify(strata, type, aggregate, block ; kwargs) @@ -243,6 +244,7 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA strata_mappings, aggregate_mappings = complete_mappings(strata_all_index_mappings, aggregate_all_index_mappings, strata, type, aggregate ; strict_mappings=strict_mappings) + strata_stock_mappings, strata_sum_mappings, strata_dyvar_mappings, strata_flow_mappings, strata_param_mappings = strata_mappings aggregate_stock_mappings, aggregate_sum_mappings, aggregate_dyvar_mappings, aggregate_flow_mappings, aggregate_param_mappings = aggregate_mappings From 0e92feec5cfa8936eecb4a53314e65aa8f227c09 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Fri, 1 Sep 2023 18:17:27 -0600 Subject: [PATCH 10/23] Fixed an unfinished docstring in Syntax.jl. Created a @stratify macro and replaced a few sfstratify calls in the test file with the macro call. --- src/Syntax.jl | 4 ++-- src/syntax/Stratification.jl | 46 ++++++++++++++++++++++++++++++++++-- test/Stratification.jl | 15 ++++++------ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/Syntax.jl b/src/Syntax.jl index 973a74e9..60b3b1b0 100644 --- a/src/Syntax.jl +++ b/src/Syntax.jl @@ -1170,7 +1170,7 @@ end """ Takes a symbol 'key', applys flags, finds matches in s, and returns a vector of matching keys. -Currently, there are two options: no flags, in which case [key] is returned, or ~ is the only flag, in which case +Currently, there are two options: no flags, in which case [key] is returned, or ~ is the only flag, in which case all Symbols with matching substrings are returned. """ function apply_flags(key::Symbol, flags::Set{Symbol}, s::Vector{Symbol})::Vector{Symbol} # Could make this a generator? @@ -1229,7 +1229,7 @@ end Takes any arguments and returns nothing. Used so we can maintain equality when making ACSetTransformations. """ -NothingFunction(x...) = nothing; +NothingFunction(x...)::Nothing = nothing; diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index 0c1f103f..e7dcd69e 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -1,5 +1,5 @@ module Stratification -export sfstratify +export sfstratify, @stratify using ...StockFlow using ..Syntax @@ -308,8 +308,50 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA end +""" + stratify(strata, type, aggregate, block) +Take three stockflows and a quote block describing where the first and third map on to the second, and get a new stratified stockflow. +Left side are strata objects, middle are type, right are aggregate. Each strata and aggregate object is associated with one type object. +The resultant stockflow contains objects which are the product of strata and aggregate objects which map to the same type object. +Use _ to match all objects in that category, ~ as a prefix to match all objects with the following string as a substring. Objects always go with their first match. +If the type model has a single object in a category, the mapping to it is automatically assumed. In the below example, we wouldn't need to specify :stocks or :sums. + +```julia + +@stratify WeightModel l_type ageWeightModel begin + :stocks + _ => pop <= _ + + :flows + ~Death => f_death <= ~Death + ~id => f_aging <= ~aging + ~Becoming => f_fstOrder <= ~id + _ => f_birth <= f_NB - + + :dynamic_variables + v_NewBorn => v_birth <= v_NB + ~Death => v_death <= ~Death + ~id => v_aging <= v_agingCA, v_agingAS + v_BecomingOverWeight, v_BecomingObese => v_fstOrder <= v_idC, v_idA, v_idS + + :parameters + μ => μ <= μ + δw, δo => δ <= δC, δA, δS + rw, ro => rFstOrder <= r + rage => rage <= rageCA, rageAS + + :sums + N => N <= N + +end +``` +""" +macro stratify(strata, type, aggregate, block) + quote + sfstratify($(esc(strata)), $(esc(type)), $(esc(aggregate)), $(esc(block))) + end +end end \ No newline at end of file diff --git a/test/Stratification.jl b/test/Stratification.jl index f9f1d48d..3d54389a 100755 --- a/test/Stratification.jl +++ b/test/Stratification.jl @@ -179,7 +179,7 @@ using Catlab.CategoricalAlgebra # ######################################### - age_weight_2 = sfstratify(WeightModel, l_type, ageWeightModel, quote + age_weight_2 = @stratify WeightModel l_type ageWeightModel quote :stocks NormalWeight, OverWeight, Obese => pop <= Child, Adult, Senior @@ -204,10 +204,10 @@ using Catlab.CategoricalAlgebra :sums N => N <= N - end) + end ######################################### - age_weight_3 = sfstratify(WeightModel, l_type, ageWeightModel, quote + age_weight_3 = @stratify WeightModel l_type ageWeightModel quote :flows f_NewBorn => f_birth <= f_NB @@ -227,9 +227,9 @@ using Catlab.CategoricalAlgebra rage => rage <= rageCA, rageAS _ => rFstOrder <= _ - end) + end - age_weight_4 = sfstratify(WeightModel, l_type, ageWeightModel, quote + age_weight_4 = @stratify WeightModel l_type ageWeightModel quote :flows ~NO_MATCHES => f_birth <= ~NO_MATCHES @@ -252,7 +252,7 @@ using Catlab.CategoricalAlgebra rage => rage <= rageCA, rageAS _ => rFstOrder <= _ - end) + end @@ -385,7 +385,8 @@ end @test_throws AssertionError (sfstratify(A_, X_, B_, strat_AXB, strict_matches=true)) # A matches against A and ~A, which is disallowed with this flag. - @test_throws ErrorException (sfstratify(sfA,sfA,sfA,(quote end), strict_mappings=true)) # strict_mappings=false wouldn't throw an error, and would infer strata and aggregate need to map to the only stock. + @test_throws ErrorException (sfstratify(sfA,sfA,sfA,(quote end) ; strict_mappings=true)) # strict_mappings=false wouldn't throw an error, and would infer strata and aggregate need to map to the only stock. + nothing_sfA = map(sfA, Position=NothingFunction, Op=NothingFunction, Name=NothingFunction) From 46c1a480109e44a31e660fb0d27d9d60097a740d Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Tue, 5 Sep 2023 21:02:14 -0600 Subject: [PATCH 11/23] Changed @stratify so it now uses a begin end block instead of a quote end block. Minor docstring updates. --- src/syntax/Stratification.jl | 16 ++++++++-------- test/Stratification.jl | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index e7dcd69e..4235b2eb 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -81,7 +81,7 @@ function print_unmapped(mappings::Vector{Pair{Vector{Int}, Vector{Symbol}}}, nam end """ -Iterates over each line in a stratification quoteblock and updates the appropriate dictionaries. +Iterates over each line in a stratification syntax block and updates the appropriate dictionaries. """ function iterate_over_stratification_lines!(block, strata_names, type_names, aggregate_names, strata_mappings, aggregate_mappings; strict_matches=false, use_flags=true) current_phase = (_, _) -> () @@ -165,18 +165,17 @@ end """ sfstratify(strata, type, aggregate, block ; kwargs) - Ok, so the general idea here is: 1. Grab all names from strata, type and aggregate, and create dictionaries which map them to their indices - 2. iterate over each line in the block + 2. Iterate over each line in the block 2a. Split each line into a dictionary which maps all strata to that type and all aggregate to that type 2b. Convert from two Symbol => Symbol dictionaries to two Int => Int dictionaries, using the dictionaries from step 1 - 2bα. If applicable, for symbols with temp_strat_default as a prefix, find all matching symbols in the symbol dictionaries, and map all those + 2bα. If applicable, for symbols with ~ as a prefix, find all symbols with matching substrings in the symbol dictionaries, and map all those 2c. Accumulate respective dictionaries (optionally, only allow first match vs throw an error (strict_matches = false vs true)) 3. Create an array of 0s for stocks, flows, parameters, dyvars and sums for strata and aggregate. Insert into arrays all values from the two Int => Int dictionaries 3a. If strict_mappings = false, if there only exists one option in type to map to, and it hasn't been explicitly specified, add it. If strict_mappings = true and it hasn't been specified, throw an error. 4. Do a once-over of arrays and ensure there aren't any zeroes (unmapped values) remaining (helps with debugging when you screw up stratifying) 5. Deal with attributes (create a copy of type sf with attributes mapped to nothing) - 6. Infer LS, LSV, etc., if possible. + 6. Infer LS, LSV, etc. 7. Construct strata -> type and aggregate -> type ACSetTransformations 8. Return pullback (with flattened attributes) """ @@ -310,7 +309,7 @@ end """ stratify(strata, type, aggregate, block) -Take three stockflows and a quote block describing where the first and third map on to the second, and get a new stratified stockflow. +Take three stockflows and a block describing where the first and third map on to the second, and get a new stratified stockflow. Left side are strata objects, middle are type, right are aggregate. Each strata and aggregate object is associated with one type object. The resultant stockflow contains objects which are the product of strata and aggregate objects which map to the same type object. Use _ to match all objects in that category, ~ as a prefix to match all objects with the following string as a substring. Objects always go with their first match. @@ -348,8 +347,9 @@ end ``` """ macro stratify(strata, type, aggregate, block) - quote - sfstratify($(esc(strata)), $(esc(type)), $(esc(aggregate)), $(esc(block))) + escaped_block = Expr(:quote, block) + quote + sfstratify($(esc(strata)), $(esc(type)), $(esc(aggregate)), $(esc(escaped_block))) end end diff --git a/test/Stratification.jl b/test/Stratification.jl index 3d54389a..5a74915b 100755 --- a/test/Stratification.jl +++ b/test/Stratification.jl @@ -179,7 +179,7 @@ using Catlab.CategoricalAlgebra # ######################################### - age_weight_2 = @stratify WeightModel l_type ageWeightModel quote + age_weight_2 = @stratify WeightModel l_type ageWeightModel begin :stocks NormalWeight, OverWeight, Obese => pop <= Child, Adult, Senior @@ -207,7 +207,7 @@ using Catlab.CategoricalAlgebra end ######################################### - age_weight_3 = @stratify WeightModel l_type ageWeightModel quote + age_weight_3 = @stratify WeightModel l_type ageWeightModel begin :flows f_NewBorn => f_birth <= f_NB @@ -229,7 +229,7 @@ using Catlab.CategoricalAlgebra end - age_weight_4 = @stratify WeightModel l_type ageWeightModel quote + age_weight_4 = @stratify WeightModel l_type ageWeightModel begin :flows ~NO_MATCHES => f_birth <= ~NO_MATCHES @@ -358,7 +358,7 @@ end _ end) - strat_AXB = (quote + strat_AXB = (quote # Note, we use a quote when calling the function, begin when calling the macro. :stocks _ => _ <= _ A => X <= B From 708086881491c9c38d1da5ac8b7d7413e063dfa2 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Tue, 5 Sep 2023 22:54:37 -0600 Subject: [PATCH 12/23] Redid Stratification to use a struct, SNames, to group together relevant information. Contains dictionaries and vectors which are updated as it goes along. Created macro n_stratify, which generalizes stratify and can take an arbitrary number of stockflows as arguments. Still needs tests. Updated tests to reflect changes in stratification functions. --- src/syntax/Stratification.jl | 308 ++++++++++++++++++++--------------- test/Stratification.jl | 44 ++--- 2 files changed, 199 insertions(+), 153 deletions(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index 4235b2eb..b4c93480 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -1,5 +1,5 @@ module Stratification -export sfstratify, @stratify +export sfstratify, @stratify, @n_stratify using ...StockFlow using ..Syntax @@ -9,17 +9,96 @@ using Catlab.CategoricalAlgebra import ..Syntax: infer_links, substitute_symbols, DSLArgument, NothingFunction, invert_vector + +struct SFNames + + sf::AbstractStockAndFlowF + + snames::Vector{Symbol} + svnames::Vector{Symbol} + vnames::Vector{Symbol} + fnames::Vector{Symbol} + pnames::Vector{Symbol} + + # name -> index + s::Dict{Symbol, Int} + sv::Dict{Symbol, Int} + v::Dict{Symbol, Int} + f::Dict{Symbol, Int} + p::Dict{Symbol, Int} + + # index -> new index + ms::Dict{Int, Int} + msv::Dict{Int, Int} + mv::Dict{Int, Int} + mf::Dict{Int, Int} + mp::Dict{Int, Int} + + # index -> new index, where the first index is the actual index of the vector, the second is the int at that location + mvs::Vector{Int} + mvsv::Vector{Int} + mvv::Vector{Int} + mvf::Vector{Int} + mvp::Vector{Int} + + + SFNames(sfarg::AbstractStockAndFlowF) = (new(sfarg, + snames(sfarg), svnames(sfarg), vnames(sfarg), fnames(sfarg), pnames(sfarg), + invert_vector(snames(sfarg)), invert_vector(svnames(sfarg)), invert_vector(vnames(sfarg)), invert_vector(fnames(sfarg)), invert_vector(pnames(sfarg)), + Dict{Int, Int}(), Dict{Int, Int}(), Dict{Int, Int}(), Dict{Int, Int}(), Dict{Int, Int}(), + Vector{Int}(),Vector{Int}(), Vector{Int}(), Vector{Int}(), Vector{Int}())) +end + +function get_mappings(sfn::SFNames)::NTuple{5, Dict{Int, Int}} + return sfn.ms, sfn.msv, sfn.mv, sfn.mf, sfn.mp +end + +function get_mapped_vectors(sfn::SFNames)::NTuple{5, Vector{Int}} + return sfn.mvs, sfn.mvsv, sfn.mvv, sfn.mvf, sfn.mvp +end + +function get_mappings_infer_links_format(sfn::SFNames)::Dict{Symbol, Vector{Int}} + Dict(:S => sfn.mvs, :SV => sfn.mvsv, :V => sfn.mvv, :F => sfn.mvf, :P => sfn.mvp) +end + +function all_unique_names(sfn::SFNames)::Bool # Unnecessary, this is checked in invert_vector + return allunique(sfn.snames) && allunique(sfn.svnames) && allunique(vnames) && allunique(fnames) && allunique(pnames) +end + +function no_temp_strat_default_in_names(sfn::SFNames, temp_strat_default)::Bool + return temp_strat_default ∉ keys(sfn.s) && temp_strat_default ∉ keys(sfn.sv) && temp_strat_default ∉ keys(sfn.v) && temp_strat_default ∉ keys(sfn.f) && temp_strat_default ∉ keys(sfn.p) +end + +function add_temp_strat_default!(sfn::SFNames, temp_strat_default) + push!(sfn.s, temp_strat_default => -1) + push!(sfn.sv, temp_strat_default => -1) + push!(sfn.v, temp_strat_default => -1) + push!(sfn.f, temp_strat_default => -1) + push!(sfn.p, temp_strat_default => -1) +end + +function is_all_mapped(sfn::SFNames)::Bool + return all(vec -> 0 ∉ vec, get_mapped_vectors(sfn)) +end + +function get_names(sfn::SFNames)::NTuple{5, Vector{Symbol}} + return sfn.snames, sfn.svnames, sfn.vnames, sfn.fnames, sfn.pnames +end + + + + """ - interpret_stratification_notation(mapping_pair::Expr)::Tuple{Vector{DSLArgument}, Vector{DSLArgument}} + interpret_stratification_standard_notation(mapping_pair::Expr)::Tuple{Vector{DSLArgument}, Vector{DSLArgument}} Take an expression of the form a1, ..., => t <= s1, ..., where every element is a symbol, and return a 2-tuple of form ((a1 => t, a2 => t, ...), (s1 => t, ...)) """ -function interpret_stratification_notation(mapping_pair::Expr)::Tuple{Vector{DSLArgument}, Vector{DSLArgument}} +function interpret_stratification_standard_notation(mapping_pair::Expr)::Vector{Vector{DSLArgument}} @match mapping_pair begin - :($s => $t <= $a) => return ([DSLArgument(s,t)], [DSLArgument(a,t)]) - :($s => $t <= $a, $(atail...)) => ([DSLArgument(s,t)], [DSLArgument(a,t) ; [DSLArgument(as,t) for as in atail] ])#return (Dict(unwrap_key_expression(s, t)), push!(Dict(unwrap_key_expression(as, t) for as in atail), unwrap_key_expression(a, t))) - :($(shead...), $s => $t <= $a) => ([[DSLArgument(ss, t) for ss in shead] ; DSLArgument(s, t)], [DSLArgument(a, t)])#return (push!(Dict(unwrap_key_expression(ss, t) for ss in shead), unwrap_key_expression(s, t)), Dict(unwrap_key_expression(a, t))) + :($s => $t <= $a) => return [[DSLArgument(s,t)], [DSLArgument(a,t)]] + :($s => $t <= $a, $(atail...)) => [[DSLArgument(s,t)], [DSLArgument(a,t) ; [DSLArgument(as,t) for as in atail] ]] + :($(shead...), $s => $t <= $a) => [[[DSLArgument(ss, t) for ss in shead] ; DSLArgument(s, t)], [DSLArgument(a, t)]] if mapping_pair.head == :tuple end => begin middle_index = findfirst(x -> typeof(x) == Expr && length(x.args) == 3, mapping_pair.args) # still isn't specific enough @@ -30,7 +109,7 @@ function interpret_stratification_notation(mapping_pair::Expr)::Tuple{Vector{DSL :($stail => $t <= $ahead) => begin sdict = [[DSLArgument(ss, t) for ss in mapping_pair.args[1:middle_index-1]] ; DSLArgument(stail, t)] adict = [DSLArgument(ahead, t) ; [DSLArgument(as, t) for as in mapping_pair.args[middle_index+1:end]]] - return (sdict, adict) + return [sdict, adict] end _ => "Unknown format found for match; middle three values formatted incorrectly." end @@ -41,40 +120,51 @@ end +function interpret_stratification_generalized_notation(mapping_pair::Expr)::Vector{Vector{DSLArgument}} + # TODO: add a crap ton of assert statements. + # We're assuming it's gonna take the form [(a1, ..., an), ..., (k1, ..., km)] => t1 + + @assert length(mapping_pair.args) == 3 && typeof(mapping_pair.args[3]) == Symbol && length(mapping_pair.args[2]) && typeof(mapping_pair.args[2].args) == Vector + + # TODO: Include assert that length(mapping_pair.args[2].args) is the same as the number of stockflows + # Maybe include an assert that each element of the vector contains only symbols + + other = mapping_pair.args[2].args # needs to be a vector of tuples of symbols + type = mapping_pair.args[3] # needs to be a symbol + return [[DSLArgument(sym, type) for sym ∈ tup.args] for tup ∈ other] +end + + + + + """ Gets mapping information from each line and updates dictionaries. If a symbol already has a mapping and another is found, keep the first, or throw an error if strict_matches = true. """ -function read_stratification_line_and_update_dictionaries!(line::Expr, strata_names::Dict{Symbol, Int}, type_names::Dict{Symbol, Int}, aggregate_names::Dict{Symbol, Int}, strata_mappings::Dict{Int, Int}, aggregate_mappings::Dict{Int, Int} ; strict_matches = false, use_flags = true) - current_strata_symbol_dict, current_aggregate_symbol_dict = interpret_stratification_notation(line) - - current_strata_dict = substitute_symbols(strata_names, type_names, current_strata_symbol_dict ; use_flags=use_flags) - current_aggregate_dict = substitute_symbols(aggregate_names, type_names, current_aggregate_symbol_dict ; use_flags=use_flags) +function read_stratification_line_and_update_dictionaries!(line::Expr, other_names::Vector{Dict{Symbol, Int}}, type_names::Dict{Symbol, Int}, other_mappings::Vector{Dict{Int, Int}} ; use_standard_stratification_syntax = true, strict_matches = false, use_flags = true) + if use_standard_stratification_syntax + interpret_stratification_notation_function = interpret_stratification_standard_notation + else + interpret_stratification_notation_function = interpret_stratification_generalized_notation + end - if strict_matches - @assert (all(x -> x ∉ keys(strata_mappings), keys(current_strata_dict))) "Attempt to overwrite a mapping in strata!" - # check that we're not overwriting a value which has already been assigned - merge!(strata_mappings, current_strata_dict) # accumulate dictionary keys + current_symbol_dict::Vector{Vector{DSLArgument}} = interpret_stratification_notation_function(line) + current_mapping_dict::Vector{Dict{Int, Int}} = ((x, y) -> substitute_symbols(x,type_names, y; use_flags=use_flags)).(other_names, current_symbol_dict) - @assert (all(x -> x ∉ keys(aggregate_mappings), keys(current_aggregate_dict))) "Attempt to overwrite a mapping in aggregate!" - merge!(aggregate_mappings, current_aggregate_dict) - - else - mergewith!((x, y) -> x, strata_mappings, current_strata_dict) # alternatively, can use: only ∘ first - mergewith!((x, y) -> x, aggregate_mappings, current_aggregate_dict) - end + ((cumulative_dict, new_dict) -> mergewith!((cv, nv) -> cv, cumulative_dict, new_dict)).(other_mappings, current_mapping_dict) end """ Print all symbols such that the corresponding int is 0, representing an unmapped object. """ -function print_unmapped(mappings::Vector{Pair{Vector{Int}, Vector{Symbol}}}, name="STOCKFLOW") - for (ints, dicts) in mappings - for (i, val) in enumerate(ints) +function print_unmapped(SFNames, name="STOCKFLOW") + for (indices, names) ∈ zip(SFNames.get_mapped_vectors, SFNames.get_names) + for (i, val) ∈ enumerate(indices) if val == 0 println("UNMAPPED IN $(name):") - println(dicts[i]) + println(names[i]) end end end @@ -83,24 +173,25 @@ end """ Iterates over each line in a stratification syntax block and updates the appropriate dictionaries. """ -function iterate_over_stratification_lines!(block, strata_names, type_names, aggregate_names, strata_mappings, aggregate_mappings; strict_matches=false, use_flags=true) +function iterate_over_stratification_lines!(block, other_names::Vector{SFNames}, type_names::SFNames; use_standard_stratification_syntax=true, strict_matches=false, use_flags=true) + current_phase = (_, _) -> () for statement in block.args @match statement begin QuoteNode(:stocks) => begin - current_phase = s -> read_stratification_line_and_update_dictionaries!(s, strata_names[1], type_names[1], aggregate_names[1], strata_mappings[1], aggregate_mappings[1]; strict_matches=strict_matches, use_flags=use_flags) + current_phase = s -> read_stratification_line_and_update_dictionaries!(s, getfield.(other_names, :s), type_names.s, getfield.(other_names, :ms); use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:sums) => begin - current_phase = sv -> read_stratification_line_and_update_dictionaries!(sv, strata_names[2], type_names[2], aggregate_names[2], strata_mappings[2], aggregate_mappings[2]; strict_matches=strict_matches, use_flags=use_flags) + current_phase = sv -> read_stratification_line_and_update_dictionaries!(sv, getfield.(other_names, :sv), type_names.sv, getfield.(other_names, :msv); use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:dynamic_variables) => begin - current_phase = v -> read_stratification_line_and_update_dictionaries!(v, strata_names[3], type_names[3], aggregate_names[3], strata_mappings[3], aggregate_mappings[3]; strict_matches=strict_matches, use_flags=use_flags) + current_phase = v -> read_stratification_line_and_update_dictionaries!(v, getfield.(other_names, :v), type_names.v, getfield.(other_names, :mv); use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:flows) => begin - current_phase = f -> read_stratification_line_and_update_dictionaries!(f, strata_names[4], type_names[4], aggregate_names[4], strata_mappings[4], aggregate_mappings[4]; strict_matches=strict_matches, use_flags=use_flags) + current_phase = f -> read_stratification_line_and_update_dictionaries!(f,getfield.(other_names, :f), type_names.f, getfield.(other_names, :mf); use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:parameters) => begin - current_phase = p -> read_stratification_line_and_update_dictionaries!(p, strata_names[5], type_names[5], aggregate_names[5], strata_mappings[5], aggregate_mappings[5]; strict_matches=strict_matches, use_flags=use_flags) + current_phase = p -> read_stratification_line_and_update_dictionaries!(p, getfield.(other_names, :p), type_names.p, getfield.(other_names, :mp); use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(kw) => error("Unknown block type for stratify syntax: " * String(kw)) @@ -112,19 +203,16 @@ end """ Apply default mappings, infer mapping if there's only a single option, and convert from Dict{Int, Int} to Vector{Int} """ -function complete_mappings(strata_all_index_mappings::Vector{Dict{Int, Int}}, aggregate_all_index_mappings::Vector{Dict{Int, Int}}, sfstrata::AbstractStockAndFlowF, sftype::AbstractStockAndFlowF, sfaggregate::AbstractStockAndFlowF; strict_mappings = false) +function complete_mappings!(sfm::SFNames, sftype::AbstractStockAndFlowF; strict_mappings = false) # get the default value, if it has been assigned. Use 0 if it hasn't. - default_index_strata_stock = get(strata_all_index_mappings[1], -1, 0) - default_index_strata_sum = get(strata_all_index_mappings[2], -1, 0) - default_index_strata_dyvar = get(strata_all_index_mappings[3], -1, 0) - default_index_strata_flow = get(strata_all_index_mappings[4], -1, 0) - default_index_strata_param = get(strata_all_index_mappings[5], -1, 0) + all_index_mappings = get_mappings(sfm) + + default_index_stock = get(all_index_mappings[1], -1, 0) + default_index_sum = get(all_index_mappings[2], -1, 0) + default_index_dyvar = get(all_index_mappings[3], -1, 0) + default_index_flow = get(all_index_mappings[4], -1, 0) + default_index_param = get(all_index_mappings[5], -1, 0) - default_index_aggregate_stock = get(aggregate_all_index_mappings[1], -1, 0) - default_index_aggregate_sum = get(aggregate_all_index_mappings[2], -1, 0) - default_index_aggregate_dyvar = get(aggregate_all_index_mappings[3], -1, 0) - default_index_aggregate_flow = get(aggregate_all_index_mappings[4], -1, 0) - default_index_aggregate_param = get(aggregate_all_index_mappings[5], -1, 0) # STEP 3 @@ -145,20 +233,18 @@ function complete_mappings(strata_all_index_mappings::Vector{Dict{Int, Int}}, ag # - If only one_type is mapped, then it will be positive, and default_infex will be 0 # - If only default_index is mapped, it will be positive and one_type will be 0 - strata_stock_mappings::Vector{Int} = [get(strata_all_index_mappings[1], i, max(default_index_strata_stock, one_type_stock)) for i in 1:ns(sfstrata)] - strata_sum_mappings::Vector{Int} = [get(strata_all_index_mappings[2], i, max(default_index_strata_sum, one_type_sum)) for i in 1:nsv(sfstrata)] - strata_dyvar_mappings::Vector{Int} = [get(strata_all_index_mappings[3], i, max(default_index_strata_dyvar, one_type_dyvar)) for i in 1:nvb(sfstrata)] - strata_flow_mappings::Vector{Int} = [get(strata_all_index_mappings[4], i, max(default_index_strata_flow, one_type_flow)) for i in 1:nf(sfstrata)] - strata_param_mappings::Vector{Int} = [get(strata_all_index_mappings[5], i, max(default_index_strata_param, one_type_param)) for i in 1:np(sfstrata)] + stock_mappings::Vector{Int} = [get(all_index_mappings[1], i, max(default_index_stock, one_type_stock)) for i ∈ eachindex(sfm.snames)] + sum_mappings::Vector{Int} = [get(all_index_mappings[2], i, max(default_index_sum, one_type_sum)) for i ∈ eachindex(sfm.svnames)] + dyvar_mappings::Vector{Int} = [get(all_index_mappings[3], i, max(default_index_dyvar, one_type_dyvar)) for i ∈ eachindex(sfm.vnames)] + flow_mappings::Vector{Int} = [get(all_index_mappings[4], i, max(default_index_flow, one_type_flow)) for i ∈ eachindex(sfm.fnames)] + param_mappings::Vector{Int} = [get(all_index_mappings[5], i, max(default_index_param, one_type_param)) for i ∈ eachindex(sfm.pnames)] - aggregate_stock_mappings::Vector{Int} = [get(aggregate_all_index_mappings[1], i, max(default_index_aggregate_stock, one_type_stock)) for i in 1:ns(sfaggregate)] - aggregate_sum_mappings::Vector{Int} = [get(aggregate_all_index_mappings[2], i, max(default_index_aggregate_sum, one_type_sum)) for i in 1:nsv(sfaggregate)] - aggregate_dyvar_mappings::Vector{Int} = [get(aggregate_all_index_mappings[3], i, max(default_index_aggregate_dyvar, one_type_dyvar)) for i in 1:nvb(sfaggregate)] - aggregate_flow_mappings::Vector{Int} = [get(aggregate_all_index_mappings[4], i, max(default_index_aggregate_flow, one_type_flow)) for i in 1:nf(sfaggregate)] - aggregate_param_mappings::Vector{Int} = [get(aggregate_all_index_mappings[5], i, max(default_index_aggregate_param, one_type_param)) for i in 1:np(sfaggregate)] + append!(sfm.mvs, stock_mappings) + append!(sfm.mvsv, sum_mappings) + append!(sfm.mvv, dyvar_mappings) + append!(sfm.mvf, flow_mappings) + append!(sfm.mvp, param_mappings) - - return ((strata_stock_mappings, strata_sum_mappings, strata_dyvar_mappings, strata_flow_mappings, strata_param_mappings), (aggregate_stock_mappings, aggregate_sum_mappings, aggregate_dyvar_mappings, aggregate_flow_mappings, aggregate_param_mappings)) end @@ -179,88 +265,38 @@ end 7. Construct strata -> type and aggregate -> type ACSetTransformations 8. Return pullback (with flattened attributes) """ -function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockAndFlowStructureF, aggregate::AbstractStockAndFlowStructureF, block::Expr ; strict_mappings = false, strict_matches = false, temp_strat_default = :_, use_temp_strat_default = true, use_flags = true, return_homs = false) +function sfstratify(others::Vector{K}, type::K, block::Expr ; use_standard_stratification_syntax = true, strict_mappings = false, strict_matches = false, temp_strat_default = :_, use_temp_strat_default = true, use_flags = true, return_homs = false) where {K <: AbstractStockAndFlowStructureF} Base.remove_linenums!(block) # STEP 1 - - # invert_vector: Vector{K} -> Dict{K, Int} where int is original index and all K (symbols, in this case) are unique. - strata_snames::Dict{Symbol, Int} = invert_vector(snames(strata)) - strata_svnames::Dict{Symbol, Int} = invert_vector(svnames(strata)) - strata_vnames::Dict{Symbol, Int} = invert_vector(vnames(strata)) - strata_fnames::Dict{Symbol, Int} = invert_vector(fnames(strata)) - strata_pnames::Dict{Symbol, Int} = invert_vector(pnames(strata)) - - type_snames::Dict{Symbol, Int} = invert_vector(snames(type)) - type_svnames::Dict{Symbol, Int} = invert_vector(svnames(type)) - type_vnames::Dict{Symbol, Int} = invert_vector(vnames(type)) - type_fnames::Dict{Symbol, Int} = invert_vector(fnames(type)) - type_pnames::Dict{Symbol, Int} = invert_vector(pnames(type)) - - aggregate_snames::Dict{Symbol, Int} = invert_vector(snames(aggregate)) - aggregate_svnames::Dict{Symbol, Int} = invert_vector(svnames(aggregate)) - aggregate_vnames::Dict{Symbol, Int} = invert_vector(vnames(aggregate)) - aggregate_fnames::Dict{Symbol, Int} = invert_vector(fnames(aggregate)) - aggregate_pnames::Dict{Symbol, Int} = invert_vector(pnames(aggregate)) - - - strata_stock_mappings_dict::Dict{Int, Int} = Dict() - strata_flow_mappings_dict::Dict{Int, Int} = Dict() - strata_dyvar_mappings_dict::Dict{Int, Int} = Dict() - strata_param_mappings_dict::Dict{Int, Int} = Dict() - strata_sum_mappings_dict::Dict{Int, Int} = Dict() - - aggregate_stock_mappings_dict::Dict{Int, Int} = Dict() - aggregate_flow_mappings_dict::Dict{Int, Int} = Dict() - aggregate_dyvar_mappings_dict::Dict{Int, Int} = Dict() - aggregate_param_mappings_dict::Dict{Int, Int} = Dict() - aggregate_sum_mappings_dict::Dict{Int, Int} = Dict() - - strata_all_name_mappings::Vector{Dict{Symbol, Int}} = [strata_snames, strata_svnames, strata_vnames, strata_fnames, strata_pnames] - type_all_name_mappings::Vector{Dict{Symbol, Int}} = [type_snames, type_svnames, type_vnames, type_fnames, type_pnames] - aggregate_all_name_mappings::Vector{Dict{Symbol, Int}} = [aggregate_snames, aggregate_svnames, aggregate_vnames, aggregate_fnames, aggregate_pnames] - - strata_all_index_mappings::Vector{Dict{Int, Int}} = [strata_stock_mappings_dict, strata_sum_mappings_dict, strata_dyvar_mappings_dict, strata_flow_mappings_dict, strata_param_mappings_dict] - aggregate_all_index_mappings::Vector{Dict{Int, Int}} = [aggregate_stock_mappings_dict, aggregate_sum_mappings_dict, aggregate_dyvar_mappings_dict, aggregate_flow_mappings_dict, aggregate_param_mappings_dict] + other_names::Vector{SFNames} = [SFNames(sf) for sf ∈ others] + type_names::SFNames = SFNames(type) # has some unnecessary fields. if use_temp_strat_default - - strata_all_names::Vector{Vector{Symbol}} = [snames(strata), svnames(strata), vnames(strata), fnames(strata), pnames(strata)] - aggregate_all_names::Vector{Vector{Symbol}} = [snames(aggregate), svnames(aggregate), vnames(aggregate), fnames(aggregate), pnames(aggregate)] - - @assert all(x -> temp_strat_default ∉ keys(x), strata_all_names) "Strata contains $temp_strat_default ! Please change temp_strat_default to a different symbol or rename offending object." - @assert all(x -> temp_strat_default ∉ keys(x), aggregate_all_names) "Aggregate contains $temp_strat_default ! Please change temp_strat_default to a different symbol or rename offending object." - - map(x -> (push!(x, (temp_strat_default => -1))), strata_all_name_mappings) - map(x -> (push!(x, (temp_strat_default => -1))), aggregate_all_name_mappings) + # Applies function to every element in vector. + @assert all((sfn -> no_temp_strat_default_in_names(sfn, temp_strat_default)).(other_names)) && no_temp_strat_default_in_names(type_names, temp_strat_default) "A stockflow contains $(temp_strat_default) ! Please change temp_strat_default to a different symbol or rename offending object." + (sfn -> add_temp_strat_default!(sfn, temp_strat_default)).(other_names) end - # STEP 2 - iterate_over_stratification_lines!(block, strata_all_name_mappings, type_all_name_mappings, aggregate_all_name_mappings, strata_all_index_mappings, aggregate_all_index_mappings ; strict_matches=strict_matches, use_flags=use_flags) + # STEP 2 + iterate_over_stratification_lines!(block, other_names, type_names ; use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) - strata_mappings, aggregate_mappings = complete_mappings(strata_all_index_mappings, aggregate_all_index_mappings, strata, type, aggregate ; strict_mappings=strict_mappings) - - strata_stock_mappings, strata_sum_mappings, strata_dyvar_mappings, strata_flow_mappings, strata_param_mappings = strata_mappings - aggregate_stock_mappings, aggregate_sum_mappings, aggregate_dyvar_mappings, aggregate_flow_mappings, aggregate_param_mappings = aggregate_mappings + (sfn -> complete_mappings!(sfn, type ; strict_mappings=strict_mappings)).(other_names) - all_mappings = [strata_stock_mappings..., strata_flow_mappings..., strata_dyvar_mappings..., strata_param_mappings..., strata_sum_mappings..., aggregate_stock_mappings..., aggregate_flow_mappings..., aggregate_dyvar_mappings..., aggregate_param_mappings..., aggregate_sum_mappings...] - - # STEP 4 # This bit makes debugging when making a stratification easier. Tells you exactly which ones you forgot to map. #unmapped: - if !(all(x -> x != 0, all_mappings)) - strata_mappings_to_names::Vector{Pair{Vector{Int}, Vector{Symbol}}} = [strata_stock_mappings => snames(strata), strata_flow_mappings => fnames(strata), strata_dyvar_mappings => vnames(strata), strata_param_mappings => pnames(strata), strata_sum_mappings => svnames(strata)] - aggregate_mappings_to_names::Vector{Pair{Vector{Int}, Vector{Symbol}}} = [aggregate_stock_mappings => snames(aggregate), aggregate_flow_mappings => fnames(aggregate), aggregate_dyvar_mappings => vnames(aggregate), aggregate_param_mappings => pnames(aggregate), aggregate_sum_mappings => svnames(aggregate)] - print_unmapped(strata_mappings_to_names, "STRATA") - print_unmapped(aggregate_mappings_to_names, "AGGREGATE") + if !(all(is_all_mapped.(other_names))) + for i ∈ eachindex(other_names) + print_unmapped(other_names[i], "STOCKFLOW $i") + end error("There is an unmapped value!") end @@ -285,22 +321,19 @@ function sfstratify(strata::AbstractStockAndFlowStructureF, type::AbstractStockA # A'<- C'-> B' # - strata_necmaps = Dict(:S => strata_stock_mappings, :F => strata_flow_mappings, :V => strata_dyvar_mappings, :P => strata_param_mappings, :SV => strata_sum_mappings) - strata_inferred_links = infer_links(strata, type, strata_necmaps) - strata_to_type = ACSetTransformation(strata, no_attribute_type; strata_necmaps..., strata_inferred_links..., Op = NothingFunction, Position = NothingFunction, Name = NothingFunction) + generate_all_mappings_function = m -> Dict(infer_links(m.sf, type, get_mappings_infer_links_format(m))..., get_mappings_infer_links_format(m)..., :Op => NothingFunction, :Position => NothingFunction, :Name => NothingFunction) + all_mappings = generate_all_mappings_function.(other_names) + + all_transformations = [ACSetTransformation(sfn.sf, no_attribute_type ; mappings...) for (sfn, mappings) ∈ zip(other_names, all_mappings)] - - aggregate_necmaps = Dict(:S => aggregate_stock_mappings, :F => aggregate_flow_mappings, :V => aggregate_dyvar_mappings, :P => aggregate_param_mappings, :SV => aggregate_sum_mappings) - aggregate_inferred_links = infer_links(aggregate, type, aggregate_necmaps) - aggregate_to_type = ACSetTransformation(aggregate, no_attribute_type; aggregate_necmaps..., aggregate_inferred_links..., Op = NothingFunction, Position = NothingFunction, Name =NothingFunction) + # STEP 8 - + pullback_model = pullback(all_transformations...) |> apex |> rebuildStratifiedModelByFlattenSymbols; + - # STEP 8 - pullback_model = pullback(strata_to_type, aggregate_to_type) |> apex |> rebuildStratifiedModelByFlattenSymbols; if return_homs - return pullback_model, strata_to_type, aggregate_to_type + return pullback_model, all_transformations else return pullback_model end @@ -349,7 +382,20 @@ end macro stratify(strata, type, aggregate, block) escaped_block = Expr(:quote, block) quote - sfstratify($(esc(strata)), $(esc(type)), $(esc(aggregate)), $(esc(escaped_block))) + sfstratify([$(esc(strata)), $(esc(aggregate))], $(esc(type)), $(esc(escaped_block))) + end +end + +macro n_stratify(args...) + if length(args) < 2 + return :(MethodError("Too few arguments provided! Please provide some number of stockflows, then the type stock flow, then a quote block.")) + else + # TODO: Potentially Expr(:quote, args[end]) + if length(args) == 2 + return Expr(:call, :sfnstratify, :(Vector{AbstractStockAndFlowF}()), esc(args[1]), esc(args[2])) + else + return Expr(:call, :sfnstratify, Expr(:vect, esc.(args[1:end-2])...), esc(args[end-1]), esc(args[end])) + end end end diff --git a/test/Stratification.jl b/test/Stratification.jl index 5a74915b..152d10c2 100755 --- a/test/Stratification.jl +++ b/test/Stratification.jl @@ -1,6 +1,6 @@ using StockFlow.Syntax.Stratification -using StockFlow.Syntax.Stratification: interpret_stratification_notation +using StockFlow.Syntax.Stratification: interpret_stratification_standard_notation using StockFlow.Syntax: NothingFunction, DSLArgument, unwrap_expression, substitute_symbols using Catlab.WiringDiagrams @@ -262,37 +262,37 @@ using Catlab.CategoricalAlgebra @test aged_weight == age_weight_4 end -@testset "Ensuring interpret_stratification_notation correctly reads lines" begin # This should be all valid cases. There's always going to be at least one value on both sides. +@testset "Ensuring interpret_stratification_standard_notation correctly reads lines" begin # This should be all valid cases. There's always going to be at least one value on both sides. # Note the orders. The lists produced go left to right. A1, A2 => B <= C1, C2 results in [A1 => B, A2 => B], [C1 => B. C2 => B] - @test interpret_stratification_notation(:(A => B <= C)) == ([DSLArgument(:A, :B, Set{Symbol}())], [DSLArgument(:C, :B, Set{Symbol}())]) + @test interpret_stratification_standard_notation(:(A => B <= C)) == [[DSLArgument(:A, :B, Set{Symbol}())], [DSLArgument(:C, :B, Set{Symbol}())]] - @test interpret_stratification_notation(:(A1, A2 => B <= C)) == ( + @test interpret_stratification_standard_notation(:(A1, A2 => B <= C)) == [ [DSLArgument(:A1, :B, Set{Symbol}()), DSLArgument(:A2, :B, Set{Symbol}())], [DSLArgument(:C, :B, Set{Symbol}())] - ) - @test interpret_stratification_notation(:(A => B <= C1, C2)) == ( + ] + @test interpret_stratification_standard_notation(:(A => B <= C1, C2)) == [ [DSLArgument(:A, :B, Set{Symbol}())], [DSLArgument(:C1, :B, Set{Symbol}()), DSLArgument(:C2, :B, Set{Symbol}())], - ) - @test interpret_stratification_notation(:(_ => B <= _)) == ( + ] + @test interpret_stratification_standard_notation(:(_ => B <= _)) == [ [DSLArgument(:_, :B, Set{Symbol}())], [DSLArgument(:_, :B, Set{Symbol}())], - ) - @test interpret_stratification_notation(:(~A => B <= ~C)) == ( + ] + @test interpret_stratification_standard_notation(:(~A => B <= ~C)) == [ [DSLArgument(:A, :B, Set{Symbol}([:~]))], [DSLArgument(:C, :B, Set{Symbol}([:~]))], - ) - @test interpret_stratification_notation(:(~A1, A2 => B <= ~C)) == ( + ] + @test interpret_stratification_standard_notation(:(~A1, A2 => B <= ~C)) == [ [DSLArgument(:A1, :B, Set{Symbol}([:~])), DSLArgument(:A2, :B, Set{Symbol}())], [DSLArgument(:C, :B, Set{Symbol}([:~]))], - ) + ] - @test interpret_stratification_notation(:(~_ => B <= ~_, C)) == ( # Weird case. Matches everything with _ as a substring. + @test interpret_stratification_standard_notation(:(~_ => B <= ~_, C)) == [ # Weird case. Matches everything with _ as a substring. [DSLArgument(:_, :B, Set{Symbol}([:~]))], [DSLArgument(:_, :B, Set{Symbol}([:~])), DSLArgument(:C, :B, Set{Symbol}())] - ) + ] end @@ -368,7 +368,7 @@ end sfA = (@stock_and_flow begin; :stocks; A; end;) - @test (sfstratify(A_, X_, B_, strat_AXB, use_temp_strat_default=false) + @test (sfstratify([A_, B_], X_, strat_AXB, use_temp_strat_default=false) == (@stock_and_flow begin :stocks AB @@ -376,27 +376,27 @@ end end)) # doesn't show up anywhere, so doesn't affect anything. Could also set it to something untypable in the DSL, like Symbol("") - @test (sfstratify(A_, X_, B_, strat_AXB, temp_strat_default=:ABABABABA) + @test (sfstratify([A_, B_], X_, strat_AXB, temp_strat_default=:ABABABABA) == (@stock_and_flow begin :stocks AB __ end)) - @test_throws AssertionError (sfstratify(A_, X_, B_, strat_AXB, strict_matches=true)) # A matches against A and ~A, which is disallowed with this flag. + @test_throws AssertionError (sfstratify([A_, B_], X_, strat_AXB, strict_matches=true)) # A matches against A and ~A, which is disallowed with this flag. - @test_throws ErrorException (sfstratify(sfA,sfA,sfA,(quote end) ; strict_mappings=true)) # strict_mappings=false wouldn't throw an error, and would infer strata and aggregate need to map to the only stock. + @test_throws ErrorException (sfstratify([sfA,sfA],sfA,(quote end) ; strict_mappings=true)) # strict_mappings=false wouldn't throw an error, and would infer strata and aggregate need to map to the only stock. nothing_sfA = map(sfA, Position=NothingFunction, Op=NothingFunction, Name=NothingFunction) - @test (sfstratify(sfA,sfA,sfA,(quote end), return_homs=true) == ( + @test (sfstratify([sfA,sfA],sfA,(quote end), return_homs=true) == ( (@stock_and_flow begin :stocks AA end), - ACSetTransformation(sfA, nothing_sfA ; S=[1], F=Vector{Int}(),V =Vector{Int}(),SV=Vector{Int}(),P=Vector{Int}(),LS=Vector{Int}(),I=Vector{Int}(),O=Vector{Int}(),LV=Vector{Int}(),LSV=Vector{Int}(),LVV=Vector{Int}(),LPV=Vector{Int}(), Position=NothingFunction, Op=NothingFunction, Name=NothingFunction), # strata -> type - ACSetTransformation(sfA, nothing_sfA ; S=[1], F=Vector{Int}(),V =Vector{Int}(),SV=Vector{Int}(),P=Vector{Int}(),LS=Vector{Int}(),I=Vector{Int}(),O=Vector{Int}(),LV=Vector{Int}(),LSV=Vector{Int}(),LVV=Vector{Int}(),LPV=Vector{Int}(), Position=NothingFunction, Op=NothingFunction, Name=NothingFunction) # aggregate -> type + [ACSetTransformation(sfA, nothing_sfA ; S=[1], F=Vector{Int}(),V =Vector{Int}(),SV=Vector{Int}(),P=Vector{Int}(),LS=Vector{Int}(),I=Vector{Int}(),O=Vector{Int}(),LV=Vector{Int}(),LSV=Vector{Int}(),LVV=Vector{Int}(),LPV=Vector{Int}(), Position=NothingFunction, Op=NothingFunction, Name=NothingFunction), # strata -> type + ACSetTransformation(sfA, nothing_sfA ; S=[1], F=Vector{Int}(),V =Vector{Int}(),SV=Vector{Int}(),P=Vector{Int}(),LS=Vector{Int}(),I=Vector{Int}(),O=Vector{Int}(),LV=Vector{Int}(),LSV=Vector{Int}(),LVV=Vector{Int}(),LPV=Vector{Int}(), Position=NothingFunction, Op=NothingFunction, Name=NothingFunction)] # aggregate -> type )) # the empty lists are necessary for equality, but it'd still be an equivalent homomorphism if you didn't specify them. end From 673327950d4f18942acdf8c48e350f97a797e700 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Wed, 6 Sep 2023 00:09:55 -0600 Subject: [PATCH 13/23] got n_stratify working with l_type with itself 4 times. Had to change System Structure so instead of folding right, it checks all vops are equal (line 195) --- src/SystemStructure.jl | 2 +- src/syntax/Stratification.jl | 36 ++++++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/SystemStructure.jl b/src/SystemStructure.jl index 417599fb..d659e6d9 100644 --- a/src/SystemStructure.jl +++ b/src/SystemStructure.jl @@ -192,7 +192,7 @@ extracVAndAttrStructureAndFlatten(p::AbstractStockAndFlowF) = begin if nvb(p)>0 for v in 1:nvb(p) vn = flattenTupleNames(vname(p,v)) - v_op = foldr(==,vop(p,v)) ? vop(p,v)[1] : error("operators $(vop(p,v)) in the stratified model's auxiliary variable: $(join(vname(p,v))) should be the same!") + v_op = allequal(vop(p,v)) ? vop(p,v)[1] : error("operators $(vop(p,v)) in the stratified model's auxiliary variable: $(join(vname(p,v))) should be the same!") vnp = vn=>(args(p,v)=>v_op) vs = vcat(vs,vnp) end diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index b4c93480..82d101e5 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -121,11 +121,19 @@ end function interpret_stratification_generalized_notation(mapping_pair::Expr)::Vector{Vector{DSLArgument}} + # println(mapping_pair) + # println(mapping_pair.args) + # println(mapping_pair.args[1]) + # println(mapping_pair.args[2]) + # println(mapping_pair.args[3]) + # println(typeof(mapping_pair.args[2].args[1].args)) # TODO: add a crap ton of assert statements. # We're assuming it's gonna take the form [(a1, ..., an), ..., (k1, ..., km)] => t1 - @assert length(mapping_pair.args) == 3 && typeof(mapping_pair.args[3]) == Symbol && length(mapping_pair.args[2]) && typeof(mapping_pair.args[2].args) == Vector - + @assert length(mapping_pair.args) == 3 + @assert typeof(mapping_pair.args[3]) == Symbol + # @assert typeof(mapping_pair.args[2].args[1].args) == Vector + # length(mapping_pair.args[2][1]) && # TODO: Include assert that length(mapping_pair.args[2].args) is the same as the number of stockflows # Maybe include an assert that each element of the vector contains only symbols @@ -328,9 +336,9 @@ function sfstratify(others::Vector{K}, type::K, block::Expr ; use_standard_strat # STEP 8 - pullback_model = pullback(all_transformations...) |> apex |> rebuildStratifiedModelByFlattenSymbols; - - + # pullback_function = (prev, next) -> pullback(prev, next) |> apex |> rebuildStratifiedModelByFlattenSymbols; + # pullback_model = accumulate(pullback_function, all_transformations[2:end] ; init=all_transformations[1]) + pullback_model = pullback(all_transformations) |> apex |> rebuildStratifiedModelByFlattenSymbols; if return_homs return pullback_model, all_transformations @@ -390,11 +398,19 @@ macro n_stratify(args...) if length(args) < 2 return :(MethodError("Too few arguments provided! Please provide some number of stockflows, then the type stock flow, then a quote block.")) else - # TODO: Potentially Expr(:quote, args[end]) - if length(args) == 2 - return Expr(:call, :sfnstratify, :(Vector{AbstractStockAndFlowF}()), esc(args[1]), esc(args[2])) - else - return Expr(:call, :sfnstratify, Expr(:vect, esc.(args[1:end-2])...), esc(args[end-1]), esc(args[end])) + + + escaped_block = Expr(:quote, args[end]) + other_sfs = esc.(args[1:end-2]) + type = (esc(args[end-1])) + if length(other_sfs) == 0 + quote + sfstratify(Vector{AbstractStockAndFlowF}, $type, $escaped_block ; use_standard_stratification_syntax = false) + end + else + quote + sfstratify([$(other_sfs...)], $type, $escaped_block ; use_standard_stratification_syntax = false) + end end end end From cb1ae3b469107dafe1d31528d6645436318b9b37 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Wed, 6 Sep 2023 12:15:24 -0600 Subject: [PATCH 14/23] Updated some assert statements for n_stratify --- src/syntax/Stratification.jl | 39 +++++++++++++++--------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index 82d101e5..e97f1037 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -121,22 +121,7 @@ end function interpret_stratification_generalized_notation(mapping_pair::Expr)::Vector{Vector{DSLArgument}} - # println(mapping_pair) - # println(mapping_pair.args) - # println(mapping_pair.args[1]) - # println(mapping_pair.args[2]) - # println(mapping_pair.args[3]) - # println(typeof(mapping_pair.args[2].args[1].args)) - # TODO: add a crap ton of assert statements. - # We're assuming it's gonna take the form [(a1, ..., an), ..., (k1, ..., km)] => t1 - - @assert length(mapping_pair.args) == 3 - @assert typeof(mapping_pair.args[3]) == Symbol - # @assert typeof(mapping_pair.args[2].args[1].args) == Vector - # length(mapping_pair.args[2][1]) && - # TODO: Include assert that length(mapping_pair.args[2].args) is the same as the number of stockflows - # Maybe include an assert that each element of the vector contains only symbols - + # asserts are covered before this function is called. other = mapping_pair.args[2].args # needs to be a vector of tuples of symbols type = mapping_pair.args[3] # needs to be a symbol return [[DSLArgument(sym, type) for sym ∈ tup.args] for tup ∈ other] @@ -154,6 +139,14 @@ function read_stratification_line_and_update_dictionaries!(line::Expr, other_nam interpret_stratification_notation_function = interpret_stratification_standard_notation else interpret_stratification_notation_function = interpret_stratification_generalized_notation + + # need to do this here, since we know the number of other_mappings at this point, but not in the interpret_stratification_notation + @assert length(line.args) == 3 + @assert typeof(line.args[3]) == Symbol + @assert line.args[1] == :(=>) + @assert length(line.args[2].args) == length(other_names) + @assert all(tup -> length(tup.args) == 1, line.args[2].args) # every element of the vector is an expression of tuple. + @assert all(tup -> all(sym -> typeof(sym) <: Union{Symbol, Expr}, tup.args), line.args[2].args) # ensure all arguments in the tuples are expressions or symbols. end current_symbol_dict::Vector{Vector{DSLArgument}} = interpret_stratification_notation_function(line) @@ -211,7 +204,7 @@ end """ Apply default mappings, infer mapping if there's only a single option, and convert from Dict{Int, Int} to Vector{Int} """ -function complete_mappings!(sfm::SFNames, sftype::AbstractStockAndFlowF; strict_mappings = false) +function complete_mappings!(sfm::SFNames, sftype::SFNames; strict_mappings = false) # get the default value, if it has been assigned. Use 0 if it hasn't. all_index_mappings = get_mappings(sfm) @@ -225,11 +218,11 @@ function complete_mappings!(sfm::SFNames, sftype::AbstractStockAndFlowF; strict_ # STEP 3 if !strict_mappings - one_type_stock = length(snames(sftype)) == 1 ? 1 : 0 # if there is only one stock, it needs to have index 1 - one_type_flow = length(fnames(sftype)) == 1 ? 1 : 0 - one_type_dyvar = length(vnames(sftype)) == 1 ? 1 : 0 - one_type_param = length(pnames(sftype)) == 1 ? 1 : 0 - one_type_sum = length(svnames(sftype)) == 1 ? 1 : 0 + one_type_stock = length(sftype.snames) == 1 ? 1 : 0 # if there is only one stock, it needs to have index 1 + one_type_flow = length(sftype.fnames) == 1 ? 1 : 0 + one_type_dyvar = length(sftype.vnames) == 1 ? 1 : 0 + one_type_param = length(sftype.pnames) == 1 ? 1 : 0 + one_type_sum = length(sftype.svnames) == 1 ? 1 : 0 else one_type_stock = one_type_flow = one_type_dyvar = one_type_param = one_type_sum = 0 end @@ -294,7 +287,7 @@ function sfstratify(others::Vector{K}, type::K, block::Expr ; use_standard_strat iterate_over_stratification_lines!(block, other_names, type_names ; use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) - (sfn -> complete_mappings!(sfn, type ; strict_mappings=strict_mappings)).(other_names) + (sfn -> complete_mappings!(sfn, type_names ; strict_mappings=strict_mappings)).(other_names) # STEP 4 From 8c0fc74b63acdbdaf9582ebe065a465ef397b9ad Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Wed, 6 Sep 2023 13:43:31 -0600 Subject: [PATCH 15/23] Added a test for n_stratify removed testing code --- test/Stratification.jl | 95 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/test/Stratification.jl b/test/Stratification.jl index 152d10c2..7ce1fd5f 100755 --- a/test/Stratification.jl +++ b/test/Stratification.jl @@ -401,3 +401,98 @@ end end + + + +@testset "n_stratify works as expected" begin + + + l_type = @stock_and_flow begin + :stocks + pop + + :parameters + μ + δ + rFstOrder + rage + + :dynamic_variables + v_aging = pop * rage + v_fstOrder = pop * rFstOrder + v_birth = N * μ + v_death = pop * δ + + :flows + pop => f_aging(v_aging) => pop + pop => f_fstOrder(v_fstOrder) => pop + CLOUD => f_birth(v_birth) => pop + pop => f_death(v_death) => CLOUD + + :sums + N = [pop] + + end + + chain_ltype = @stock_and_flow begin + :stocks + poppoppop + + :parameters + μμμ + δδδ + rFstOrderrFstOrderrFstOrder + rageragerage + + :dynamic_variables + v_agingv_agingv_aging = poppoppop * rageragerage + v_fstOrderv_fstOrderv_fstOrder = poppoppop * rFstOrderrFstOrderrFstOrder + v_birthv_birthv_birth = NNN * μμμ + v_deathv_deathv_death = poppoppop * δδδ + + :flows + poppoppop => f_agingf_agingf_aging(v_agingv_agingv_aging) => poppoppop + poppoppop => f_fstOrderf_fstOrderf_fstOrder(v_fstOrderv_fstOrderv_fstOrder) => poppoppop + CLOUD => f_birthf_birthf_birth(v_birthv_birthv_birth) => poppoppop + poppoppop => f_deathf_deathf_death(v_deathv_deathv_death) => CLOUD + + :sums + NNN = [poppoppop] + end + + chain_ltype_nstratify = @n_stratify l_type l_type l_type l_type begin + + :stocks + [(pop,), (~pop,), (_,)] => pop + + :parameters + [(μ,), (μ,), (μ,)] => μ + [(δ,), (δ,), (δ,)] => δ + [(rFstOrder,), (rFstOrder,), (rFstOrder,)] => rFstOrder + [(rage,), (rage,), (rage,)] => rage + + :dynamic_variables + [(v_aging,), (v_aging,), (v_aging,)] => v_aging + [(v_fstOrder,), (v_fstOrder,), (v_fstOrder,)] => v_fstOrder + [(v_birth,), (v_birth,), (v_birth,)] => v_birth + [(v_death,), (v_death,), (v_death,)] => v_death + + :flows + [(f_aging,), (f_aging,), (f_aging,)] => f_aging + [(f_fstOrder,), (f_fstOrder,), (f_fstOrder,)] => f_fstOrder + [(f_birth,), (f_birth,), (f_birth,)] => f_birth + [(f_death,), (f_death,), (f_death,)] => f_death + + :sums + [(N,), (N,), (N,)] => N + end + + + @test chain_ltype == chain_ltype_nstratify + + +end + + + + From ad0614662b86490bec2fecece9f1866dbf2cb28e Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Wed, 6 Sep 2023 20:05:05 -0600 Subject: [PATCH 16/23] Fixed duplicate typo from merge error in syntax test --- test/Syntax.jl | 56 -------------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/test/Syntax.jl b/test/Syntax.jl index bcc48933..ddfe0de7 100755 --- a/test/Syntax.jl +++ b/test/Syntax.jl @@ -546,62 +546,6 @@ end end -@testset "Applying flags throws on invalid inputs" begin - @test_throws ErrorException apply_flags(:f_, Set([:+]), [:f_death, :f_birth]) # fails because :+ is not a defined operation - @test_throws ErrorException apply_flags(:f_birth, Set([:~, :+]), [:f_death, :f_birth]) # also fails for same reason - - @test_throws AssertionError apply_flags(:NOMATCH, Set{Symbol}(), Vector{Symbol}()) # fails because it's not looking for substrings, and :NOMATCH isn't in the list of options. - @test_throws AssertionError apply_flags(:NOMATCH, Set{Symbol}(), [:nomatch]) # same reason - -end - - # Mapping it all to I - - # This one fails when trying to figure out the inflow. Stock maps to 2, and flow maps to 2, - # But inflows on the target have (1,2) and (2,3) - - # This also wouldn't work if we tried mapping flow to 1 instead. Outflows expect 1,1 or 2,2, - # so it fails on (2,1). - @test_throws KeyError (infer_links( - (@stock_and_flow begin - :stocks - pop - - :parameters - p_generic - - - :flows - pop => f_generic(p_generic * pop) => pop - - :sums - N = [pop] - NI = [pop] - NS = [pop] - end), - (@stock_and_flow begin - :stocks - S - I - R - - :parameters - p_inf - p_rec - - - :flows - S => f_StoI(p_inf * S) => I - I => f_ItoR(I * p_rec) => R - - :sums - N = [S,I,R] - NI = [I] - NS = [S,I,R] - end), - Dict{Symbol, Vector{Int64}}(:S => [2], :F => [2], :SV => [1,2,3], :P => [2], :V => [2]))) - -end @testset "Applying flags throws on invalid inputs" begin @test_throws ErrorException apply_flags(:f_, Set([:+]), [:f_death, :f_birth]) # fails because :+ is not a defined operation From 1e546720f26b039dbe6e9e7e56074a5a2f3be220 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Wed, 6 Sep 2023 20:52:39 -0600 Subject: [PATCH 17/23] Moved stratification test to a syntax folder. Realized it didn't actually make sense to take the pullback of 0 items so removed that as an option. Now allow single symbols to be interpreted as a tuple with one element, so n_stratify is far less cumbersome to write for. --- src/syntax/Stratification.jl | 42 ++++++++++++++-------------- test/Syntax.jl | 2 +- test/{ => syntax}/Stratification.jl | 43 +++++++++++++++++++++++++++-- 3 files changed, 62 insertions(+), 25 deletions(-) rename test/{ => syntax}/Stratification.jl (96%) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index e97f1037..88e7e0a3 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -124,7 +124,7 @@ function interpret_stratification_generalized_notation(mapping_pair::Expr)::Vect # asserts are covered before this function is called. other = mapping_pair.args[2].args # needs to be a vector of tuples of symbols type = mapping_pair.args[3] # needs to be a symbol - return [[DSLArgument(sym, type) for sym ∈ tup.args] for tup ∈ other] + return [((typeof(tup) == Expr) && (tup.head == :tuple)) ? [DSLArgument(sym, type) for sym ∈ tup.args] : [DSLArgument(tup, type)] for tup ∈ other] end @@ -145,8 +145,10 @@ function read_stratification_line_and_update_dictionaries!(line::Expr, other_nam @assert typeof(line.args[3]) == Symbol @assert line.args[1] == :(=>) @assert length(line.args[2].args) == length(other_names) - @assert all(tup -> length(tup.args) == 1, line.args[2].args) # every element of the vector is an expression of tuple. - @assert all(tup -> all(sym -> typeof(sym) <: Union{Symbol, Expr}, tup.args), line.args[2].args) # ensure all arguments in the tuples are expressions or symbols. + @assert all(tup -> typeof(tup) == Symbol || tup.args[1] == :~ || length(tup.args) == 1, line.args[2].args) # every element of the vector is an expression of tuple. + @assert all(tup -> typeof(tup) == Symbol || tup.args[1] == :~ || all(sym -> typeof(sym) <: Union{Symbol, Expr}, tup.args), line.args[2].args) # ensure all arguments in the tuples are expressions or symbols. + # In the future, if we have additional flags, may need to check for them as well. + # These asserts are a bit sloppy end current_symbol_dict::Vector{Vector{DSLArgument}} = interpret_stratification_notation_function(line) @@ -180,19 +182,19 @@ function iterate_over_stratification_lines!(block, other_names::Vector{SFNames}, for statement in block.args @match statement begin QuoteNode(:stocks) => begin - current_phase = s -> read_stratification_line_and_update_dictionaries!(s, getfield.(other_names, :s), type_names.s, getfield.(other_names, :ms); use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) + current_phase = s -> read_stratification_line_and_update_dictionaries!(s, (getfield.(other_names, :s))::Vector{Dict{Symbol, Int}}, type_names.s, (getfield.(other_names, :ms))::Vector{Dict{Int, Int}}; use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:sums) => begin - current_phase = sv -> read_stratification_line_and_update_dictionaries!(sv, getfield.(other_names, :sv), type_names.sv, getfield.(other_names, :msv); use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) + current_phase = sv -> read_stratification_line_and_update_dictionaries!(sv, (getfield.(other_names, :sv))::Vector{Dict{Symbol, Int}}, type_names.sv, (getfield.(other_names, :msv))::Vector{Dict{Int, Int}}; use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:dynamic_variables) => begin - current_phase = v -> read_stratification_line_and_update_dictionaries!(v, getfield.(other_names, :v), type_names.v, getfield.(other_names, :mv); use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) + current_phase = v -> read_stratification_line_and_update_dictionaries!(v, (getfield.(other_names, :v))::Vector{Dict{Symbol, Int}}, type_names.v, (getfield.(other_names, :mv))::Vector{Dict{Int, Int}}; use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:flows) => begin - current_phase = f -> read_stratification_line_and_update_dictionaries!(f,getfield.(other_names, :f), type_names.f, getfield.(other_names, :mf); use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) + current_phase = f -> read_stratification_line_and_update_dictionaries!(f, (getfield.(other_names, :f))::Vector{Dict{Symbol, Int}}, type_names.f, (getfield.(other_names, :mf))::Vector{Dict{Int, Int}}; use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(:parameters) => begin - current_phase = p -> read_stratification_line_and_update_dictionaries!(p, getfield.(other_names, :p), type_names.p, getfield.(other_names, :mp); use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) + current_phase = p -> read_stratification_line_and_update_dictionaries!(p, (getfield.(other_names, :p))::Vector{Dict{Symbol, Int}}, type_names.p, (getfield.(other_names, :mp))::Vector{Dict{Int, Int}}; use_standard_stratification_syntax=use_standard_stratification_syntax, strict_matches=strict_matches, use_flags=use_flags) end QuoteNode(kw) => error("Unknown block type for stratify syntax: " * String(kw)) @@ -387,23 +389,19 @@ macro stratify(strata, type, aggregate, block) end end + +``` +Alternate syntax for stratification, allows for an arbitrary number of stockflows in a pullback. +Second last argument must be the type stockflow, last must be the block describing how the stratificaition is done. All arguments before that must be stockflows. + + +``` macro n_stratify(args...) - if length(args) < 2 + if length(args) < 3 return :(MethodError("Too few arguments provided! Please provide some number of stockflows, then the type stock flow, then a quote block.")) else - - - escaped_block = Expr(:quote, args[end]) - other_sfs = esc.(args[1:end-2]) - type = (esc(args[end-1])) - if length(other_sfs) == 0 - quote - sfstratify(Vector{AbstractStockAndFlowF}, $type, $escaped_block ; use_standard_stratification_syntax = false) - end - else - quote - sfstratify([$(other_sfs...)], $type, $escaped_block ; use_standard_stratification_syntax = false) - end + quote + sfstratify([$(other_sfs...)], $type, $escaped_block ; use_standard_stratification_syntax = false) end end end diff --git a/test/Syntax.jl b/test/Syntax.jl index ddfe0de7..6d07f1f6 100755 --- a/test/Syntax.jl +++ b/test/Syntax.jl @@ -5,7 +5,7 @@ using StockFlow.Syntax using StockFlow.Syntax: is_binop_or_unary, sum_variables, infix_expression_to_binops, fnone_value_or_vector, extract_function_name_and_args_expr, is_recursive_dyvar, create_foot, apply_flags, substitute_symbols @testset "Stratification DSL" begin - include("Stratification.jl") + include("./syntax/Stratification.jl") end @testset "is_binop_or_unary recognises binops" begin diff --git a/test/Stratification.jl b/test/syntax/Stratification.jl similarity index 96% rename from test/Stratification.jl rename to test/syntax/Stratification.jl index 7ce1fd5f..dd0dd18e 100755 --- a/test/Stratification.jl +++ b/test/syntax/Stratification.jl @@ -1,3 +1,12 @@ +using Pkg; +Pkg.activate(".") +using StockFlow +using StockFlow.Syntax +using Test + + + + using StockFlow.Syntax.Stratification using StockFlow.Syntax.Stratification: interpret_stratification_standard_notation @@ -69,7 +78,7 @@ using Catlab.CategoricalAlgebra :flows CLOUD => f_NewBorn(v_NewBorn) => NormalWeight - NormalWeight => f_DeathNormalWeight(v_DeathNormalWeight) => ClOUD + NormalWeight => f_DeathNormalWeight(v_DeathNormalWeight) => CLOUD NormalWeight => f_BecomingOverWeight(v_BecomingOverWeight) => OverWeight OverWeight => f_DeathOverWeight(v_DeathOverWeight) => CLOUD @@ -463,7 +472,7 @@ end chain_ltype_nstratify = @n_stratify l_type l_type l_type l_type begin :stocks - [(pop,), (~pop,), (_,)] => pop + [pop, ~pop, _] => pop :parameters [(μ,), (μ,), (μ,)] => μ @@ -489,6 +498,36 @@ end @test chain_ltype == chain_ltype_nstratify + + + + # empty_ltype_nstratify = @n_stratify l_type begin + # :stocks + # [] => pop + + # :parameters + # [] => μ + # [] => δ + # [] => rFstOrder + # [] => rage + + # :dynamic_variables + # [] => v_aging + # [] => v_fstOrder + # [] => v_birth + # [] => v_death + + # :flows + # [] => f_aging + # [] => f_fstOrder + # [] => f_birth + # [] => f_death + + # :sums + # [] => N + # end + + # @test empty_ltype_nstratify == StockAndFlowF() # Pretty sure this is right... end From 07f21d4fee1bf76a6266392854156c4accd0809a Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Wed, 6 Sep 2023 21:18:19 -0600 Subject: [PATCH 18/23] Added additional tests for n_stratify. Fixed a few assert statements. --- src/syntax/Stratification.jl | 5 +- test/syntax/Stratification.jl | 131 ++++++++++++++++++++++------------ 2 files changed, 91 insertions(+), 45 deletions(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index 88e7e0a3..aa43bfa4 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -145,7 +145,7 @@ function read_stratification_line_and_update_dictionaries!(line::Expr, other_nam @assert typeof(line.args[3]) == Symbol @assert line.args[1] == :(=>) @assert length(line.args[2].args) == length(other_names) - @assert all(tup -> typeof(tup) == Symbol || tup.args[1] == :~ || length(tup.args) == 1, line.args[2].args) # every element of the vector is an expression of tuple. + @assert all(tup -> typeof(tup) == Symbol || tup.args[1] == :~ || tup.head == :tuple, line.args[2].args) # every element of the vector is an expression of tuple. @assert all(tup -> typeof(tup) == Symbol || tup.args[1] == :~ || all(sym -> typeof(sym) <: Union{Symbol, Expr}, tup.args), line.args[2].args) # ensure all arguments in the tuples are expressions or symbols. # In the future, if we have additional flags, may need to check for them as well. # These asserts are a bit sloppy @@ -400,6 +400,9 @@ macro n_stratify(args...) if length(args) < 3 return :(MethodError("Too few arguments provided! Please provide some number of stockflows, then the type stock flow, then a quote block.")) else + escaped_block = Expr(:quote, args[end]) + other_sfs = esc.(args[1:end-2]) + type = (esc(args[end-1])) quote sfstratify([$(other_sfs...)], $type, $escaped_block ; use_standard_stratification_syntax = false) end diff --git a/test/syntax/Stratification.jl b/test/syntax/Stratification.jl index dd0dd18e..7523f783 100755 --- a/test/syntax/Stratification.jl +++ b/test/syntax/Stratification.jl @@ -1,12 +1,3 @@ -using Pkg; -Pkg.activate(".") -using StockFlow -using StockFlow.Syntax -using Test - - - - using StockFlow.Syntax.Stratification using StockFlow.Syntax.Stratification: interpret_stratification_standard_notation @@ -263,12 +254,64 @@ using Catlab.CategoricalAlgebra end + age_weight_5 = @n_stratify WeightModel ageWeightModel l_type begin + :stocks + [_, _] => pop + + :flows + [~Death, ~Death] => f_death + [~id, ~aging] => f_aging + [~Becoming, ~id] => f_fstOrder + [_, f_NB] => f_birth + + + :dynamic_variables + [v_NewBorn, v_NB] => v_birth + [~Death, ~Death] => v_death + [~id, (v_agingCA, v_agingAS)] => v_aging + [(v_BecomingOverWeight, v_BecomingObese), (v_idC, v_idA, v_idS)] => v_fstOrder + + :parameters + [μ, μ] => μ + [(δw, δo), (δC, δA, δS)] => δ + [(rw, ro), r] => rFstOrder + [rage, (rageCA, rageAS)] => rage + + :sums + [N,N] => N + end + + age_weight_6 = @n_stratify WeightModel ageWeightModel l_type begin + + :flows + [~Death, ~Death] => f_death + [~id, ~aging] => f_aging + [~Becoming, ~id] => f_fstOrder + [_, f_NB] => f_birth + + + :dynamic_variables + [v_NewBorn, v_NB] => v_birth + [~Death, ~Death] => v_death + [~id, (v_agingCA, v_agingAS)] => v_aging + [(v_BecomingOverWeight, v_BecomingObese), (v_idC, v_idA, v_idS)] => v_fstOrder + + :parameters + [μ, μ] => μ + [(δw, δo), (δC, δA, δS)] => δ + [(rw, ro), r] => rFstOrder + [rage, (rageCA, rageAS)] => rage + + end @test aged_weight == age_weight_2 @test aged_weight == age_weight_3 @test aged_weight == age_weight_4 + @test aged_weight == age_weight_5 + @test aged_weight == age_weight_6 + end @testset "Ensuring interpret_stratification_standard_notation correctly reads lines" begin # This should be all valid cases. There's always going to be at least one value on both sides. @@ -475,59 +518,59 @@ end [pop, ~pop, _] => pop :parameters - [(μ,), (μ,), (μ,)] => μ - [(δ,), (δ,), (δ,)] => δ - [(rFstOrder,), (rFstOrder,), (rFstOrder,)] => rFstOrder - [(rage,), (rage,), (rage,)] => rage + [μ, μ, μ] => μ + [δ, δ, δ] => δ + [rFstOrder, rFstOrder, rFstOrder] => rFstOrder + [rage, rage, rage] => rage :dynamic_variables - [(v_aging,), (v_aging,), (v_aging,)] => v_aging - [(v_fstOrder,), (v_fstOrder,), (v_fstOrder,)] => v_fstOrder - [(v_birth,), (v_birth,), (v_birth,)] => v_birth - [(v_death,), (v_death,), (v_death,)] => v_death + [v_aging, v_aging, v_aging] => v_aging + [v_fstOrder, v_fstOrder, v_fstOrder] => v_fstOrder + [v_birth, v_birth, v_birth] => v_birth + [v_death, v_death, v_death] => v_death :flows - [(f_aging,), (f_aging,), (f_aging,)] => f_aging - [(f_fstOrder,), (f_fstOrder,), (f_fstOrder,)] => f_fstOrder - [(f_birth,), (f_birth,), (f_birth,)] => f_birth - [(f_death,), (f_death,), (f_death,)] => f_death + [f_aging, f_aging, f_aging] => f_aging + [f_fstOrder, f_fstOrder, f_fstOrder] => f_fstOrder + [f_birth, f_birth, f_birth] => f_birth + [f_death, f_death, f_death] => f_death :sums - [(N,), (N,), (N,)] => N + [N, N, N] => N end @test chain_ltype == chain_ltype_nstratify + ltype_nstratify = @n_stratify l_type l_type begin - # empty_ltype_nstratify = @n_stratify l_type begin - # :stocks - # [] => pop + :stocks + [pop] => pop - # :parameters - # [] => μ - # [] => δ - # [] => rFstOrder - # [] => rage + :parameters + [μ] => μ + [δ] => δ + [rFstOrder] => rFstOrder + [rage] => rage - # :dynamic_variables - # [] => v_aging - # [] => v_fstOrder - # [] => v_birth - # [] => v_death + :dynamic_variables + [v_aging] => v_aging + [v_fstOrder] => v_fstOrder + [v_birth] => v_birth + [v_death] => v_death - # :flows - # [] => f_aging - # [] => f_fstOrder - # [] => f_birth - # [] => f_death + :flows + [f_aging] => f_aging + [f_fstOrder] => f_fstOrder + [f_birth] => f_birth + [f_death] => f_death - # :sums - # [] => N - # end + :sums + [N] => N + end - # @test empty_ltype_nstratify == StockAndFlowF() # Pretty sure this is right... + @test ltype_nstratify == l_type end From 74e3efe986d1696a69e2548a2a2e2ee802155c3d Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Wed, 6 Sep 2023 21:31:05 -0600 Subject: [PATCH 19/23] fixed a typo in syntax.jl test causing a test to fail --- test/Syntax.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Syntax.jl b/test/Syntax.jl index 6d07f1f6..0bbfe47d 100755 --- a/test/Syntax.jl +++ b/test/Syntax.jl @@ -394,7 +394,7 @@ end p_rec - :flowssaff_args + :flows S => f_StoI(p_inf * S) => I I => f_ItoR(I * p_rec) => R From 6b94a4206f98b120e158646a8cf40f5ba52e89f0 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Wed, 6 Sep 2023 21:37:46 -0600 Subject: [PATCH 20/23] Updated n_stratify docstring --- src/syntax/Stratification.jl | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index aa43bfa4..58627f1d 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -390,12 +390,42 @@ macro stratify(strata, type, aggregate, block) end -``` +""" Alternate syntax for stratification, allows for an arbitrary number of stockflows in a pullback. Second last argument must be the type stockflow, last must be the block describing how the stratificaition is done. All arguments before that must be stockflows. +```julia + +@n_stratify WeightModel ageWeightModel l_type begin + :stocks + [_, _] => pop + + :flows + [~Death, ~Death] => f_death + [~id, ~aging] => f_aging + [~Becoming, ~id] => f_fstOrder + [_, f_NB] => f_birth + + + :dynamic_variables + [v_NewBorn, v_NB] => v_birth + [~Death, ~Death] => v_death + [~id, (v_agingCA, v_agingAS)] => v_aging + [(v_BecomingOverWeight, v_BecomingObese), (v_idC, v_idA, v_idS)] => v_fstOrder + + :parameters + [μ, μ] => μ + [(δw, δo), (δC, δA, δS)] => δ + [(rw, ro), r] => rFstOrder + [rage, (rageCA, rageAS)] => rage + + :sums + [N,N] => N +end ``` + +""" macro n_stratify(args...) if length(args) < 3 return :(MethodError("Too few arguments provided! Please provide some number of stockflows, then the type stock flow, then a quote block.")) From 3c436f44c125a3cbe6f838f873462a15a557ad48 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Tue, 26 Sep 2023 11:23:11 -0600 Subject: [PATCH 21/23] Minor comment touchups. --- src/syntax/Stratification.jl | 2 -- test/syntax/Stratification.jl | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/syntax/Stratification.jl b/src/syntax/Stratification.jl index 58627f1d..fad2b345 100755 --- a/src/syntax/Stratification.jl +++ b/src/syntax/Stratification.jl @@ -331,8 +331,6 @@ function sfstratify(others::Vector{K}, type::K, block::Expr ; use_standard_strat # STEP 8 - # pullback_function = (prev, next) -> pullback(prev, next) |> apex |> rebuildStratifiedModelByFlattenSymbols; - # pullback_model = accumulate(pullback_function, all_transformations[2:end] ; init=all_transformations[1]) pullback_model = pullback(all_transformations) |> apex |> rebuildStratifiedModelByFlattenSymbols; if return_homs diff --git a/test/syntax/Stratification.jl b/test/syntax/Stratification.jl index 7523f783..bfdea7d2 100755 --- a/test/syntax/Stratification.jl +++ b/test/syntax/Stratification.jl @@ -368,12 +368,11 @@ end @test substitute_symbols(s1, t1, m1₂) == Dict(1 => 2) # A=>B -> 1=>2 @test substitute_symbols(s1, t1, m1₂, use_flags=false) == Dict(1 => 2) # A=>B -> 1=>2 - s2 = Dict(:A1 => 10, :A2 => 20, :A3 => 30) # Unfortunately, cannot do substring matches starting with numbers, since it would require a symbol starting with a numbre. Might need to add something for this... + s2 = Dict(:A1 => 10, :A2 => 20, :A3 => 30) # Unfortunately, cannot do substring matches starting with numbers, since it would require a symbol starting with a number. Might need to add something for this... t2 = Dict(:B1 => 1, :B2 => 2) m2₁ = [DSLArgument(:A, :B1, Set{Symbol}([:~]))] @test substitute_symbols(s2, t2, m2₁) == Dict(10 => 1, 20 => 1, 30 => 1) #~A=>B -> 10=>1, 20=>1, 30=>1 - # @test substitute_symbols(s2, t2, m2₁, use_flags=false) == Dict() # deliberately throws an error s3 = Dict{Symbol, Int}() t3 = Dict{Symbol, Int}() From 16cde7698a8c48edcc2da3d352b1db0d3dec0c88 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Tue, 26 Sep 2023 20:04:15 -0600 Subject: [PATCH 22/23] Updates to integrate composition with stratification tests. --- src/Syntax.jl | 2 +- test/Syntax.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Syntax.jl b/src/Syntax.jl index a3b9e7b4..7b77f456 100644 --- a/src/Syntax.jl +++ b/src/Syntax.jl @@ -1249,7 +1249,7 @@ NothingFunction(x...)::Nothing = nothing; - +include("syntax/Composition.jl") include("syntax/Stratification.jl") end diff --git a/test/Syntax.jl b/test/Syntax.jl index 24ee36fc..d0fb2d5b 100755 --- a/test/Syntax.jl +++ b/test/Syntax.jl @@ -5,7 +5,7 @@ using StockFlow.Syntax using StockFlow.Syntax: is_binop_or_unary, sum_variables, infix_expression_to_binops, fnone_value_or_vector, extract_function_name_and_args_expr, is_recursive_dyvar, create_foot, apply_flags, substitute_symbols @testset "Stratification DSL" begin - include("./syntax/Stratification.jl") + include("syntax/Stratification.jl") end @testset "Composition DSL" begin From 2d5b2f869d5be194590f2d4bd4ea42f32d498736 Mon Sep 17 00:00:00 2001 From: Thomas Purdy Date: Tue, 26 Sep 2023 21:54:36 -0600 Subject: [PATCH 23/23] create_foot can accept a tuple of one element. (@feet ) returns an empty vector of StockAndFlow0 --- src/Syntax.jl | 28 +++++++++++++++++++--------- test/Syntax.jl | 27 +++++++++++++-------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/Syntax.jl b/src/Syntax.jl index 7b77f456..b14566bb 100644 --- a/src/Syntax.jl +++ b/src/Syntax.jl @@ -951,8 +951,10 @@ Create a foot with S => N syntax, where S is stock, N is sum variable. ``` """ macro foot(block::Expr) - Base.remove_linenums!(block) - return create_foot(block) + escaped_block = Expr(:quote, block) + quote + create_foot($(escaped_block)) + end end @@ -976,14 +978,23 @@ end """ macro feet(block::Expr) Base.remove_linenums!(block) - @match block begin - quote - $((block...)) - end => map(create_foot, block) # also matches empty - Expr(e, _...) => [create_foot(block)] # this also matches the above, so it's necessary this comes second. + escaped_block = Expr(:quote, block) + quote + inner_block = $escaped_block + @match inner_block begin + quote + $((inner_block...)) + end => map(create_foot, inner_block) # also matches empty + Expr(e, _...) => [create_foot(inner_block)] # this also matches the above, so it's necessary this comes second. + end end end +macro feet() + quote + Vector{StockAndFlow0}() + end +end """ create_foot(block :: Expr) @@ -1004,10 +1015,9 @@ multiple_links = @foot A => B, A => B # will have two links from A to B. """ function create_foot(block::Expr) @match block.head begin - :tuple => begin if isempty(block.args) # case for create_foot(:()) - error("Cannot create foot with no arguments.") + error("Cannot create foot with zero arguments.") end foot_s = Vector{Symbol}() foot_sv = Vector{Symbol}() diff --git a/test/Syntax.jl b/test/Syntax.jl index d0fb2d5b..22c55e64 100755 --- a/test/Syntax.jl +++ b/test/Syntax.jl @@ -2,7 +2,7 @@ using Base: is_unary_and_binary_operator using Test using StockFlow using StockFlow.Syntax -using StockFlow.Syntax: is_binop_or_unary, sum_variables, infix_expression_to_binops, fnone_value_or_vector, extract_function_name_and_args_expr, is_recursive_dyvar, create_foot, apply_flags, substitute_symbols +using StockFlow.Syntax: is_binop_or_unary, sum_variables, infix_expression_to_binops, fnone_value_or_vector, extract_function_name_and_args_expr, is_recursive_dyvar, create_foot, apply_flags, substitute_symbols, DSLArgument @testset "Stratification DSL" begin include("syntax/Stratification.jl") @@ -296,16 +296,14 @@ end end @testset "foot syntax disallows invalid feet" begin # note, @feet calls create_foot for each line, so this should apply to both @foot and @feet - @test_throws Exception create_foot(:(A => B => C)) # Invalid syntax for second argument of foot: B => C - @test_throws Exception create_foot(:(oooo2 + f => C)) # Invalid syntax for first argument of foot: oooo2 + f - @test_throws Exception create_foot(:(A + B)) # Invalid syntax function for foot: + - @test_throws Exception create_foot(:(=>)) # no method matching create_foot(::Symbol) - @test_throws Exception create_foot(:(=>(A, B, C, D))) - @test_throws Exception create_foot(:()) - @test_throws Exception create_foot(:(([]) => ())) - - @test_throws Exception create_foot(:(A => B, P => Q, C)) - @test_throws Exception create_foot(:(() => E, () => (K,))) + @test_throws ErrorException @foot A => B => C # Invalid syntax for second argument of foot: B => C + @test_throws ErrorException @foot oooo2 + f => C # Invalid syntax for first argument of foot: oooo2 + f + @test_throws ErrorException @foot A + B # Invalid syntax function for foot: + + @test_throws ErrorException @foot =>(A, B, C, D) + @test_throws ErrorException @foot () + @test_throws ErrorException @foot ([]) => () + @test_throws MethodError @foot A => B, P => Q, C # Issue here is it tries calling match_foot_format with a symbol + @test_throws ErrorException @foot () => E, () => (K,) end @@ -344,12 +342,13 @@ end foot(:J, (:K, :Q), (:J => :K, :J => :Q)) ] + @test (@feet ) == Vector{StockAndFlow0}(); end @testset "feet syntax fails on invalid feet" begin # mostly to check that an exception is thrown even if some of the feet are valid. - @test_throws Exception @eval @feet A => B => C # eval required so the errors occur at runtime, rather than at compilation - @test_throws Exception @eval @feet begin A => B; =>(D,E,F) end - @test_throws Exception @eval @feet begin A => B; 1 => 2; end + @test_throws ErrorException @feet A => B => C + @test_throws ErrorException @feet begin A => B; =>(D,E,F) end + @test_throws ErrorException @feet begin A => B; 1 => 2; end end ###########################