diff --git a/lpm.jl b/lpm.jl index b56de4d..70c6f2e 100644 --- a/lpm.jl +++ b/lpm.jl @@ -13,5 +13,7 @@ using SocioEconomicsX.Demography.Create using SocioEconomicsX.Demography.Initialize using SocioEconomicsX.Demography.Simulate +using SocioEconomicsX.Utilities + include("mainHelpers.jl") diff --git a/mainHelpers.jl b/mainHelpers.jl index 41b4407..ca8db0d 100644 --- a/mainHelpers.jl +++ b/mainHelpers.jl @@ -1,5 +1,3 @@ -#using Utilities - include("analysis.jl") mutable struct Model diff --git a/src/malpm/demography/SimSetup.jl b/src/malpm/demography/SimSetup.jl index 00f2095..3ec9047 100644 --- a/src/malpm/demography/SimSetup.jl +++ b/src/malpm/demography/SimSetup.jl @@ -11,7 +11,7 @@ using MALPM.Demography.Simulate: doDeaths!#, doBirths!, doDivorces! using MultiAgents: AbstractABMSimulation using MultiAgents: attach_pre_model_step!, attach_post_model_step!, attach_agent_step! -using Utilities: setVerbose!, unsetVerbose!, setDelay!, +using SocioEconomics.Utilities: setVerbose!, unsetVerbose!, setDelay!, checkAssumptions!, ignoreAssumptions! import MultiAgents: setup!, verbose export setup!