Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rearrange include list in module definition so that "defintions.jl" is above "spatial_structure.jl" #12

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
13 changes: 9 additions & 4 deletions src/GeneDrive.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,23 @@ import DataFrames
# Files
#####################
# TODO: Random.seed!(123)


include("genetics.jl")


include("temperature.jl")
include("temperature_responses.jl")

include("life_stages.jl")
include("genetics.jl")
include("life_stages.jl")
include("organisms.jl")
include("definitions.jl")

include("spatial_structure.jl")
include("exogenous_change.jl")

include("accessors.jl")
include("definitions.jl")



include("initialize.jl")
include("population_dynamics.jl")
Expand Down
57 changes: 36 additions & 21 deletions src/definitions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,41 @@
# Mappings #
################################################################################

const life_stage_key_map =
Dict("Egg" => Egg, "Larva" => Larva, "Pupa" => Pupa, "Male" => Male, "Female" => Female)

const genetics_key_map = Dict(
"WW" => WW,
"ww" => ww,
# end Wolbachia
"HH" => HH,
"Hh" => Hh,
"HR" => HR,
"hh" => hh,
"hR" => hR,
"RR" => RR,
# end single-locus homing gene drive (HGD/MCR)
"WR" => WR,
# end RIDL (total = WW, WR, RR)
"AA" => AA,
"Aa" => Aa,
"aa" => aa,
# end Mendelian
)


const life_stage_key_map =

Dict(
"Egg" => Egg,
"Larva" => Larva,
"Pupa" => Pupa,
"Male" => Male,
"Female" => Female)

const genetics_key_map =
Dict(
"WW" => WW,
"ww" => ww,
# end Wolbachia
"HH" => HH,
"Hh" => Hh,
"HR" => HR,
"hh" => hh,
"hR" => hR,
"RR" => RR,
# end single-locus homing gene drive (HGD/MCR)
"WR" => WR,
# end RIDL (total = WW, WR, RR)
"AA" => AA,
"Aa" => Aa,
"aa" => aa,
# end Mendelian
)

const MALE_FEMALE_RELEASE_FRACTION = 0.5






5 changes: 5 additions & 0 deletions testing_genedrive.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
using Pkg
Pkg.activate(".")
include("src/GeneDrive.jl")
using .GeneDrive