From 0b5f73e8f33f2a66185145da042d897b32637fc1 Mon Sep 17 00:00:00 2001
From: Sam <s.e.abbott12@gmail.com>
Date: Thu, 5 Dec 2024 17:02:42 +0000
Subject: [PATCH] revert define_ namming

---
 EpiAware/src/EpiLatentModels/EpiLatentModels.jl           | 7 ++++---
 .../combinations/{define_arima.jl => arima.jl}            | 6 +++---
 .../combinations/{define_arma.jl => arma.jl}              | 8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)
 rename EpiAware/src/EpiLatentModels/combinations/{define_arima.jl => arima.jl} (90%)
 rename EpiAware/src/EpiLatentModels/combinations/{define_arma.jl => arma.jl} (91%)

diff --git a/EpiAware/src/EpiLatentModels/EpiLatentModels.jl b/EpiAware/src/EpiLatentModels/EpiLatentModels.jl
index 7f21c4255..faa8f46f9 100644
--- a/EpiAware/src/EpiLatentModels/EpiLatentModels.jl
+++ b/EpiAware/src/EpiLatentModels/EpiLatentModels.jl
@@ -33,7 +33,7 @@ export broadcast_rule, broadcast_dayofweek, broadcast_weekly, equal_dimensions
 export DiffLatentModel, TransformLatentModel, PrefixLatentModel, RecordExpectedLatent
 
 # Export combinations of models and modifiers
-export define_arma, define_arima
+export arma, arima
 
 include("docstrings.jl")
 include("utils.jl")
@@ -55,7 +55,8 @@ include("manipulators/ConcatLatentModels.jl")
 include("manipulators/broadcast/LatentModel.jl")
 include("manipulators/broadcast/rules.jl")
 include("manipulators/broadcast/helpers.jl")
-include("combinations/define_arma.jl")
-include("combinations/define_arima.jl")
+include("combinations/arma.jl")
+include("combinations/arima.jl")
+include("utils.jl")
 
 end
diff --git a/EpiAware/src/EpiLatentModels/combinations/define_arima.jl b/EpiAware/src/EpiLatentModels/combinations/arima.jl
similarity index 90%
rename from EpiAware/src/EpiLatentModels/combinations/define_arima.jl
rename to EpiAware/src/EpiLatentModels/combinations/arima.jl
index 8af9b2a32..b8eac9d7d 100644
--- a/EpiAware/src/EpiLatentModels/combinations/define_arima.jl
+++ b/EpiAware/src/EpiLatentModels/combinations/arima.jl
@@ -27,8 +27,8 @@ ARIMA = arima(
     θ = [truncated(Normal(0.0, 0.02), -1, 1)],
     damp = [truncated(Normal(0.0, 0.02), 0, 1)]
 )
-arma_model = generate_latent(ARIMA, 10)
-arma_model()
+arima_model = generate_latent(ARIMA, 10)
+arima_model()
 ```
 """
 function arima(;
@@ -38,7 +38,7 @@ function arima(;
         θ = [truncated(Normal(0.0, 0.05), -1, 1)],
         ϵ_t = HierarchicalNormal()
 )
-    arma = define_arma(; init = ar_init, damp = damp, θ = θ, ϵ_t = ϵ_t)
+    arma = arma(; init = ar_init, damp = damp, θ = θ, ϵ_t = ϵ_t)
     arima_model = DiffLatentModel(; model = arma, init_priors = d_init)
     return arima_model
 end
diff --git a/EpiAware/src/EpiLatentModels/combinations/define_arma.jl b/EpiAware/src/EpiLatentModels/combinations/arma.jl
similarity index 91%
rename from EpiAware/src/EpiLatentModels/combinations/define_arma.jl
rename to EpiAware/src/EpiLatentModels/combinations/arma.jl
index 4fabac7b1..7af358647 100644
--- a/EpiAware/src/EpiLatentModels/combinations/define_arma.jl
+++ b/EpiAware/src/EpiLatentModels/combinations/arma.jl
@@ -19,15 +19,15 @@ An AR model with an MA model as its error term, effectively creating an ARMA mod
 ```@example
 using EpiAware, Distributions
 
-ARMA = define_arma(;
+ARMA = arma(;
  θ = [truncated(Normal(0.0, 0.02), -1, 1)],
  damp = [truncated(Normal(0.0, 0.02), 0, 1)]
 )
-arma = generate_latent(ARMA, 10)
-arma()
+arma_model = generate_latent(ARMA, 10)
+arma_model()
 ```
 """
-function define_arma(;
+function arma(;
         init = [Normal()],
         damp = [truncated(Normal(0.0, 0.05), 0, 1)],
         θ = [truncated(Normal(0.0, 0.05), -1, 1)],