draft event system II (WIP)

mainHelpers.jl

@@ -2,7 +2,8 @@ include("lib/loadLibsPath.jl")
 
 addToLoadPath!(String(@__DIR__) * "/.", 
                String(@__DIR__) * "/lib",
-               String(@__DIR__) * "/src")
+               String(@__DIR__) * "/src",
+               String(@__DIR__) * "/src/simulate")
 
 using ArgParse
 

src/DemographyModel.jl

@@ -18,24 +18,28 @@ include("setup/population.jl")
 include("setup/mapPop.jl")
 include("setup/mapBenefits.jl")
 
+
+using Age, Social, TasksCare, Dependencies
+
+
 include("simulate/allocate.jl")
 include("simulate/death.jl")
 include("simulate/birth.jl")  
 include("simulate/divorce.jl")       
-include("simulate/ageTransition.jl")
-include("simulate/socialTransition.jl")
 include("simulate/jobtransition.jl")
 include("simulate/relocate.jl")
 include("simulate/marriages.jl")
-include("simulate/dependencies.jl")
 include("simulate/socialCareTransition.jl")
 include("simulate/care.jl")
 include("simulate/income.jl")
 include("simulate/jobmarket.jl")
 include("simulate/benefits.jl")
 include("simulate/wealth.jl")
 include("simulate/housing_topdown.jl")
-include("simulate/taskscare.jl")
+
+
+include("demoEvents.jl")
+
 
 using Utilities
 

src/simulate/events.jl → src/demoEvents.jl

@@ -1,16 +1,17 @@
+using ChangeEvents
 using Age
 using Dependencies
-using TasksCareT
+using TasksCare
 using Social
 
 
-function trigger!(c::ChangeAge1Yr, args...)
+function ChangeEvents.trigger!(c::ChangeAge1Yr, args...)
     process!(c, DependenciesT(), args...)
     process!(c, SocialT(), args...)
     process!(c, TasksCareT(), args...)
 end
 
 
-function trigger!(c::ChangeStatus, args...)
+function ChangeEvents.trigger!(c::ChangeStatus, args...)
     process!(c, TasksCareT(), args...)
 end

src/simulate/dependencies.jl → src/simulate/Dependencies.jl

@@ -2,7 +2,7 @@ module Dependencies
 
 
 using Age
-using Events
+using ChangeEvents
 
 
 export selectAssignGuardian, assignGuardian!, findFamilyGuardian, findOtherGuardian

src/simulate/socialTransition.jl → src/simulate/Social.jl

@@ -3,9 +3,9 @@ module Social
 using Distributions: Normal, LogNormal
 
 using Age
-using Events
+using ChangeEvents
 
-export socialTransition!, selectSocialTransition 
+export socialTransition!, selectSocialTransition, SocialCache, changeStatus! 
 export ChangeStatus, SocialT
 
 
@@ -29,7 +29,7 @@ end
 
 struct SocialT end
 
-function process!(::ChangeAge1Yr, ::SocialT, person, model, pars)
+function ChangeEvents.process!(::ChangeAge1Yr, ::SocialT, person, model, pars)
     if person.age == pars.ageTeenagers
         changeStatus!(person, WorkStatus.teenager, pars)
     # all agents first become students, start working in social transition

src/simulate/taskscare.jl → src/simulate/TasksCare.jl

@@ -1,22 +1,22 @@
-module TasksCareT
+module TasksCare
 
 using Age, Social
-using Events
-
-export weeklyCareSupply, availableCareTime, TasksCareT
+using ChangeEvents
 
+export weeklyCareSupply, availableCareTime 
+export TasksCareT 
 
 struct TasksCareT end
 
 
-function process!(::ChangeAge1Yr, ::TasksCareT, person, model, pars)
+function ChangeEvents.process!(::ChangeAge1Yr, ::TasksCareT, person, model, pars)
     # child ages out of care need this time step
     if person.age == pars.stopBabyCareAge || person.age == pars.stopChildCareAge 
         careNeedChanged!(person, pars)
     end
 end
 
-function process!(::ChangeStatus, ::TasksCareT, person, oldStatus, pars)
+function ChangeEvents.process!(::ChangeStatus, ::TasksCareT, person, oldStatus, pars)
     careSupplyChanged!(person, pars)
 end