move EpiProblem and EpiMethod into EpiAwareBase

CDCgov · Mar 27, 2024 · 1eda853 · 1eda853
1 parent 75048aa
commit 1eda853
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 19 deletions.
diff --git a/EpiAware/src/EpiAware.jl b/EpiAware/src/EpiAware.jl
@@ -55,12 +55,6 @@ include("EpiObsModels/EpiObsModels.jl")
 include("EpiInference/EpiInference.jl")
 @reexport using .EpiInference
 
-#Export problems
-export EpiProblem
-
-#Export inference methods
-export EpiMethod
-
 #Export functions
 export make_epi_aware, epi_solve
 

diff --git a/EpiAware/src/EpiAwareBase/EpiAwareBase.jl b/EpiAware/src/EpiAwareBase/EpiAwareBase.jl
@@ -9,16 +9,17 @@ using DocStringExtensions, DynamicPPL
 export AbstractModel, AbstractEpiModel, AbstractLatentModel, AbstractObservationModel
 
 #Export problems
-export AbstractEpiProblem
+export AbstractEpiProblem, EpiAwareProblem
 
 #Export inference methods
-export AbstractEpiMethod, AbstractEpiOptMethod, AbstractEpiSamplingMethod
+export AbstractEpiMethod, AbstractEpiOptMethod, AbstractEpiSamplingMethod, EpiMethod
 
 #Export functions
 export generate_latent, generate_latent_infs, generate_observations, _apply_method
 
 include("docstrings.jl")
 include("types.jl")
 include("functions.jl")
+include("EpiAwareProblem.jl")
 
 end
diff --git a/EpiAware/src/EpiAwareBase/EpiMethod.jl b/EpiAware/src/EpiAwareBase/EpiMethod.jl
@@ -0,0 +1,10 @@
+"""
+`EpiMethod` represents a method for performing EpiAware inference and/or generative
+modelling, which combines a sequence of optimization steps to pass initialisation
+information to a sampler method.
+"""
+@kwdef struct EpiMethod{
+    O <: AbstractEpiOptMethod, S <: AbstractEpiSamplingMethod} <: AbstractEpiMethod
+    pre_sampler_steps::Vector{O}
+    sampler::S
+end
diff --git a/EpiAware/src/epiawareproblem.jl → EpiAware/src/EpiAwareBase/EpiProblem.jl b/EpiAware/src/epiawareproblem.jl → EpiAware/src/EpiAwareBase/EpiProblem.jl
diff --git a/EpiAware/src/EpiInference/epiawaremethod.jl b/EpiAware/src/EpiInference/epiawaremethod.jl
@@ -1,14 +1,3 @@
-"""
-`EpiMethod` represents a method for performing EpiAware inference and/or generative
-modelling, which combines a sequence of optimization steps to pass initialisation
-information to a sampler method.
-"""
-@kwdef struct EpiMethod{
-    O <: AbstractEpiOptMethod, S <: AbstractEpiSamplingMethod} <:
-              AbstractEpiMethod
-    pre_sampler_steps::Vector{O}
-    sampler::S
-end
 
 """
 Apply steps definded by an `EpiMethod` to a `DynamicPPL.Model` object.

diff --git a/EpiAware/test/epiawareproblem.jl → ...ware/test/EpiAwareBase/EpiAwareProblem.jl b/EpiAware/test/epiawareproblem.jl → ...ware/test/EpiAwareBase/EpiAwareProblem.jl
diff --git a/EpiAware/test/epiawaremethod.jl → EpiAware/test/EpiAwareBase/EpiMethod.jl b/EpiAware/test/epiawaremethod.jl → EpiAware/test/EpiAwareBase/EpiMethod.jl