Mercurial > repos > PredictPDPS / file diff

--- a/src/PredictPDPS.jl	Mon Apr 22 13:28:58 2024 +0300
+++ b/src/PredictPDPS.jl	Wed Apr 24 11:34:09 2024 +0300
@@ -92,7 +92,7 @@
        demo_petB1, demo_petB2, demo_petB3, 
        demo_petB4, demo_petB5, demo_petB6, demo_petB7,
        batchrun_shepplogan, batchrun_brainphantom, batchrun_pet,
-       plot_denoising, plot_pet
+       plot_denoising, plot_pet, calculate_statistics
        
 ###################################
 # Parameterisation and experiments
@@ -144,22 +144,22 @@
 const p_known₀_denoising = (
     noise_level = 0.5,
     shake_noise_level = 0.025,
-    shake = 3.0,
+    shake = 2.0,
     α = 1.0,
     ρ̃₀ = 1.0,
     σ̃₀ = 1.0,
     δ = 0.9,
-    σ₀ = 0.1,
+    σ₀ = 1.0,
     τ₀ = 0.01,
-    # stable_interval = union(Set(1:1500),Set(6000:7500)),
-    # stable_interval = union(Set(2000:4000),Set(8000:10000)),
+    #stable_interval = Set(0),
+    stable_interval = union(Set(2500:5000),Set(8750:10000)),
 )
 
 const p_known₀ = (
     noise_level = 0.5,
     shake_noise_level = 0.05,
     shake = 2,
-    α = 1,
+    α = 0.15,
     ρ̃₀ = 1,
     σ̃₀ = 1,
     δ = 0.9,
@@ -275,7 +275,7 @@
 function name(e::Experiment, p)
     ig = e.imgen
     # return "$(ig.name)_$(e.mod.identifier)_$(@sprintf "%x" hash(p))"
-    return "$(ig.name)_$(e.mod.identifier)_$(Int64(10000*p.σ₀))_$(Int64(10000*p.τ₀))"
+    return "$(ig.name)_$(e.mod.identifier)_$(Int64(100*p.α))_$(Int64(10000*p.σ₀))_$(Int64(10000*p.τ₀))"
 end
 
 function write_tex(texfile, e_params)
@@ -362,8 +362,8 @@
                 # datafile = e_params.save_prefix * ".jld2"
 
                 write_log(perffile, st.log, "# params = $(e_params)\n")
-                write_log(hififile, st.log_hifi, "# params = $(e_params)\n")
-                write_tex(texfile, e_params)
+                #write_log(hififile, st.log_hifi, "# params = $(e_params)\n")
+                #write_tex(texfile, e_params)
                 # @save datafile x y st params
             end
 
@@ -400,7 +400,7 @@
                     save_images=false,
                     visualise=true,
                     recalculate=true,
-                    verbose_iter=1,
+                    verbose_iter=50,
                     fullscreen=true,
                     kwargs...)
 end
@@ -430,7 +430,7 @@
                     kwargs...)
 end
 
-function batchrun_denoising(kwargs...)
+function batchrun_denoising(;kwargs...)
     run_experiments(;experiments=denoising_experiments_all,
                     save_results=true,
                     save_images=true,
@@ -440,9 +440,9 @@
 end
 
 
-function batchrun_predictors(kwargs...)
-    batchrun_denoising()
-    batchrun_pet()
+function batchrun_predictors(;kwargs...)
+    batchrun_denoising(;kwargs...)
+    batchrun_pet(;kwargs...)
 end
 
 ######################################################