Commit 4cd25477 authored by alexander.dornheim's avatar alexander.dornheim
Browse files

Updated contraints in phase

parent 547226a4
......@@ -64,27 +64,29 @@ class Phase(Problem):
# Set the projectors and inputs based on the types of constraints and
# experiments
proxoperators = ['','',''];
proxoperators = ['','','']
if self.config['constraint'] == 'hybrid':
proxoperators[0] = 'P_cP'; # This will be problem specific
proxoperators[0] = 'P_cP' # This will be problem specific
elif self.config['constraint'] == 'support only':
proxoperators[0] = 'P_S';
proxoperators[0] = 'P_S'
elif self.config['constraint'] == 'real and support':
proxoperators[0] ='P_S_real';
elif self.config['constraint'] =='nonnegative and support':
proxoperators[0] ='P_SP';
proxoperators[0] ='P_SP'
elif self.config['constraint'] =='amplitude only':
proxoperators[0] ='P_amp';
proxoperators[0] ='P_amp'
elif(strcmp(input.constraint,'phase on support'))
proxoperators[0] ='P_Amod'
elif self.config['constraint'] =='minimum amplitude':
proxoperators[0] = 'P_min_amp';
proxoperators[0] = 'P_min_amp'
elif self.config['constraint'] =='sparse':
proxoperators[0] = 'not in yet';
proxoperators[0] = 'not in yet'
elif self.config['constraint'] =='phaselift':
proxoperators[0] = 'P_mean_SP';
proxoperators[0] = 'P_mean_SP'
elif self.config['constraint'] =='phaselift2':
proxoperators[0] ='P_liftM';
proxoperators[2] ='Approx_PM_Poisson'; # Patrick: This is just to monitor the change of phases!
proxoperators[0] ='P_liftM'
proxoperators[2] ='Approx_PM_Poisson' # Patrick: This is just to monitor the change of phases!
if self.config['experiment'] == 'single diffraction':
if self.config['distance'] == 'far field':
......
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