Commit fcff492a by alexander.dornheim

### Fixed a bug just commited

parent 4cd25477
 ... @@ -76,8 +76,9 @@ class Phase(Problem): ... @@ -76,8 +76,9 @@ class Phase(Problem): proxoperators[0] ='P_SP' proxoperators[0] ='P_SP' elif self.config['constraint'] =='amplitude only': elif self.config['constraint'] =='amplitude only': proxoperators[0] ='P_amp' proxoperators[0] ='P_amp' elif(strcmp(input.constraint,'phase on support')) elif self.config['constraint'] == 'phase on support': proxoperators[0] ='P_Amod' pass #proxoperators[0] ='P_Amod' currently not working in ProxPython elif self.config['constraint'] =='minimum amplitude': elif self.config['constraint'] =='minimum amplitude': proxoperators[0] = 'P_min_amp' proxoperators[0] = 'P_min_amp' elif self.config['constraint'] =='sparse': elif self.config['constraint'] =='sparse': ... @@ -88,7 +89,7 @@ class Phase(Problem): ... @@ -88,7 +89,7 @@ class Phase(Problem): proxoperators[0] ='P_liftM' proxoperators[0] ='P_liftM' proxoperators[2] ='Approx_PM_Poisson' # Patrick: This is just to monitor the change of phases! proxoperators[2] ='Approx_PM_Poisson' # Patrick: This is just to monitor the change of phases! if self.config['experiment'] == 'single diffraction': if self.config['experiment'] == 'single diffraction' or self.config['experiment'] == 'CDI': if self.config['distance'] == 'far field': if self.config['distance'] == 'far field': if self.config['constraint'] == 'phaselift': if self.config['constraint'] == 'phaselift': proxoperators[1] = 'P_Rank1'; proxoperators[1] = 'P_Rank1'; ... ...
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!