Mercurial > repos > PredictPDPS / file diff

--- a/src/PET/AlgorithmProximal.jl	Sun Apr 21 22:35:03 2024 +0300
+++ b/src/PET/AlgorithmProximal.jl	Mon Apr 22 09:26:19 2024 +0300
@@ -151,13 +151,14 @@
             @. oldx = x
         end
 
-        if params.prox_predict
-            ∇₂!(Δy, x)
-            @. y = (y + σ̃*Δy)/(1 + σ̃*(ρ̃+ρ/α))
-            #@. cc = y + 1000000*σ̃*Δy 
-            #@. y = (y + σ̃*Δy)/(1 + σ̃*(ρ̃+ρ/α)) + (1 - 1/(1 + ρ̃*σ̃))*cc
-            proj_norm₂₁ball!(y, α) 
-        end
+        ##############################    
+        # Proximal step of prediction
+        ##############################
+        ∇₂!(Δy, x)
+        @. y = (y + σ̃*Δy)/(1 + σ̃*(ρ̃+ρ/α))
+        #@. cc = y + 1000000*σ̃*Δy 
+        #@. y = (y + σ̃*Δy)/(1 + σ̃*(ρ̃+ρ/α)) + (1 - 1/(1 + ρ̃*σ̃))*cc
+        proj_norm₂₁ball!(y, α) 
 
         ############
         # PDPS step