RunAll set to 20 iterations

demos/RunAll.py

@@ -9,31 +9,31 @@ print("\n")
 
 from proxtoolbox.experiments.phase.CDI_Experiment import CDI_Experiment
 
-CDI = CDI_Experiment(algorithm = 'CP', MAXIT = 5000, verbose=0)
+CDI = CDI_Experiment(algorithm = 'CP', MAXIT = 20, verbose=0)
 CDI.run()
 CDI.show()
 
-CDI = CDI_Experiment(algorithm = 'AvP', verbose=0)
+CDI = CDI_Experiment(algorithm = 'AvP', MAXIT = 20, verbose=0)
 CDI.run()
 CDI.show()
 
-CDI = CDI_Experiment(algorithm = 'QNAvP', verbose=0)
+CDI = CDI_Experiment(algorithm = 'QNAvP', MAXIT = 20, verbose=0)
 CDI.run()
 CDI.show()
 
-CDI = CDI_Experiment(algorithm = 'DRl', verbose=0)
+CDI = CDI_Experiment(algorithm = 'DRl', MAXIT = 20, verbose=0)
 CDI.run()
 CDI.show()
 
-CDI = CDI_Experiment(algorithm = 'DRAP', lambda_0 = 0.02, lambda_max = 0.02, verbose=0)
+CDI = CDI_Experiment(algorithm = 'DRAP', MAXIT = 20, lambda_0 = 0.02, lambda_max = 0.02, verbose=0)
 CDI.run()
 CDI.show()
 
-CDI = CDI_Experiment(algorithm = 'CDRl', lambda_0 = 1.0, lambda_max = 1.0, MAXIT = 2000, verbose=0)
+CDI = CDI_Experiment(algorithm = 'CDRl', lambda_0 = 1.0, lambda_max = 1.0, MAXIT = 20, verbose=0)
 CDI.run()
 CDI.show()
 
-CDI = CDI_Experiment(algorithm = 'CDRl', lambda_0 = 0.9, lambda_max = 0.9, verbose=0)
+CDI = CDI_Experiment(algorithm = 'CDRl', MAXIT = 20, lambda_0 = 0.9, lambda_max = 0.9, verbose=0)
 CDI.run()
 CDI.show()
 
@@ -45,26 +45,26 @@ print("**********************************************\n")
 print("\n")
 from proxtoolbox.experiments.phase.Krueger_Experiment import Krueger_Experiment
 
-Krueger = Krueger_Experiment(algorithm = 'AvP', verbose=0)
+Krueger = Krueger_Experiment(algorithm = 'AvP', MAXIT = 20, verbose=0)
 Krueger.run()
 Krueger.show()
 
-Krueger = Krueger_Experiment(algorithm = 'QNAvP', verbose=0)
+Krueger = Krueger_Experiment(algorithm = 'QNAvP', MAXIT = 20, verbose=0)
 Krueger.run()
 Krueger.show()
 
-Krueger = Krueger_Experiment(algorithm = 'CP', verbose=0)
+Krueger = Krueger_Experiment(algorithm = 'CP', MAXIT = 20, verbose=0)
 Krueger.run()
 Krueger.show()
 
 
-Krueger = Krueger_Experiment(algorithm = 'DRl',
+Krueger = Krueger_Experiment(algorithm = 'DRl', MAXIT = 20,
                              lambda_0 = 0.5, lambda_max = 0.5, verbose=0)
 Krueger.run()
 Krueger.show()
 
 
-Krueger = Krueger_Experiment(algorithm = 'DRAP', verbose=0)
+Krueger = Krueger_Experiment(algorithm = 'DRAP', MAXIT = 20, verbose=0)
 Krueger.run()
 Krueger.show()
 
@@ -77,26 +77,26 @@ print("\n")
 print("Starting Siemens demos - regularization")
 from proxtoolbox.experiments.phase.Krueger_Experiment import Krueger_Experiment
 
-Krueger = Krueger_Experiment(algorithm = 'AvP', data_ball = 24, verbose=0)
+Krueger = Krueger_Experiment(algorithm = 'AvP', MAXIT = 20, data_ball = 24, verbose=0)
 Krueger.run()
 Krueger.show()
 
-Krueger = Krueger_Experiment(algorithm = 'QNAvP', data_ball = 20, verbose=0)
+Krueger = Krueger_Experiment(algorithm = 'QNAvP', MAXIT = 20, data_ball = 20, verbose=0)
 Krueger.run()
 Krueger.show()
 
-Krueger = Krueger_Experiment(algorithm = 'CP', data_ball = 20, verbose=0)
+Krueger = Krueger_Experiment(algorithm = 'CP', MAXIT = 20, data_ball = 20, verbose=0)
 Krueger.run()
 Krueger.show()
 
 
-Krueger = Krueger_Experiment(algorithm = 'DRl', data_ball = 20,
+Krueger = Krueger_Experiment(algorithm = 'DRl', MAXIT = 20, data_ball = 20,
                              lambda_0 = 0.5, lambda_max = 0.5, verbose=0)
 Krueger.run()
 Krueger.show()
 
 
-Krueger = Krueger_Experiment(algorithm = 'DRAP', data_ball = 20, verbose=0)
+Krueger = Krueger_Experiment(algorithm = 'DRAP', MAXIT = 20, data_ball = 20, verbose=0)
 Krueger.run()
 Krueger.show()
 

proxtoolbox/utils/loadMatFile.py

@@ -26,7 +26,6 @@ def loadMatFile(filename):
     -----
     When reading v7.3 files cell objects are not currently supported.
     '''
-
     path = str(filename)
     if not path.endswith('.mat'):
         path += '.mat'