Mercurial > repos > PredictPDPS / changeset
changeset
added new plots and filmstrips
Wed, 24 Apr 2024 16:54:38 +0300
- author
- Neil Dizon <neil.dizon@helsinki.fi>
- date
- Wed, 24 Apr 2024 16:54:38 +0300
- changeset 29
- 6a0ca7047f68
- parent 28
- f7c1007f0127
- child 30
- dec72b794b08
added new plots and filmstrips
| src/ImGenerate.jl | file | annotate | diff | comparison | revisions | |
| src/PET/PlotResults.jl | file | annotate | diff | comparison | revisions | |
| src/PredictPDPS.jl | file | annotate | diff | comparison | revisions |
--- a/src/ImGenerate.jl Wed Apr 24 11:34:09 2024 +0300 +++ b/src/ImGenerate.jl Wed Apr 24 16:54:38 2024 +0300 @@ -189,8 +189,7 @@ zero_factor = indx in params.stable_interval ? 0.0 : 1.0 # Restart the seed to enable comparison across predictors - #Random.seed!(rng,951508) # algreadygood - Random.seed!(rng,67584) + Random.seed!(rng,951508) # algreadygood nextv = shake(params) v_true = zero_factor.*nextv()
--- a/src/PET/PlotResults.jl Wed Apr 24 11:34:09 2024 +0300 +++ b/src/PET/PlotResults.jl Wed Apr 24 16:54:38 2024 +0300 @@ -43,7 +43,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="dot", name="proxi (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(orig, trace) end @@ -73,7 +73,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="dashdot", name="primo (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -104,7 +104,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="dash", name="greed (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -135,7 +135,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="longdashdot", name="rotat (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -166,7 +166,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="solid", name="dusca (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -196,7 +196,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="longdash", name="zerod (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -246,7 +246,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="dot", name="proxi (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(orig, trace) end @@ -276,7 +276,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="dashdot", name="primo (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -307,7 +307,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="dash", name="greed (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -338,7 +338,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="longdashdot", name="rotat (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -369,7 +369,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="solid", name="dusca (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -399,7 +399,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="longdash", name="zerod (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -450,7 +450,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="dot", name="proxi (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(orig, trace) end @@ -480,7 +480,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="dashdot", name="primo (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -511,7 +511,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="dash", name="greed (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -542,7 +542,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="longdashdot", name="rotat (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -572,7 +572,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="solid", name="dusca (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end @@ -602,7 +602,7 @@ # Extract parameters for legend α, τ₀, σ₀ = extract_parameters(filename) - trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.1f}", + trace = PlotlyJS.scatter(;x=X, y=Y, mode="lines", hovertemplate="%{x:.0f},%{y:.3f}", line_color=line_color, line_dash="longdash", name="zerod (α=$α, τ₀=$τ₀, σ₀=$σ₀)") push!(identity, trace) end
--- a/src/PredictPDPS.jl Wed Apr 24 11:34:09 2024 +0300 +++ b/src/PredictPDPS.jl Wed Apr 24 16:54:38 2024 +0300 @@ -128,7 +128,7 @@ 10, 25, 30, 50, 100, 250, 300, 500, 1000, 2000, 2500, 3000, 4000, 5000, - 6000, 7000, 7500, 8000, 9000, 10000]), + 6000, 7000, 7500, 8000, 9000, 10000, 8700]), pixelwise_displacement=false, dual_flow = true, prox_predict = true, @@ -152,7 +152,7 @@ σ₀ = 1.0, τ₀ = 0.01, #stable_interval = Set(0), - stable_interval = union(Set(2500:5000),Set(8750:10000)), + stable_interval = union(Set(2500:5000),Set(8700:10000)), ) const p_known₀ = (
