Update Constructor

paschermayr · Oct 24, 2022 · 5ec10fe · 5ec10fe · paschermayr · Oct 24, 2022
1 parent 1e45efb
commit 5ec10fe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Baytes"
 uuid = "72ddfcfc-6e9d-43df-829b-7aed7c549d4f"
 authors = ["Patrick Aschermayr <p.aschermayr@gmail.com>"]
-version = "0.2.0"
+version = "0.2.1"
 
 [deps]
 ArgCheck = "dce04be8-c92d-5529-be00-80e4d2c0e197"

diff --git a/src/sampling/construct.jl b/src/sampling/construct.jl
@@ -79,6 +79,7 @@ function construct(
     tempering::BaytesCore.TemperingMethod,
     datatune::DataTune,
     chains::Integer,
+    updatesampler::BaytesCore.UpdateBool,
     args...;
 ) where {D}
     ## Initiate Tempering Tune with correct model parameter type.
@@ -91,7 +92,7 @@ function construct(
             _rng,
             modelᵛ[begin],
             BaytesCore.adjust(datatuneᵛ[begin], data),
-            temperature₀,
+            BaytesCore.ProposalTune(temperature₀, updatesampler, datatuneᵛ[begin]),
             default
         ),
         args,
@@ -104,7 +105,7 @@ function construct(
             algorithm -> algorithm(
                 _rng, modelᵛ[Nchain],
                 BaytesCore.adjust(datatuneᵛ[Nchain], data),
-                temperature₀,
+                BaytesCore.ProposalTune(temperature₀, updatesampler, datatuneᵛ[Nchain]),
                 default
             ),
             args,
@@ -120,14 +121,20 @@ function construct(
     tempering::BaytesCore.TemperingMethod,
     datatune::DataTune,
     chains::Integer,
+    updatesampler::BaytesCore.UpdateBool,
     smc::SMCConstructor;
 ) where {D}
     ## Assign tempering struct with correct temperature type
     temperingtune, temperature₀ = construct(tempering, model, default.chains)
     ## Assign model for chains
     modelᵛ, datatuneᵛ = construct(model, datatune, chains, smc)
     ## Assign algorithm
-    algorithmsᵛ = smc(_rng, model, BaytesCore.adjust(datatune, data), temperature₀, default)
+    algorithmsᵛ = smc(_rng,
+        model,
+        BaytesCore.adjust(datatune, data),
+        BaytesCore.ProposalTune(temperature₀, updatesampler, datatune), 
+        default
+    )
     return modelᵛ, algorithmsᵛ, temperingtune, datatuneᵛ
 end
 

diff --git a/src/sampling/sample.jl b/src/sampling/sample.jl
@@ -51,7 +51,7 @@ function sample(
     ## Initialize algorithms
     println("Constructing new sampler...")
     modelᵛ, algorithmᵛ, tempertune, datatuneᵛ = construct(
-        _rng, model, data, default, tempering, datatune, chains, args...
+        _rng, model, data, default, tempering, datatune, chains, updatesampler, args...
     )
     ## Initialize trace
     trace = Trace(