Commit 89d1333d authored by Russell Luke's avatar Russell Luke
Browse files

Merge branch 'dornheim' of gitlab.gwdg.de:nam/ProxPython into dornheim

parents 05cde538 ab1272c7
import sys
sys.path.append('../proxtoolbox/Problems/Phase')
sys.path.append('..')
import tasse_ap_in
import tasse_DRl_in
from phase import Phase
tasse = Phase(tasse_ap_in.new_config)
tasse = Phase(tasse_DRl_in.new_config)
tasse.solve()
tasse.show()
......@@ -36,17 +36,6 @@ new_config = {
'Nx' : 128,
'Ny' : 128,
'fresnel_nr' : 0,
#moved this to phase
#if(strcmp('distance,'near field'))
# 'fresnel_nr' : 1*2*pi*'Nx,
#else
# 'fresnel_nr' : 0, #1*2*pi*'Nx,
'magn' : 1,
## What are the noise characteristics (Poisson or Gaussian)?
'noise' : 'Poisson',
##==========================================
......@@ -56,7 +45,7 @@ new_config = {
## able to control (without too much damage)
## Algorithm:
'algorithm' : 'RAAR', # used to be 'Projection',
'algorithm' : 'DRl', # used to be 'Projection',
'numruns' : 1, # the only time this parameter will
# be different than 1 is when we are
# benchmarking...not something a normal user
......@@ -71,31 +60,22 @@ new_config = {
## parameters the user might encounter and have the menu options change
## depending on the value of the 'method field.
## do different things depending on the chosen algorithm:
#if(strcmp('method,'RAAR')||strcmp('method,'AP')||...
# strcmp('method,'HPR')||strcmp('method,'HAAR'))
# the following just points this driver to a patch that communicates
# the parameters defined at this level to the structures used in the
# algorithms developed by Russell.
# algorithms.
'problem_family' : 'Phase',
#else # moreregularization parameters for Thorsten's algorithms:
# prbl' : complete_itreg_par(prbl),
# This is just a patch to Thorsten's tools. May want to change this
# later
#'problem_family='Hohage',
#end
#if(strcmp('problem_family,'Phase'))
## maximum number of iterations and tolerances
'MAXIT' : 1000,
'TOL' : 1e-12,
'TOL' : 1e-8,
## relaxaton parameters in RAAR, HPR and HAAR
'beta_0' : 0.95, #0.95 # starting relaxation prameter (only used with
'lambda_0' : 0.95, #0.95 # starting relaxation prameter (only used with
# HAAR, HPR and RAAR)
'beta_max' :0.50, # maximum relaxation prameter (only used with
'lambda_max' :0.50, # maximum relaxation prameter (only used with
# HAAR, RAAR, and HPR)
'beta_switch' : 30, # iteration at which beta moves from beta_0 -> beta_max
'lambda_switch' : 30, # iteration at which beta moves from beta_0 -> beta_max
## parameter for the data regularization
## need to discuss how/whether the user should
......@@ -112,10 +92,6 @@ new_config = {
# Ultimately the size of the gap depends
# on the inconsistency of the measurement model
# with the qualitative constraints.
#elseif(strcmp('problem_family,'Hohage'))
# 'alpha0' : 1e4,
# 'N_CG' : 70,
#end
# ##==========================================
# ## parameters for plotting and diagnostics
......@@ -141,7 +117,7 @@ new_config = {
'verbose' : 1, # options are 0 or 1
'graphics' : 1, # whether or not to display figures, options are 0 or 1.
# default is 1.
'anim' : 2, # whether or not to disaply ``real time" reconstructions
'anim' : 1, # whether or not to disaply ``real time" reconstructions
# options are 0=no, 1=yes, 2=make a movie
# default is 1.
'graphics_display' : 'Phase_graphics' # unless specified, a default
......
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