Commit cbbb1d79 authored by s.gretchko's avatar s.gretchko
Browse files

Added experiments directory to put new code

parent 026faf73
......@@ -2,7 +2,7 @@
# Cone_and_sphere demo
import SetProxPythonPath
from proxtoolbox.Problems.Phase.CDP_Experiment import CDP_Experiment
from proxtoolbox.experiments.phase.CDP_Experiment import CDP_Experiment
CDP = CDP_Experiment(algorithm = 'DRAP')
CDP.run()
......
#SG
import SetProxPythonPath
from proxtoolbox.Problems.Phase.JWST_Experiment import JWST_Experiment
from proxtoolbox.experiments.phase.JWST_Experiment import JWST_Experiment
JWST = JWST_Experiment(algorithm = 'AP')
JWST.run()
......
#SG
import SetProxPythonPath
from proxtoolbox.Problems.Phase.JWST_Experiment import JWST_Experiment
from proxtoolbox.experiments.phase.JWST_Experiment import JWST_Experiment
JWST = JWST_Experiment(algorithm = 'CP', formulation = 'cyclic')
JWST.run()
......
#SG
import SetProxPythonPath
from proxtoolbox.Problems.Phase.JWST_Experiment import JWST_Experiment
from proxtoolbox.experiments.phase.JWST_Experiment import JWST_Experiment
JWST = JWST_Experiment(algorithm = 'RAAR', beta_0 = 1.0, beta_max = 1.0, MAXIT = 1000)
JWST.run()
......
......@@ -2,7 +2,7 @@
# Cone_and_sphere demo
import SetProxPythonPath
from proxtoolbox.Problems.Phase.JWST_Experiment import JWST_Experiment
from proxtoolbox.experiments.phase.JWST_Experiment import JWST_Experiment
JWST = JWST_Experiment(algorithm = 'DRAP', beta_0 = 0.65, beta_max = 0.65)
JWST.run()
......
#SG
import SetProxPythonPath
from proxtoolbox.Problems.Phase.JWST_Experiment import JWST_Experiment
from proxtoolbox.experiments.phase.JWST_Experiment import JWST_Experiment
JWST = JWST_Experiment(algorithm = 'HPR', beta_0 = 0.85, beta_max = 0.85, MAXIT = 500)
JWST.run()
......
#SG
import SetProxPythonPath
from proxtoolbox.Problems.Phase.JWST_Experiment import JWST_Experiment
from proxtoolbox.experiments.phase.JWST_Experiment import JWST_Experiment
# Warning: Does not work with new Cone_and_sphere framework. Deprecated.
# Will be removed. New algorithm is QNAvP that uses QNAccelerator
......
#SG
import SetProxPythonPath
from proxtoolbox.Problems.Phase.JWST_Experiment import JWST_Experiment
from proxtoolbox.experiments.phase.JWST_Experiment import JWST_Experiment
JWST = JWST_Experiment(algorithm = 'RAAR', beta_0 = 0.85, beta_max = 0.85, MAXIT = 1000)
JWST.run()
......
......@@ -2,7 +2,7 @@
# Module to be imported by test modules to set the ProxPython path
# after this is called, can use import statements like this one:
# from proxtoolbox.Problems.Phase import Phase, JWST_AltP_in
# from proxtoolbox.experiments.phase import Phase, JWST_AltP_in
import sys
import os
......
#SG
from proxtoolbox.Problems.dataProcessor import DataProcessor
from proxtoolbox.experiments.dataProcessor import DataProcessor
from proxtoolbox import algo
from proxtoolbox import proxop
from proxtoolbox.proxop.proxoperator import ProxOperator
......
......@@ -2,7 +2,7 @@
#SG
# Updated to reflect Matlab's Cone_and_Sphere branch
from proxtoolbox.Problems.dataProcessor import DataProcessor
from proxtoolbox.experiments.dataProcessor import DataProcessor
import numpy as np
from numpy import sqrt, conj, tile, mean, exp, angle, trace, reshape, matmul
......
#SG
from proxtoolbox.Problems.Phase.phaseExperiment import PhaseExperiment
from proxtoolbox.experiments.phase.phaseExperiment import PhaseExperiment
class CDP_Experiment(PhaseExperiment):
......@@ -25,7 +25,7 @@ class CDP_Experiment(PhaseExperiment):
defaultParams = {
'experiment_name' : 'CDP',
'data_processor_name': 'CDP_DataProcessor',
'data_processor_package': 'proxtoolbox.Problems.Phase',
'data_processor_package': 'proxtoolbox.experiments.phase',
'object': 'complex',
'constraint': 'hybrid',
'Nx': 1,
......
......@@ -2,7 +2,7 @@
#SG
# Updated to reflect Matlab's Cone_and_Sphere branch
from proxtoolbox.Problems.dataProcessor import DataProcessor
from proxtoolbox.experiments.dataProcessor import DataProcessor
import numpy as np
from numpy import fromfile, exp, nonzero, zeros, pi, resize
......
#SG
from proxtoolbox.Problems.Phase.phaseExperiment import PhaseExperiment
from proxtoolbox.experiments.phase.phaseExperiment import PhaseExperiment
import matplotlib
import matplotlib.pyplot as plt
from matplotlib.pyplot import subplots, show, figure
......@@ -17,7 +17,7 @@ class JWST_Experiment(PhaseExperiment):
defaultParams = {
'experiment_name' : 'JWST',
'data_processor_name': 'JWST_DataProcessor',
'data_processor_package': 'proxtoolbox.Problems.Phase',
'data_processor_package': 'proxtoolbox.experiments.phase',
'object': 'complex',
'constraint': 'amplitude only',
'distance': 'far field',
......
#SG
from proxtoolbox.Problems.experiment import Experiment
from proxtoolbox.experiments.experiment import Experiment
import matplotlib
import matplotlib.pyplot as plt
from matplotlib.pyplot import subplots, show, figure
......
Markdown is supported
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