diff --git a/src/GlobalTradeAnalysisProjectModelV7.jl b/src/GlobalTradeAnalysisProjectModelV7.jl index cea8506..f404dde 100644 --- a/src/GlobalTradeAnalysisProjectModelV7.jl +++ b/src/GlobalTradeAnalysisProjectModelV7.jl @@ -1,6 +1,6 @@ module GlobalTradeAnalysisProjectModelV7 -export generate_starting_values, get_sample_data, solve_model, calculate_ev, calibrate, calculate_gdp, aggregate_data, aggregate_data_legacy, model_container, build_model!, initialize_model!, extract_model!, solve_model! +export generate_starting_values, get_sample_data, solve_model, calculate_ev, calibrate, calculate_gdp, aggregate_data, aggregate_data_legacy, model_container, build_model!, initialize_model!, extract_model!, solve_model!,generate_calibration_inputs, generate_initial_model, run_model! using NamedArrays, Ipopt, JuMP, JLD2 import ComputableGeneralEquilibriumHelpers: cde, ces diff --git a/src/generate_initial_model.jl b/src/generate_initial_model.jl index 9e79714..414f199 100644 --- a/src/generate_initial_model.jl +++ b/src/generate_initial_model.jl @@ -1,5 +1,5 @@ function generate_initial_model(; hSets, hData, hParameters) - (; sets=sets, parameters, data, fixed) = generate_starting_values(; hSets, hData, hParameters) + (; sets, parameters, data, fixed) = generate_starting_values(; hSets, hData, hParameters) mc = model_container(JuMP.Model(Ipopt.Optimizer), data, parameters, sets, fixed) build_model!(mc) return mc