Commit 3b0bc77b authored by jansen31's avatar jansen31
Browse files

typos and other small things

parent c8cd7e75
......@@ -58,19 +58,19 @@ class CDRl(SimpleAlgorithm):
lambda_max = self.config['lambda_max']
lambda_switch = self.config['lambda_switch']
# dynamic lambda
lambda = exp((-iter/lambda_switch)**3)*lambda0+(1-exp((-iter/lambda_switch)**3))*lambda_max # MJ: Looks like this intended to be _lambda or a similar handle, not a python lambda function.
_lambda = exp((-iter/lambda_switch)**3)*lambda0+(1-exp((-iter/lambda_switch)**3))*lambda_max # MJ: Looks like this intended to be _lambda or a similar handle, not a python lambda function.
tmp_u = u
nProx = len(prox)
for j in range(nProx-1):
self.prox_idx = j+1
tmp1 = 2*(prox[j].work(tmp_u)) - tmp_u
self.prox_idx = j
tmp2 = pro[j-1].work(tmp1)
tmp_u = (lambda*(2*tmp2-tmp1) + (1-lambda)*tmp1 + tmp_u)/2
tmp2 = prox[j-1].work(tmp1) # MJ: typo pro -> prox?
tmp_u = (_lambda*(2*tmp2-tmp1) + (1-_lambda)*tmp1 + tmp_u)/2
self.prox_idx = 1
tmp1 = 2*(prox[0].work(tmp_u)) - tmp_u
self.prox_idx = nProx
tmp2 = prox[nProx].work(tmp1)
unew = (lambda*(2*tmp2-tmp1) + (1-lambda)*tmp1 + tmp_u)/2
unew = (_lambda*(2*tmp2-tmp1) + (1-_lambda)*tmp1 + tmp_u)/2
return unew
......@@ -11,7 +11,7 @@ class IterateMonitor:
return 999
#this is the right calculation for change if u does not have blocks structure
if u.ndim < 3:
tmp_change= (norm(u-u_monitor, 'fro')/norm_data)**2
tmp_change= (norm(u-u_monitor, 'fro')/norm_data)**2 # What function are we trying to import here?
elif u.ndim == 3:
for j in range(u.shape[2]):
tmp_change= tmp_change+ (norm(u[:,:,j]-u_monitor[:,:,j], 'fro')/norm_data)**2
......
......@@ -18,7 +18,7 @@ from .Siemens_processor import *
from .Siemens_real_in import *
from .tasse_ap_in import *
from .tasse_DRl_in import *
from .tasse_supp_ap_in import *
# from .tasse_supp_ap_in import *
__all__ = ["Graphics","CDI_data_processor", "CDP_processor", "Goettingen_data_processor", "JWST_AltP_in", "JWST_data_processor", "JWST_in", "JWST_RAAR_in", "Nanoscale_Photonic_Imaging_ProxToolbox_Coffee_in", "Near_field_dictyM103_stx6_600frames_in", "Near_field_living_worm_in", "Near_field_Siemens_experimental_in", "Near_field_synthetic_in", "phase", "Siemens_amplitude_in", "Siemens_nonneg_in", "Siemens_processor", "Siemens_real_in", "tasse_ap_in", "tasse_DRl_in", "tasse_supp_ap_in"]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment