Changeset 465


Ignore:
Timestamp:
07/01/11 23:05:59 (5 years ago)
Author:
mmckerns
Message:

all solvers import through 'solvers', and tools through 'tools'
renamed BatchGrid? and Scattershot solvers; (see ticket #143)

Files:
1 added
100 edited
4 moved

Legend:

Unmodified
Added
Removed

  • branches/UQ/TEST.py

    r182 r465  
    7171####################################################################### 
    7272def dakota(cost,lb,ub): 
    73   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     73  from mystic.solvers import DifferentialEvolutionSolver2 
    7474  from mystic.termination import CandidateRelativeTolerance as CRT 
    7575  from mystic.strategy import Best1Exp 
    76   from mystic import getch, random_seed, VerboseSow, Sow 
     76  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    7777 
    7878  random_seed(123) 

  • branches/UQ/TEST2.py

    r182 r465  
    7272####################################################################### 
    7373def dakota(cost,lb,ub): 
    74   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     74  from mystic.solvers import DifferentialEvolutionSolver2 
    7575  from mystic.termination import CandidateRelativeTolerance as CRT 
    7676  from mystic.strategy import Best1Exp 
    77   from mystic import getch, random_seed, VerboseSow, Sow 
     77  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    7878 
    7979  random_seed(123) 

  • branches/UQ/TEST3.py

    r182 r465  
    7777####################################################################### 
    7878def dakota(cost,lb,ub): 
    79   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     79  from mystic.solvers import DifferentialEvolutionSolver2 
    8080  from mystic.termination import CandidateRelativeTolerance as CRT 
    8181  from mystic.strategy import Best1Exp 
    82   from mystic import getch, random_seed, VerboseSow, Sow 
     82  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    8383 
    8484  random_seed(123) 

  • branches/UQ/TEST3b.py

    r182 r465  
    7777####################################################################### 
    7878def dakota(cost,lb,ub): 
    79   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     79  from mystic.solvers import DifferentialEvolutionSolver2 
    8080  from mystic.termination import CandidateRelativeTolerance as CRT 
    8181  from mystic.strategy import Best1Exp 
    82   from mystic import getch, random_seed, VerboseSow, Sow 
     82  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    8383 
    8484  random_seed(123) 

  • branches/UQ/math/examples/MPI2_helper.py

    r253 r465  
    6363####################################################################### 
    6464def local_optimize(cost,x0,lb,ub): 
    65   from mystic.scipy_optimize import PowellDirectionalSolver 
     65  from mystic.solvers import PowellDirectionalSolver 
    6666  from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    67   from mystic import getch, VerboseSow, Sow 
     67  from mystic.tools import getch, VerboseSow, Sow 
    6868 
    6969  maxiter = 1000 

  • branches/UQ/math/examples/MPI2_surrogate_diam_batchgrid.py

    r253 r465  
    6060####################################################################### 
    6161def optimize(cost,lower,upper,nbins): 
    62   from mystic import random_seed 
     62  from mystic.tools import random_seed 
    6363  from pyina.ez_map import ez_map2 as map 
    6464  from pyina.launchers import mpirun_launcher 

  • branches/UQ/math/examples/MPI_surrogate_diam.py

    r252 r465  
    6666  from pyina.launchers import mpirun_launcher 
    6767  from pyina.mappers import equalportion_mapper 
    68   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     68  from mystic.solvers import DifferentialEvolutionSolver2 
    6969  from mystic.termination import CandidateRelativeTolerance as CRT 
    7070  from mystic.strategy import Best1Exp 
    71   from mystic import getch, random_seed, VerboseSow, Sow 
     71  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    7272 
    7373  random_seed(123) 

  • branches/UQ/math/examples/MPI_surrogate_diam_batchgrid.py

    r202 r465  
    111111####################################################################### 
    112112def local_optimize(cost,x0,lb,ub): 
    113   from mystic.scipy_optimize import PowellDirectionalSolver 
     113  from mystic.solvers import PowellDirectionalSolver 
    114114  from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    115   from mystic import getch, VerboseSow, Sow 
     115  from mystic.tools import getch, VerboseSow, Sow 
    116116 
    117117  maxiter = 1000 
    … …  
    150150####################################################################### 
    151151def optimize(cost,lower,upper): 
    152   from mystic import random_seed 
     152  from mystic.tools import random_seed 
    153153  from pyina.ez_map import ez_map2 as map 
    154154  from pyina.launchers import mpirun_launcher 

  • branches/UQ/math/examples/MPI_surrogate_diam_scatter.py

    r201 r465  
    9494####################################################################### 
    9595def local_optimize(cost,x0,lb,ub): 
    96   from mystic.scipy_optimize import PowellDirectionalSolver 
     96  from mystic.solvers import PowellDirectionalSolver 
    9797  from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    98   from mystic import getch, VerboseSow, Sow 
     98  from mystic.tools import getch, VerboseSow, Sow 
    9999 
    100100  maxiter = 1000 
    … …  
    133133####################################################################### 
    134134def optimize(cost,lower,upper): 
    135   from mystic import random_seed 
     135  from mystic.tools import random_seed 
    136136  from pyina.ez_map import ez_map2 as map 
    137137  from pyina.launchers import mpirun_launcher 

  • branches/UQ/math/examples/MSUB_surrogate_diam_batchgrid.py

    r414 r465  
    115115####################################################################### 
    116116def local_optimize(cost,x0,lb,ub): 
    117   from mystic.scipy_optimize import PowellDirectionalSolver 
     117  from mystic.solvers import PowellDirectionalSolver 
    118118  from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    119   from mystic import getch, VerboseSow, Sow 
     119  from mystic.tools import getch, VerboseSow, Sow 
    120120 
    121121  maxiter = 1000 
    … …  
    154154####################################################################### 
    155155def optimize(cost,lower,upper): 
    156   from mystic import random_seed 
     156  from mystic.tools import random_seed 
    157157  from pyina.ez_map import ez_map2 as map 
    158158  from pyina.launchers import srun_launcher 

  • branches/UQ/math/examples/QSUB2_surrogate_diam_batchgrid.py

    r414 r465  
    6060####################################################################### 
    6161def optimize(cost,lower,upper): 
    62   from mystic import random_seed 
     62  from mystic.tools import random_seed 
    6363  from pyina.ez_map import ez_map2 as map 
    6464  from pyina.launchers import mpirun_launcher 

  • branches/UQ/math/examples/QSUB_surrogate_diam_batchgrid.py

    r414 r465  
    115115####################################################################### 
    116116def local_optimize(cost,x0,lb,ub): 
    117   from mystic.scipy_optimize import PowellDirectionalSolver 
     117  from mystic.solvers import PowellDirectionalSolver 
    118118  from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    119   from mystic import getch, VerboseSow, Sow 
     119  from mystic.tools import getch, VerboseSow, Sow 
    120120 
    121121  maxiter = 1000 
    … …  
    154154####################################################################### 
    155155def optimize(cost,lower,upper): 
    156   from mystic import random_seed 
     156  from mystic.tools import random_seed 
    157157  from pyina.ez_map import ez_map2 as map 
    158158  from pyina.launchers import mpirun_launcher 

  • branches/UQ/math/examples/TEST_surrogate_McD.py

    r200 r465  
    6262####################################################################### 
    6363def optimize(cost,lb,ub): 
    64   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     64  from mystic.solvers import DifferentialEvolutionSolver2 
    6565  from mystic.termination import CandidateRelativeTolerance as CRT 
    6666  from mystic.strategy import Best1Exp 
    67   from mystic import getch, random_seed, VerboseSow, Sow 
     67  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    6868 
    6969  random_seed(123) 

  • branches/UQ/math/examples/TEST_surrogate_cut.py

    r200 r465  
    3131####################################################################### 
    3232def optimize(cost,lb,ub): 
    33   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     33  from mystic.solvers import DifferentialEvolutionSolver2 
    3434  from mystic.termination import CandidateRelativeTolerance as CRT 
    3535  from mystic.strategy import Best1Exp 
    36   from mystic import getch, random_seed, VerboseSow, Sow 
     36  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    3737 
    3838  random_seed(123) 

  • branches/UQ/math/examples/TEST_surrogate_diam.py

    r201 r465  
    5959####################################################################### 
    6060def optimize(cost,lb,ub): 
    61   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     61  from mystic.solvers import DifferentialEvolutionSolver2 
    6262  from mystic.termination import CandidateRelativeTolerance as CRT 
    6363  from mystic.strategy import Best1Exp 
    64   from mystic import getch, random_seed, VerboseSow, Sow 
     64  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    6565 
    6666  random_seed(123) 

  • branches/UQ/math/examples/TEST_surrogate_diam_batchgrid.py

    r202 r465  
    9696####################################################################### 
    9797def local_optimize(cost,x0,lb,ub): 
    98   from mystic.scipy_optimize import PowellDirectionalSolver 
     98  from mystic.solvers import PowellDirectionalSolver 
    9999  from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    100   from mystic import getch, VerboseSow, Sow 
     100  from mystic.tools import getch, VerboseSow, Sow 
    101101 
    102102 #stepmon = VerboseSow(100) 

  • branches/UQ/math/examples/TEST_surrogate_diam_scatter.py

    r201 r465  
    7979####################################################################### 
    8080def local_optimize(cost,x0,lb,ub): 
    81   from mystic.scipy_optimize import PowellDirectionalSolver 
     81  from mystic.solvers import PowellDirectionalSolver 
    8282  from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    83   from mystic import getch, VerboseSow, Sow 
     83  from mystic.tools import getch, VerboseSow, Sow 
    8484 
    8585 #stepmon = VerboseSow(100) 
    … …  
    108108####################################################################### 
    109109def optimize(cost,lower,upper): 
    110   from mystic import random_seed 
     110  from mystic.tools import random_seed 
    111111  random_seed(123) 
    112112 

  • branches/UQ/math/examples/TEST_surrogate_samples.py

    r200 r465  
    9696####################################################################### 
    9797def optimize(cost,lb,ub): 
    98   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     98  from mystic.solvers import DifferentialEvolutionSolver2 
    9999  from mystic.termination import CandidateRelativeTolerance as CRT 
    100100  from mystic.strategy import Best1Exp 
    101   from mystic import getch, random_seed, VerboseSow, Sow 
     101  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    102102 
    103103  random_seed(123) 

  • branches/UQ/math/examples/TEST_surrogate_smartcut.py

    r200 r465  
    4646####################################################################### 
    4747def optimize(cost,lb,ub): 
    48   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     48  from mystic.solvers import DifferentialEvolutionSolver2 
    4949  from mystic.termination import CandidateRelativeTolerance as CRT 
    5050  from mystic.strategy import Best1Exp 
    51   from mystic import getch, random_seed, VerboseSow, Sow 
     51  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    5252 
    5353  random_seed(123) 

  • branches/UQ/math/examples2/TEST4d_OUQ_surrogate_diam.py

    r449 r465  
    2525####################################################################### 
    2626def optimize(cost,_bounds,_constraints): 
    27   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     27  from mystic.solvers import DifferentialEvolutionSolver2 
    2828  from mystic.termination import ChangeOverGeneration as COG 
    2929  from mystic.strategy import Best1Exp 
    30   from mystic import random_seed, VerboseSow, Sow 
     30  from mystic.tools import random_seed, VerboseSow, Sow 
    3131 
    3232 #random_seed(123) 

  • branches/UQ/math/examples2/TEST_OUQ_surrogate_diam.py

    r449 r465  
    2525####################################################################### 
    2626def optimize(cost,_bounds,_constraints): 
    27   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     27  from mystic.solvers import DifferentialEvolutionSolver2 
    2828  from mystic.termination import ChangeOverGeneration as COG 
    2929  from mystic.strategy import Best1Exp 
    30   from mystic import random_seed, VerboseSow, Sow 
     30  from mystic.tools import random_seed, VerboseSow, Sow 
    3131 
    3232 #random_seed(123) 

  • branches/UQ/math/examples3/thk_safe/INV_seesaw2d_inf_thk_diam.py

    r319 r465  
    2626####################################################################### 
    2727def optimize(cost,lb,ub,_constraints): 
    28   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     28  from mystic.solvers import DifferentialEvolutionSolver2 
    2929 #from mystic.termination import CandidateRelativeTolerance as CRT 
    3030 #from mystic.termination import VTR 
    3131  from mystic.termination import ChangeOverGeneration as COG 
    3232  from mystic.strategy import Best1Exp 
    33   from mystic import getch, random_seed, VerboseSow, Sow 
     33  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    3434 
    3535  random_seed(123) 

  • branches/UQ/math/examples3/thk_safe/INV_seesaw2d_sup_thk_diam.py

    r319 r465  
    2626####################################################################### 
    2727def optimize(cost,lb,ub,_constraints): 
    28   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     28  from mystic.solvers import DifferentialEvolutionSolver2 
    2929 #from mystic.termination import CandidateRelativeTolerance as CRT 
    3030 #from mystic.termination import VTR 
    3131  from mystic.termination import ChangeOverGeneration as COG 
    3232  from mystic.strategy import Best1Exp 
    33   from mystic import getch, random_seed, VerboseSow, Sow 
     33  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    3434 
    3535  random_seed(123) 

  • branches/UQ/math/examples3/thk_safe/INV_surrogate_expect.py

    r319 r465  
    6767####################################################################### 
    6868def optimize(cost,lb,ub,_range): 
    69   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     69  from mystic.solvers import DifferentialEvolutionSolver2 
    7070  from mystic.termination import VTR 
    7171 #from mystic.termination import CandidateRelativeTolerance as CRT 
    7272 #from mystic.termination import ChangeOverGeneration as COG 
    7373  from mystic.strategy import Best1Exp 
    74   from mystic import getch, random_seed, VerboseSow, Sow 
     74  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    7575 
    7676# random_seed(123) 

  • branches/UQ/math/examples3/thk_unsafe/INV_seesaw2d_inf_thk_diam.py

    r319 r465  
    2626####################################################################### 
    2727def optimize(cost,lb,ub,_constraints): 
    28   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     28  from mystic.solvers import DifferentialEvolutionSolver2 
    2929 #from mystic.termination import CandidateRelativeTolerance as CRT 
    3030 #from mystic.termination import VTR 
    3131  from mystic.termination import ChangeOverGeneration as COG 
    3232  from mystic.strategy import Best1Exp 
    33   from mystic import getch, random_seed, VerboseSow, Sow 
     33  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    3434 
    3535  random_seed(123) 

  • branches/UQ/math/examples3/thk_unsafe/INV_seesaw2d_sup_thk_diam.py

    r319 r465  
    2626####################################################################### 
    2727def optimize(cost,lb,ub,_constraints): 
    28   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     28  from mystic.solvers import DifferentialEvolutionSolver2 
    2929 #from mystic.termination import CandidateRelativeTolerance as CRT 
    3030 #from mystic.termination import VTR 
    3131  from mystic.termination import ChangeOverGeneration as COG 
    3232  from mystic.strategy import Best1Exp 
    33   from mystic import getch, random_seed, VerboseSow, Sow 
     33  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    3434 
    3535  random_seed(123) 

  • branches/UQ/math/examples3/thk_unsafe/INV_surrogate_expect.py

    r319 r465  
    6767####################################################################### 
    6868def optimize(cost,lb,ub,_range): 
    69   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     69  from mystic.solvers import DifferentialEvolutionSolver2 
    7070  from mystic.termination import VTR 
    7171 #from mystic.termination import CandidateRelativeTolerance as CRT 
    7272 #from mystic.termination import ChangeOverGeneration as COG 
    7373  from mystic.strategy import Best1Exp 
    74   from mystic import getch, random_seed, VerboseSow, Sow 
     74  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    7575 
    7676# random_seed(123) 

  • branches/UQ/math/examples3/vel_safe/INV_seesaw2d_inf_vel_diam.py

    r319 r465  
    2626####################################################################### 
    2727def optimize(cost,lb,ub,_constraints): 
    28   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     28  from mystic.solvers import DifferentialEvolutionSolver2 
    2929 #from mystic.termination import CandidateRelativeTolerance as CRT 
    3030 #from mystic.termination import VTR 
    3131  from mystic.termination import ChangeOverGeneration as COG 
    3232  from mystic.strategy import Best1Exp 
    33   from mystic import getch, random_seed, VerboseSow, Sow 
     33  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    3434 
    3535  random_seed(123) 

  • branches/UQ/math/examples3/vel_safe/INV_seesaw2d_sup_vel_diam.py

    r319 r465  
    2626####################################################################### 
    2727def optimize(cost,lb,ub,_constraints): 
    28   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     28  from mystic.solvers import DifferentialEvolutionSolver2 
    2929 #from mystic.termination import CandidateRelativeTolerance as CRT 
    3030 #from mystic.termination import VTR 
    3131  from mystic.termination import ChangeOverGeneration as COG 
    3232  from mystic.strategy import Best1Exp 
    33   from mystic import getch, random_seed, VerboseSow, Sow 
     33  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    3434 
    3535  random_seed(123) 

  • branches/UQ/math/examples3/vel_safe/INV_surrogate_expect.py

    r319 r465  
    6767####################################################################### 
    6868def optimize(cost,lb,ub,_range): 
    69   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     69  from mystic.solvers import DifferentialEvolutionSolver2 
    7070  from mystic.termination import VTR 
    7171 #from mystic.termination import CandidateRelativeTolerance as CRT 
    7272 #from mystic.termination import ChangeOverGeneration as COG 
    7373  from mystic.strategy import Best1Exp 
    74   from mystic import getch, random_seed, VerboseSow, Sow 
     74  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    7575 
    7676# random_seed(123) 

  • branches/UQ/math/examples3/vel_unsafe/INV_seesaw2d_inf_vel_diam.py

    r319 r465  
    2626####################################################################### 
    2727def optimize(cost,lb,ub,_constraints): 
    28   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     28  from mystic.solvers import DifferentialEvolutionSolver2 
    2929 #from mystic.termination import CandidateRelativeTolerance as CRT 
    3030 #from mystic.termination import VTR 
    3131  from mystic.termination import ChangeOverGeneration as COG 
    3232  from mystic.strategy import Best1Exp 
    33   from mystic import getch, random_seed, VerboseSow, Sow 
     33  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    3434 
    3535  random_seed(123) 

  • branches/UQ/math/examples3/vel_unsafe/INV_seesaw2d_sup_vel_diam.py

    r319 r465  
    2626####################################################################### 
    2727def optimize(cost,lb,ub,_constraints): 
    28   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     28  from mystic.solvers import DifferentialEvolutionSolver2 
    2929 #from mystic.termination import CandidateRelativeTolerance as CRT 
    3030 #from mystic.termination import VTR 
    3131  from mystic.termination import ChangeOverGeneration as COG 
    3232  from mystic.strategy import Best1Exp 
    33   from mystic import getch, random_seed, VerboseSow, Sow 
     33  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    3434 
    3535  random_seed(123) 

  • branches/UQ/math/examples3/vel_unsafe/INV_surrogate_expect.py

    r319 r465  
    6767####################################################################### 
    6868def optimize(cost,lb,ub,_range): 
    69   from mystic.differential_evolution import DifferentialEvolutionSolver2 
     69  from mystic.solvers import DifferentialEvolutionSolver2 
    7070  from mystic.termination import VTR 
    7171 #from mystic.termination import CandidateRelativeTolerance as CRT 
    7272 #from mystic.termination import ChangeOverGeneration as COG 
    7373  from mystic.strategy import Best1Exp 
    74   from mystic import getch, random_seed, VerboseSow, Sow 
     74  from mystic.tools import getch, random_seed, VerboseSow, Sow 
    7575 
    7676# random_seed(123) 

  • mystic/_math/measures.py

    r461 r465  
    235235 
    236236  def optimize(cost,(lb,ub),tolerance,_constraints): 
    237     from mystic.differential_evolution import DifferentialEvolutionSolver2 
     237    from mystic.solvers import DifferentialEvolutionSolver2 
    238238    from mystic.termination import VTR 
    239239    from mystic.strategy import Best1Exp 
    240     from mystic import random_seed, VerboseSow, Sow 
     240    from mystic.tools import random_seed, VerboseSow, Sow 
    241241    if debug: random_seed(123) 
    242242    evalmon = Sow();  stepmon = Sow() 

  • mystic/examples/TEST_ffitPP.py

    r232 r465  
    1515 
    1616def main(): 
    17     from mystic.differential_evolution import DifferentialEvolutionSolver2 
     17    from mystic.solvers import DifferentialEvolutionSolver2 
    1818    from pathos.pp_map import pp_map 
    1919 

  • mystic/examples/TEST_ffitPP2.py

    r231 r465  
    1414 
    1515if __name__ == '__main__': 
    16     from mystic.scipy_optimize import fmin 
     16    from mystic.solvers import fmin 
    1717   #from scipy.optimize import fmin 
    1818    import random 

  • mystic/examples/TEST_ffitPP2_b.py

    r231 r465  
    1515 
    1616if __name__ == '__main__': 
    17     from mystic.scipy_optimize import fmin 
     17    from mystic.solvers import fmin 
    1818   #from scipy.optimize import fmin 
    1919    import random 

  • mystic/examples/TEST_ffitPP_b.py

    r236 r465  
    4242 
    4343def main(servers,ncpus): 
    44     from mystic.differential_evolution import DifferentialEvolutionSolver2 
     44    from mystic.solvers import DifferentialEvolutionSolver2 
    4545    from pathos.pp_map import pp_map 
    4646 

  • mystic/examples/buckshot_example06.py

    r236 r465  
    44Example: 
    55    - Solve 8th-order Chebyshev polynomial coefficients with Powell's method. 
    6     - Uses ScattershotSolver to provide 'pseudo-global' optimization 
     6    - Uses BuckshotSolver to provide 'pseudo-global' optimization 
    77    - Plot of fitting to Chebyshev polynomial. 
    88 
    … …  
    1111    - minimal solver interface 
    1212""" 
    13 # the Scattershot solver 
    14 from mystic.nested import ScattershotSolver 
     13# the Buckshot solver 
     14from mystic.solvers import BuckshotSolver 
    1515 
    1616# Powell's Directonal solver 
    17 from mystic.scipy_optimize import PowellDirectionalSolver 
     17from mystic.solvers import PowellDirectionalSolver 
    1818 
    1919# Chebyshev polynomial and cost function 
    … …  
    2424from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    2525from mystic.math import poly1d 
    26 from mystic import getch, VerboseSow 
     26from mystic.tools import getch, VerboseSow 
    2727import pylab 
    2828pylab.ion() 
    … …  
    7070    stepmon = VerboseSow(1) 
    7171 
    72     # use Scattershot Powell to solve 8th-order Chebyshev coefficients 
    73     solver = ScattershotSolver(ndim, npts) 
     72    # use buckshot-Powell to solve 8th-order Chebyshev coefficients 
     73    solver = BuckshotSolver(ndim, npts) 
    7474    solver.SetNestedSolver(PowellDirectionalSolver) 
    7575   #solver.SetMapper(ez_map) 

  • mystic/examples/cg_rosenbrock.py

    r133 r465  
    1414from scipy.optimize import fmin_cg 
    1515import numpy 
    16 from mystic import getch 
     16from mystic.tools import getch 
    1717 
    1818def show(): 

  • mystic/examples/derun.py

    r335 r465  
    44 
    55""" 
    6 Runs differential_evolution as a pyre application 
     6Runs differential evolution as a pyre application 
    77 
    8 Based on differential_evolution.py 
     8Based on DifferentialEvolutionSolver 
    99""" 
    1010 
    1111from pyre.applications.Script import Script 
    1212from mystic.helputil import paginate 
    13 from mystic.differential_evolution import * 
     13from mystic.solvers import DifferentialEvolutionSolver 
    1414import logging 
    1515 

  • mystic/examples/example01.py

    r126 r465  
    1111 
    1212# Powell's Directonal solver 
    13 from mystic.scipy_optimize import fmin_powell 
     13from mystic.solvers import fmin_powell 
    1414 
    1515# Rosenbrock function 

  • mystic/examples/example02.py

    r131 r465  
    1212 
    1313# Nelder-Mead solver 
    14 from mystic.scipy_optimize import fmin 
     14from mystic.solvers import fmin 
    1515 
    1616# Rosenbrock function 

  • mystic/examples/example03.py

    r131 r465  
    1313 
    1414# Nelder-Mead solver 
    15 from mystic.scipy_optimize import fmin 
     15from mystic.solvers import fmin 
    1616 
    1717# Rosenbrock function 

  • mystic/examples/example04.py

    r131 r465  
    1414 
    1515# Nelder-Mead solver 
    16 from mystic.scipy_optimize import fmin 
     16from mystic.solvers import fmin 
    1717 
    1818# Rosenbrock function 
    … …  
    2020 
    2121# tools 
    22 from mystic import getch 
     22from mystic.tools import getch 
    2323import pylab 
    2424pylab.ion() 

  • mystic/examples/example05.py

    r126 r465  
    1313 
    1414# Powell's Directonal solver 
    15 from mystic.scipy_optimize import fmin_powell 
     15from mystic.solvers import fmin_powell 
    1616 
    1717# Rosenbrock function 

  • mystic/examples/example06.py

    r236 r465  
    1212 
    1313# Powell's Directonal solver 
    14 from mystic.scipy_optimize import fmin_powell 
     14from mystic.solvers import fmin_powell 
    1515 
    1616# Chebyshev polynomial and cost function 
    … …  
    2020# tools 
    2121from mystic.math import poly1d 
    22 from mystic import getch 
     22from mystic.tools import getch 
    2323import pylab 
    2424pylab.ion() 

  • mystic/examples/example07.py

    r236 r465  
    1313 
    1414# Differential Evolution solver 
    15 from mystic.differential_evolution import diffev 
     15from mystic.solvers import diffev 
    1616 
    1717# Chebyshev polynomial and cost function 
    … …  
    2121# tools 
    2222from mystic.math import poly1d 
    23 from mystic import getch, random_seed 
     23from mystic.tools import getch, random_seed 
    2424import pylab 
    2525pylab.ion() 

  • mystic/examples/example08.py

    r236 r465  
    1616 
    1717# Differential Evolution solver 
    18 from mystic.differential_evolution import DifferentialEvolutionSolver2 
     18from mystic.solvers import DifferentialEvolutionSolver2 
    1919 
    2020# Chebyshev polynomial and cost function 
    … …  
    2525from mystic.termination import VTR 
    2626from mystic.strategy import Best1Exp 
    27 from mystic import getch, random_seed, VerboseSow 
     27from mystic.tools import getch, random_seed, VerboseSow 
    2828from mystic.math import poly1d 
    2929import pylab 

  • mystic/examples/example09.py

    r236 r465  
    1818 
    1919# Differential Evolution solver 
    20 from mystic.differential_evolution import DifferentialEvolutionSolver2 
     20from mystic.solvers import DifferentialEvolutionSolver2 
    2121 
    2222# Chebyshev polynomial and cost function 
    … …  
    2727from mystic.termination import VTR 
    2828from mystic.strategy import Best1Exp 
    29 from mystic import getch, random_seed, VerboseSow 
     29from mystic.tools import getch, random_seed, VerboseSow 
    3030from mystic.math import poly1d 
    3131import pylab 

  • mystic/examples/example10.py

    r236 r465  
    1616 
    1717# Differential Evolution solver 
    18 from mystic.differential_evolution import DifferentialEvolutionSolver2 
     18from mystic.solvers import DifferentialEvolutionSolver2 
    1919 
    2020# Chebyshev polynomial and cost function 
    … …  
    2525from mystic.termination import VTR 
    2626from mystic.strategy import Best1Exp 
    27 from mystic import getch, random_seed, VerboseSow, Sow 
     27from mystic.tools import getch, random_seed, VerboseSow, Sow 
    2828from mystic.math import poly1d 
    2929import pylab 

  • mystic/examples/example11.py

    r236 r465  
    1717 
    1818# Nelder-Mead Simplex solver 
    19 from mystic.scipy_optimize import NelderMeadSimplexSolver 
     19from mystic.solvers import NelderMeadSimplexSolver 
    2020 
    2121# Chebyshev polynomial and cost function 
    … …  
    2525# tools 
    2626from mystic.termination import CandidateRelativeTolerance as CRT 
    27 from mystic import getch, random_seed, VerboseSow, Sow 
     27from mystic.tools import getch, random_seed, VerboseSow, Sow 
    2828from mystic.math import poly1d 
    2929import pylab 

  • mystic/examples/example12.py

    r131 r465  
    1212 
    1313# Powell's Directonal solver 
    14 from mystic.scipy_optimize import fmin_powell 
     14from mystic.solvers import fmin_powell 
    1515 
    1616# cost function factory 
    … …  
    1818 
    1919# tools 
    20 from mystic import getch, random_seed 
     20from mystic.tools import getch, random_seed 
    2121random_seed(123) 
    2222import pylab 

  • mystic/examples/ezmap_desolve.py

    r456 r465  
    2626 
    2727 
    28 from mystic.differential_evolution import DifferentialEvolutionSolver2 
     28from mystic.solvers import DifferentialEvolutionSolver2 
    2929from mystic.termination import ChangeOverGeneration, VTR 
    3030from mystic.strategy import Best1Exp 

  • mystic/examples/ezmap_desolve_rosen.py

    r456 r465  
    2727 
    2828 
    29 from mystic.differential_evolution import DifferentialEvolutionSolver2 
     29from mystic.solvers import DifferentialEvolutionSolver2 
    3030from mystic.termination import ChangeOverGeneration, VTR 
    3131from mystic.strategy import Best1Exp 

  • mystic/examples/lattice_example06.py

    r236 r465  
    44Example: 
    55    - Solve 8th-order Chebyshev polynomial coefficients with Powell's method. 
    6     - Uses BatchGridSolver to provide 'pseudo-global' optimization 
     6    - Uses LatticeSolver to provide 'pseudo-global' optimization 
    77    - Plot of fitting to Chebyshev polynomial. 
    88 
    … …  
    1111    - minimal solver interface 
    1212""" 
    13 # the BatchGrid solver 
    14 from mystic.nested import BatchGridSolver 
     13# the Lattice solver 
     14from mystic.solvers import LatticeSolver 
    1515 
    1616# Powell's Directonal solver 
    17 from mystic.scipy_optimize import PowellDirectionalSolver 
     17from mystic.solvers import PowellDirectionalSolver 
    1818 
    1919# Chebyshev polynomial and cost function 
    … …  
    2424from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    2525from mystic.math import poly1d 
    26 from mystic import getch, VerboseSow 
     26from mystic.tools import getch, VerboseSow 
    2727import pylab 
    2828pylab.ion() 
    … …  
    7171    stepmon = VerboseSow(1) 
    7272 
    73     # use BatchGrid Powell to solve 8th-order Chebyshev coefficients 
    74     solver = BatchGridSolver(ndim, nbins) 
     73    # use lattice-Powell to solve 8th-order Chebyshev coefficients 
     74    solver = LatticeSolver(ndim, nbins) 
    7575    solver.SetNestedSolver(PowellDirectionalSolver) 
    7676   #solver.SetMapper(ez_map) 

  • mystic/examples/mpl_corana.py

    r97 r465  
    77import pylab, numpy, mystic 
    88#from test_corana import * 
    9 from mystic.scipy_optimize import fmin 
    10 from mystic import getch 
     9from mystic.solvers import fmin 
     10from mystic.tools import getch 
    1111 
    1212from mystic.models.corana import corana1d as Corana1 

  • mystic/examples/rosetta_mogi.py

    r335 r465  
    7070# --- Call to Mystic's Fmin optimizer --- 
    7171def mystic_optimize(point): 
    72     from mystic import getch, Sow, random_seed, VerboseSow 
     72    from mystic.tools import getch, Sow, random_seed, VerboseSow 
    7373    random_seed(123) 
    74     from mystic.scipy_optimize import NelderMeadSimplexSolver as fmin 
     74    from mystic.solvers import NelderMeadSimplexSolver as fmin 
    7575    from mystic.termination import CandidateRelativeTolerance as CRT 
    7676    simplex, esow = VerboseSow(50), Sow() 
    … …  
    8484# --- Call to Mystic's DE optimizer --- 
    8585def mystic_optimize2(point): 
    86     from mystic import getch, Sow, random_seed, VerboseSow 
     86    from mystic.tools import getch, Sow, random_seed, VerboseSow 
    8787    random_seed(123) 
    88     from mystic.differential_evolution import DifferentialEvolutionSolver as de 
     88    from mystic.solvers import DifferentialEvolutionSolver as de 
    8989    from mystic.termination import ChangeOverGeneration as COG 
    9090    NPOP = 50 

  • mystic/examples/rosetta_parabola.py

    r335 r465  
    5252# --- Call to Mystic --- 
    5353def mystic_optimize(point): 
    54     from mystic import Sow, VerboseSow 
    55     from mystic.scipy_optimize import NelderMeadSimplexSolver as fmin 
     54    from mystic.tools import Sow, VerboseSow 
     55    from mystic.solvers import NelderMeadSimplexSolver as fmin 
    5656    from mystic.termination import CandidateRelativeTolerance as CRT 
    5757    simplex, esow = VerboseSow(50), Sow() 
    … …  
    144144 
    145145    # set plot window 
    146     from mystic import getch 
     146    from mystic.tools import getch 
    147147    plotview = [-10,10, 0,100] 
    148148 

  • mystic/examples/test_br8.py

    r236 r465  
    1010from numpy import * 
    1111from scipy.integrate import romberg 
    12 from mystic.differential_evolution import DifferentialEvolutionSolver2 as DifferentialEvolutionSolver 
     12from mystic.solvers import DifferentialEvolutionSolver2 as DifferentialEvolutionSolver 
    1313from mystic.termination import ChangeOverGeneration, VTR 
    14 from mystic import getch, random_seed 
    15 from mystic import VerboseSow as MySow 
     14from mystic.tools import getch, random_seed 
     15from mystic.tools import VerboseSow as MySow 
    1616 
    1717from mystic.models.br8 import decay; F = decay.ForwardFactory 

  • mystic/examples/test_circle.py

    r117 r465  
    4242 
    4343# prepare DESolver 
    44 from mystic.differential_evolution import DifferentialEvolutionSolver2 \ 
     44from mystic.solvers import DifferentialEvolutionSolver2 \ 
    4545      as DifferentialEvolutionSolver 
    4646from mystic.termination import ChangeOverGeneration, VTR 
    … …  
    6666    pylab.axis('equal') 
    6767 
    68     # solve with mystic.differential_evolution 
     68    # solve with mystic's differential evolution solver 
    6969    solution = solver.Solution() 
    7070    sx, sy, sr = solution 
    … …  
    7777 
    7878    # solve with scipy.fmin 
    79     from mystic.scipy_optimize import fmin 
     79    from mystic.solvers import fmin 
    8080    sol = fmin(cost, guess) 
    8181    print "scipy.fmin sol: ", sol 

  • mystic/examples/test_corana.py

    r117 r465  
    1313""" 
    1414 
    15 from mystic.differential_evolution import DifferentialEvolutionSolver 
     15from mystic.solvers import DifferentialEvolutionSolver 
    1616from mystic.termination import ChangeOverGeneration, VTR 
    1717from mystic.strategy import Best1Exp, Rand1Exp 
    … …  
    4949 
    5050    try: 
    51         from mystic.scipy_optimize import fmin 
     51        from mystic.solvers import fmin 
    5252       #from scipy.optimize import fmin 
    5353        import random 

  • mystic/examples/test_dejong3.py

    r117 r465  
    1616""" 
    1717 
    18 from mystic.differential_evolution import DifferentialEvolutionSolver 
     18from mystic.solvers import DifferentialEvolutionSolver 
    1919from mystic.termination import ChangeOverGeneration, VTR 
    2020from mystic.models.dejong import step as DeJong3 
    … …  
    5151 
    5252    # optimize with fmin 
    53     from mystic.scipy_optimize import fmin 
     53    from mystic.solvers import fmin 
    5454    print fmin(DeJong3, [0 for i in range(ND)]) 
    5555 

  • mystic/examples/test_dejong4.py

    r117 r465  
    1515""" 
    1616 
    17 from mystic.differential_evolution import DifferentialEvolutionSolver 
     17from mystic.solvers import DifferentialEvolutionSolver 
    1818from mystic.termination import ChangeOverGeneration, VTR 
    1919from mystic.strategy import Best1Exp, Rand1Exp 
    … …  
    5151 
    5252    # optimize with fmin 
    53     from mystic.scipy_optimize import fmin 
     53    from mystic.solvers import fmin 
    5454    print fmin(DeJong4, [0 for i in range(ND)]) 
    5555 

  • mystic/examples/test_dejong5.py

    r117 r465  
    1313""" 
    1414 
    15 from mystic.differential_evolution import DifferentialEvolutionSolver 
     15from mystic.solvers import DifferentialEvolutionSolver 
    1616from mystic.termination import ChangeOverGeneration, VTR 
    1717from mystic.strategy import Best1Exp, Rand1Exp 

  • mystic/examples/test_ffit.py

    r236 r465  
    1515""" 
    1616 
    17 from mystic.differential_evolution import DifferentialEvolutionSolver 
     17from mystic.solvers import DifferentialEvolutionSolver 
    1818from mystic.termination import ChangeOverGeneration, VTR 
    1919from mystic.strategy import Best1Exp, Best1Bin, Rand1Exp 
    2020from mystic.math import poly1d 
    21 from mystic import getch, VerboseSow 
     21from mystic.tools import getch, VerboseSow 
    2222 
    2323import random 

  • mystic/examples/test_ffit2.py

    r236 r465  
    1111""" 
    1212 
    13 from mystic.differential_evolution import DifferentialEvolutionSolver 
     13from mystic.solvers import DifferentialEvolutionSolver 
    1414from mystic.termination import ChangeOverGeneration, VTR 
    1515from mystic.strategy import Best1Exp, Best1Bin, Rand1Exp, Best2Bin, Best2Exp 
    1616from mystic.math import poly1d 
    17 from mystic import VerboseSow 
     17from mystic.tools import VerboseSow 
    1818from mystic.models.poly import chebyshev16cost 
    1919 

  • mystic/examples/test_ffitB.py

    r117 r465  
    1515 
    1616def main(): 
    17     from mystic.differential_evolution import DifferentialEvolutionSolver2 as DifferentialEvolutionSolver 
     17    from mystic.solvers import DifferentialEvolutionSolver2 as DifferentialEvolutionSolver 
    1818 
    1919    solver = DifferentialEvolutionSolver(ND, NP) 

  • mystic/examples/test_ffitC.py

    r106 r465  
    1414 
    1515if __name__ == '__main__': 
    16     from mystic.scipy_optimize import fmin 
     16    from mystic.solvers import fmin 
    1717   #from scipy.optimize import fmin 
    1818    import random 

  • mystic/examples/test_ffitD.py

    r109 r465  
    1212""" 
    1313 
    14 from mystic.differential_evolution import diffev 
     14from mystic.solvers import diffev 
    1515from test_ffit import plot_solution, print_solution, Chebyshev8, ChebyshevCost 
    1616 

  • mystic/examples/test_fosc3d.py

    r117 r465  
    66""" 
    77 
    8 from mystic.differential_evolution import DifferentialEvolutionSolver 
     8from mystic.solvers import DifferentialEvolutionSolver 
    99 
    1010from mystic.termination import ChangeOverGeneration, VTR 
    … …  
    4848if __name__ == '__main__': 
    4949    import pylab, Image 
    50     from mystic.scipy_optimize import fmin 
     50    from mystic.solvers import fmin 
    5151   #from scipy.optimize import fmin 
    5252    draw_contour() 

  • mystic/examples/test_getCost.py

    r236 r465  
    1111from mystic.math import poly1d as ForwardPolyFactory 
    1212from mystic.models import poly; PolyCostFactory = poly.CostFactory 
    13 from mystic.differential_evolution import DifferentialEvolutionSolver 
     13from mystic.solvers import DifferentialEvolutionSolver 
    1414from mystic.tools import VerboseSow, getch 
    1515 

  • mystic/examples/test_griewangk.py

    r117 r465  
    1313""" 
    1414 
    15 from mystic.differential_evolution import DifferentialEvolutionSolver 
     15from mystic.solvers import DifferentialEvolutionSolver 
    1616from mystic.termination import ChangeOverGeneration, VTR 
    1717from mystic.strategy import Best1Exp, Rand1Exp 
    … …  
    4343 
    4444if __name__ == '__main__': 
    45     from mystic.scipy_optimize import fmin 
     45    from mystic.solvers import fmin 
    4646    from timeit import Timer 
    4747    t = Timer("main()", "from __main__ import main") 

  • mystic/examples/test_lorentzian2.py

    r117 r465  
    1010import pylab, matplotlib, Image 
    1111from numpy import * 
    12 from mystic.differential_evolution import DifferentialEvolutionSolver 
     12from mystic.solvers import DifferentialEvolutionSolver 
    1313from mystic.termination import ChangeOverGeneration, VTR 
    1414from mystic.strategy import Best1Exp, Rand1Exp, Best2Exp, Best2Exp 
    15 from mystic import getch, Sow, random_seed 
     15from mystic.tools import getch, Sow, random_seed 
    1616 
    1717random.seed(123) 

  • mystic/examples/test_mogi.py

    r245 r465  
    2121 
    2222import pylab 
    23 from mystic.differential_evolution import DifferentialEvolutionSolver 
     23from mystic.solvers import DifferentialEvolutionSolver 
    2424from mystic.termination import ChangeOverGeneration, VTR 
    25 from mystic import getch, Sow, random_seed, VerboseSow 
     25from mystic.tools import getch, Sow, random_seed, VerboseSow 
    2626 
    2727from numpy import pi, sqrt, array, mgrid, random, real, conjugate, arange 
    … …  
    109109if __name__ == '__main__': 
    110110 
    111     from mystic.scipy_optimize import NelderMeadSimplexSolver as fmin 
     111    from mystic.solvers import NelderMeadSimplexSolver as fmin 
    112112    from mystic.termination import CandidateRelativeTolerance as CRT 
    113113    from scipy.optimize import leastsq, fmin_cg 

  • mystic/examples/test_mogi4.py

    r133 r465  
    66 
    77from test_mogi2 import params0, params1, stations, data, data_z, ND, NP, plot_sol, plot_noisy_data, MAX_GENERATIONS, ForwardMogiFactory 
    8 from mystic.differential_evolution import DifferentialEvolutionSolver 
     8from mystic.solvers import DifferentialEvolutionSolver 
    99from mystic.termination import ChangeOverGeneration, VTR 
    10 from mystic import getch, Sow, random_seed 
     10from mystic.tools import getch, Sow, random_seed 
    1111 
    1212from mystic.forward_model import CostFactory 

  • mystic/examples/test_rosenbrock.py

    r462 r465  
    1313""" 
    1414 
    15 from mystic.differential_evolution import DifferentialEvolutionSolver, diffev 
     15from mystic.solvers import DifferentialEvolutionSolver, diffev 
    1616from mystic.termination import ChangeOverGeneration, VTR 
    1717from mystic.models import rosen 
    18 from mystic import Sow, VerboseSow 
     18from mystic.tools import Sow, VerboseSow 
    1919 
    2020import random 

  • mystic/examples/test_rosenbrock2.py

    r462 r465  
    3030 
    3131   #from scipy.optimize import fmin 
    32     from mystic.scipy_optimize import fmin, NelderMeadSimplexSolver 
     32    from mystic.solvers import fmin, NelderMeadSimplexSolver 
    3333   #print fmin(rosen,x0,retall=0,full_output=0,maxiter=121) 
    3434    solver = NelderMeadSimplexSolver(len(x0)) 

  • mystic/examples/test_rosenbrock3.py

    r462 r465  
    3434 
    3535   #from scipy.optimize import fmin_powell 
    36     from mystic.scipy_optimize import fmin_powell, PowellDirectionalSolver 
     36    from mystic.solvers import fmin_powell, PowellDirectionalSolver 
    3737   #print fmin_powell(rosen,x0,retall=0,full_output=0)#,maxiter=14) 
    3838    solver = PowellDirectionalSolver(len(x0)) 

  • mystic/examples/test_twistedgaussian2.py

    r88 r465  
    3333       Cs , As = remix(Cs, As) 
    3434     
    35     from mystic import flatten_array 
     35    from mystic.tools import flatten_array 
    3636 
    3737    Sk = [a[100:] for a in Sk] # throw away the first 100 pts of each chain 

  • mystic/examples/test_twistedgaussian3.py

    r88 r465  
    4949 
    5050     
    51     from mystic import flatten_array 
     51    from mystic.tools import flatten_array 
    5252 
    5353    Sk = [a[100:] for a in Sk] # throw away the first 100 pts of each chain 

  • mystic/examples/test_wavy.py

    r117 r465  
    55""" 
    66 
    7 from mystic.differential_evolution import DifferentialEvolutionSolver2 as DifferentialEvolutionSolver 
     7from mystic.solvers import DifferentialEvolutionSolver2 as DifferentialEvolutionSolver 
    88from mystic.termination import ChangeOverGeneration, VTR 
    99from mystic.strategy import Best1Exp, Best1Bin, Rand1Exp 
    10 from mystic import getch, VerboseSow 
     10from mystic.tools import getch, VerboseSow 
    1111from numpy import arange 
    12 from mystic.scipy_optimize import fmin 
     12from mystic.solvers import fmin 
    1313#from scipy.optimize import fmin 
    1414 

  • mystic/examples/test_zimmermann.py

    r117 r465  
    1616""" 
    1717 
    18 from mystic.differential_evolution import DifferentialEvolutionSolver 
     18from mystic.solvers import DifferentialEvolutionSolver 
    1919from mystic.termination import ChangeOverGeneration, VTR 
    2020from mystic.strategy import Best1Exp, Rand1Exp 
    … …  
    5151    print "CPU Time: %s" % timetaken 
    5252 
    53     from mystic import Sow 
    54     from mystic.scipy_optimize import NelderMeadSimplexSolver as fmin 
     53    from mystic.tools import Sow 
     54    from mystic.solvers import NelderMeadSimplexSolver as fmin 
    5555    from mystic.termination import CandidateRelativeTolerance as CRT 
    5656 

  • mystic/examples_other/sam_cg_rosenbrock.py

    r133 r465  
    1212from scipy.optimize import fmin_cg 
    1313import numpy 
    14 from mystic import getch 
     14from mystic.tools import getch 
    1515 
    1616def draw_contour(): 

  • mystic/examples_other/sam_cg_zimmermann.py

    r133 r465  
    1111from scipy.optimize import fmin_cg 
    1212import numpy 
    13 from mystic import getch 
     13from mystic.tools import getch 
    1414 
    1515def draw_contour(): 

  • mystic/examples_other/sam_corana.py

    r133 r465  
    77import sam, numpy, mystic 
    88#from test_corana import * 
    9 from mystic.scipy_optimize import fmin 
    10 from mystic import getch 
     9from mystic.solvers import fmin 
     10from mystic.tools import getch 
    1111 
    1212from mystic.models.corana import corana1d as Corana1 

  • mystic/examples_other/sam_corana2.py

    r133 r465  
    1111import sam 
    1212#from test_corana import * 
    13 from mystic.scipy_optimize import NelderMeadSimplexSolver as fmin 
     13from mystic.solvers import NelderMeadSimplexSolver as fmin 
    1414from mystic.termination import CandidateRelativeTolerance as CRT 
    15 from mystic import getch, Sow 
     15from mystic.tools import getch, Sow 
    1616 
    1717from mystic.models.corana import corana2d as Corana2 

  • mystic/examples_other/sam_mogi.py

    r133 r465  
    99import sam 
    1010from test_mogi import * 
    11 from mystic.scipy_optimize import NelderMeadSimplexSolver as fmin 
     11from mystic.solvers import NelderMeadSimplexSolver as fmin 
    1212from mystic.termination import CandidateRelativeTolerance as CRT 
    13 from mystic import getch, Sow 
     13from mystic.tools import getch, Sow 
    1414 
    1515x0,y0,z0,v0 = actual_params 

  • mystic/examples_other/sam_rosenbrock.py

    r133 r465  
    1212import sam 
    1313from test_rosenbrock import * 
    14 from mystic.scipy_optimize import NelderMeadSimplexSolver as fmin 
     14from mystic.solvers import NelderMeadSimplexSolver as fmin 
    1515from mystic.termination import CandidateRelativeTolerance as CRT 
    16 from mystic import getch, Sow 
     16from mystic.tools import getch, Sow 
    1717 
    1818def draw_contour(): 

  • mystic/examples_other/sam_zimmermann.py

    r133 r465  
    1212import sam 
    1313from test_zimmermann import * 
    14 from mystic.scipy_optimize import NelderMeadSimplexSolver as fmin 
     14from mystic.solvers import NelderMeadSimplexSolver as fmin 
    1515from mystic.termination import CandidateRelativeTolerance as CRT 
    16 from mystic import getch, Sow 
     16from mystic.tools import getch, Sow 
    1717 
    1818def draw_contour(): 

  • mystic/examples_other/test_gplot.py

    r88 r465  
    11#!/usr/bin/env python 
    22 
    3 from mystic import getch 
     3from mystic.tools import getch 
    44 
    55import Gnuplot, numpy 

  • mystic/mystic/Make.mm

    r427 r465  
    4242    python_map.py \ 
    4343    scipy_optimize.py \ 
     44    solvers.py \ 
    4445    strategy.py \ 
    4546    termination.py \ 

  • mystic/mystic/__init__.py

    r464 r465  
    7878 
    7979You will be warned of any missing dependencies and/or settings 
    80 after you run the "build" step above. Mystic depends on numpy, 
    81 so you should install it first. Having matplotlib is necessary 
    82 for running several of the examples, and you should probably go 
    83 get it even though it's not required. 
     80after you run the "build" step above. Mystic depends on numpy 
     81and sympy, so you should install them first. There are several 
     82functions within mystic where scipy is used if it is available; 
     83however, scipy is an optional dependency. Having matplotlib installed 
     84is necessary for running several of the examples, and you should 
     85probably go get it even though it's not required. Matplotlib is 
     86also required by mystic's "analysis viewers". 
    8487 
    8588Alternately, mystic can be installed with easy_install:: 
    … …  
    99102    - python, version >= 2.5, version < 3.0 
    100103    - numpy, version >= 1.0 
     104    - sympy, version >= 0.6.7 
    101105 
    102106Optional requirements:: 
    103107    - setuptools, version >= 0.6 
    104108    - matplotlib, version >= 0.91 
     109    - scipy, version >= 0.6.0 
    105110    - pathos, version >= 0.1a1 
     111    - pyina, version >= 0.1a1 
    106112 
    107113 
    … …  
    144150 
    145151Important classes and functions are found here:: 
     152    - mystic.mystic.solvers                [solver optimization algorithms] 
     153    - mystic.mystic.termination            [solver termination conditions] 
     154    - mystic.mystic.strategy               [solver population mutation strategies] 
     155    - mystic.mystic.tools                  [monitors, function wrappers, and other tools] 
     156    - mystic.mystic.forward_model          [cost function generator] 
     157    - mystic.models                        [a collection of standard models] 
     158    - mystic.math                          [some mathematical functions and tools] 
     159 
     160Solver and model API definitions are found here:: 
    146161    - mystic.mystic.abstract_solver        [the solver API definition] 
    147162    - mystic.mystic.abstract_map_solver    [the parallel solver API] 
    148163    - mystic.mystic.abstract_nested_solver [the nested solver API] 
    149     - mystic.mystic.termination            [solver termination conditions] 
    150     - mystic.mystic.strategy               [solver population mutation strategies] 
    151164    - mystic.models.abstract_model         [the model API definition] 
    152     - mystic.models.forward_model          [cost function generator] 
    153     - mystic.mystic.tools                  [monitors, function wrappers, and other tools] 
    154     - mystic.mystic.math                   [some useful mathematical functions and tools] 
    155  
    156 Solvers are found here:: 
    157     - mystic.mystic.differential_evolution [Differential Evolution solvers] 
    158     - mystic.mystic.scipy_optimize         [Nelder-Mead and Powell's Directional solvers] 
    159     - mystic.mystic.nested                 [Batch Grid and Scattershot solvers] 
    160165 
    161166 
    … …  
    218223 
    219224""" 
     225__all__ = ['solvers', 'termination', 'strategy', 'munge', 'tools'] 
    220226 
    221227# solvers 
    222 import differential_evolution, scipy_optimize, nested 
     228import solvers 
    223229 
    224230# strategies, termination conditions 
    … …  
    226232import strategy 
    227233 
     234# constraints and penalties 
     235# import constraints 
     236# import penalties 
     237 
    228238# monitors, function wrappers, and other tools 
     239# import monitors 
     240import munge 
     241import tools 
     242 
     243# backward compatibility 
    229244from tools import * 
     245 
    230246 
    231247def copyright(): 

  • mystic/mystic/differential_evolution.py

    r462 r465  
    3939A minimal interface that mimics a scipy.optimize interface has also been 
    4040implemented, and functionality from the mystic solver API has been added 
    41 with reasonable defaults.  DifferentialEvolutionSolver2 is used by 
    42 the minimal interface, unless 'invariant_current' is set to False. 
     41with reasonable defaults.  
    4342 
    4443Minimal function interface to optimization routines:: 
    4544    diffev      -- Differential Evolution (DE) solver 
     45    diffev2     -- Price & Storn's Differential Evolution solver 
    4646 
    4747The corresponding solvers built on mystic's AbstractSolver are:: 
    … …  
    4949    DifferentialEvolutionSolver2 -- Storn & Price's DE solver 
    5050 
    51 Mystic solver behavior activated in deffev:: 
     51Mystic solver behavior activated in diffev and diffev2:: 
    5252    - EvaluationMonitor = Sow() 
    5353    - StepMonitor = Sow() 
    … …  
    138138""" 
    139139__all__ = ['DifferentialEvolutionSolver','DifferentialEvolutionSolver2',\ 
    140            'diffev'] 
     140           'diffev','diffev2'] 
    141141 
    142142from mystic.tools import Null, wrap_function, unpair 
    … …  
    565565 
    566566 
    567 def diffev(func,x0,npop,args=(),bounds=None,ftol=5e-3,gtol=None, 
    568            maxiter=None,maxfun=None,cross=0.9,scale=0.8, 
    569            full_output=0,disp=1,retall=0,callback=None,invariant_current=True): 
    570     """Minimize a function using differential evolution. 
     567def diffev2(func,x0,npop,args=(),bounds=None,ftol=5e-3,gtol=None, 
     568            maxiter=None,maxfun=None,cross=0.9,scale=0.8, 
     569            full_output=0,disp=1,retall=0,callback=None): 
     570    """Minimize a function using Storn & Price's differential evolution. 
    571571 
    572572Description: 
    573573 
    574     Uses a differential evolution algorith to find the minimum of 
    575     a function of one or more variables. Mimics a scipy.optimize style 
     574    Uses Storn & Prices's differential evolution algorith to find the minimum 
     575    of a function of one or more variables. Mimics a scipy.optimize style 
    576576    interface. 
    577577 
    … …  
    600600        iteration.  It is called as callback(xk), where xk is the 
    601601        current parameter vector. 
    602     invariant_current -- set to True to call DifferentialEvolutionSolver2, 
    603         otherwise call DifferentialEvolutionSolver 
    604602 
    605603Returns: (xopt, {fopt, iter, funcalls, warnflag}, {allvecs}) 
    … …  
    615613 
    616614    """ 
     615    return diffev(func,x0,npop,args=(),bounds=None,ftol=5e-3,gtol=None, 
     616                  maxiter=None,maxfun=None,cross=0.9,scale=0.8, 
     617                  full_output=0,disp=1,retall=0,callback=None, 
     618                  invariant_current=True) 
     619 
     620 
     621def diffev(func,x0,npop,args=(),bounds=None,ftol=5e-3,gtol=None, 
     622           maxiter=None,maxfun=None,cross=0.9,scale=0.8, 
     623           full_output=0,disp=1,retall=0,callback=None,**kwds): 
     624    """Minimize a function using differential evolution. 
     625 
     626Description: 
     627 
     628    Uses a differential evolution algorith to find the minimum of 
     629    a function of one or more variables. Mimics a scipy.optimize style 
     630    interface. 
     631 
     632Inputs: 
     633 
     634    func -- the Python function or method to be minimized. 
     635    x0 -- the initial guess (ndarray), if desired to start from a 
     636        set point; otherwise takes an array of (min,max) bounds, 
     637        for when random initial points are desired 
     638    npop -- size of the trial solution population. 
     639 
     640Additional Inputs: 
     641 
     642    args -- extra arguments for func. 
     643    bounds -- list - n pairs of bounds (min,max), one pair for each parameter. 
     644    ftol -- number - acceptable relative error in func(xopt) for convergence. 
     645    gtol -- number - maximum number of iterations to run without improvement. 
     646    maxiter -- number - the maximum number of iterations to perform. 
     647    maxfun -- number - the maximum number of function evaluations. 
     648    cross -- number - the probability of cross-parameter mutations 
     649    scale -- number - multiplier for impact of mutations on trial solution. 
     650    full_output -- number - non-zero if fval and warnflag outputs are desired. 
     651    disp -- number - non-zero to print convergence messages. 
     652    retall -- number - non-zero to return list of solutions at each iteration. 
     653    callback -- an optional user-supplied function to call after each 
     654        iteration.  It is called as callback(xk), where xk is the 
     655        current parameter vector. 
     656 
     657Returns: (xopt, {fopt, iter, funcalls, warnflag}, {allvecs}) 
     658 
     659    xopt -- ndarray - minimizer of function 
     660    fopt -- number - value of function at minimum: fopt = func(xopt) 
     661    iter -- number - number of iterations 
     662    funcalls -- number - number of function calls 
     663    warnflag -- number - Integer warning flag: 
     664        1 : 'Maximum number of function evaluations.' 
     665        2 : 'Maximum number of iterations.' 
     666    allvecs -- list - a list of solutions at each iteration 
     667 
     668    """ 
     669    invariant_current = False 
     670    if kwds.has_key('invariant_current'): 
     671        invariant_current = kwds['invariant_current'] 
    617672 
    618673    from mystic.tools import Sow 

  • mystic/mystic/munge.py

    r370 r465  
    1 from mystic import list_or_tuple_or_ndarray as sequence 
     1from mystic.tools import list_or_tuple_or_ndarray as sequence 
    22 
    33def write_support_file(mon,log_file='paramlog.py'): 

  • mystic/mystic/nested.py

    r463 r465  
    1212 
    1313The set of solvers built on mystic's AbstractNestdSolver are:: 
    14    BatchGridSolver -- start from center of N grid points 
    15    ScattershotSolver -- start from N random points in parameter space 
     14   LatticeSolver -- start from center of N grid points 
     15   BuckshotSolver -- start from N random points in parameter space 
    1616 
    1717 
    … …  
    1919===== 
    2020 
    21 See `mystic.examples.scattershot_example06` for an example of using 
    22 ScattershotSolver. See `mystic.examples.batchgrid_example06` 
    23 or an example of using BatchGridSolver. 
     21See `mystic.examples.buckshot_example06` for an example of using 
     22BuckshotSolver. See `mystic.examples.lattice_example06` 
     23or an example of using LatticeSolver. 
    2424 
    2525All solvers included in this module provide the standard signal handling. 
    2626For more information, see `mystic.mystic.abstract_solver`. 
    2727""" 
    28 __all__ = ['BatchGridSolver','ScattershotSolver'] 
     28__all__ = ['LatticeSolver','BuckshotSolver'] 
    2929 
    3030from mystic.tools import Null, wrap_function 
    … …  
    3333 
    3434 
    35 class BatchGridSolver(AbstractNestedSolver): 
     35class LatticeSolver(AbstractNestedSolver): 
    3636    """ 
    3737parallel mapped optimization starting from the center of N grid points 
    … …  
    4545All important class members are inherited from AbstractNestedSolver. 
    4646        """ 
    47         super(BatchGridSolver, self).__init__(dim, nbins=nbins) 
     47        super(LatticeSolver, self).__init__(dim, nbins=nbins) 
    4848 
    4949#   def SetGridBins(self, nbins): 
    … …  
    134134def local_optimize(cost, termination, x0, rank): 
    135135    from %s import %s as LocalSolver 
    136     from mystic import Sow 
     136    from mystic.tools import Sow 
    137137 
    138138    stepmon = Sow() 
    … …  
    220220        return  
    221221 
    222 class ScattershotSolver(AbstractNestedSolver): 
     222class BuckshotSolver(AbstractNestedSolver): 
    223223    """ 
    224224parallel mapped optimization starting from the N random points 
    … …  
    232232All important class members are inherited from AbstractNestedSolver. 
    233233        """ 
    234         super(ScattershotSolver, self).__init__(dim, npts=npts) 
     234        super(BuckshotSolver, self).__init__(dim, npts=npts) 
    235235 
    236236    def Solve(self, cost, termination, sigint_callback=None, 
    237237              EvaluationMonitor=Null, StepMonitor=Null, ExtraArgs=(), **kwds): 
    238         """Minimize a function using scattershot optimization. 
     238        """Minimize a function using buckshot optimization. 
    239239 
    240240Description: 
    … …  
    308308def local_optimize(cost, termination, x0, rank): 
    309309    from %s import %s as LocalSolver 
    310     from mystic import Sow 
     310    from mystic.tools import Sow 
    311311 
    312312    stepmon = Sow() 
    … …  
    394394        return  
    395395 
     396# backward compatibility 
     397ScattershotSolver = BuckshotSolver 
     398BatchGridSolver = LatticeSolver 
     399 
    396400 
    397401if __name__=='__main__': 

  • mystic/scripts/support_hypercube.py

    r374 r465  
    168168  #steps = [[0,1],[1,2],[2,3],[3,4,5,6,7,8]] or similar 
    169169  if flatten: 
    170     from mystic import flatten 
     170    from mystic.tools import flatten 
    171171    steps = [list(flatten(steps))] 
    172172 

  • mystic/scripts/support_hypercube2.py

    r374 r465  
    180180  #steps = [[0],[1],[3],[8]] or similar 
    181181  if flatten: 
    182     from mystic import flatten 
     182    from mystic.tools import flatten 
    183183    steps = [list(flatten(steps))] 
    184184 

  • mystic/tests/solver_test_best_performance.py

    r424 r465  
    5454    print "\nUsing DifferentialEvolutionSolver:" 
    5555    npop = 40 
    56     from mystic.differential_evolution import DifferentialEvolutionSolver 
     56    from mystic.solvers import DifferentialEvolutionSolver 
    5757    from mystic.termination import ChangeOverGeneration as COG 
    5858    from mystic.strategy import Rand1Bin 
    … …  
    7878    print "\nUsing DifferentialEvolutionSolver2:" 
    7979    npop = 40 
    80     from mystic.differential_evolution import DifferentialEvolutionSolver2 
     80    from mystic.solvers import DifferentialEvolutionSolver2 
    8181    from mystic.termination import ChangeOverGeneration as COG 
    8282    from mystic.strategy import Rand1Bin 
    … …  
    101101    # NelderMeadSimplexSolver 
    102102    print "\nUsing NelderMeadSimplexSolver:" 
    103     from mystic.scipy_optimize import NelderMeadSimplexSolver 
     103    from mystic.solvers import NelderMeadSimplexSolver 
    104104    from mystic.termination import CandidateRelativeTolerance as CRT 
    105105    esow = Sow() 
    … …  
    122122    # PowellDirectionalSolver 
    123123    print "\nUsing PowellDirectionalSolver:" 
    124     from mystic.scipy_optimize import PowellDirectionalSolver 
     124    from mystic.solvers import PowellDirectionalSolver 
    125125    from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    126126    esow = Sow() 
    … …  
    179179    npop = 50 
    180180    random_seed(seed) 
    181     from mystic.differential_evolution import DifferentialEvolutionSolver 
     181    from mystic.solvers import DifferentialEvolutionSolver 
    182182    from mystic.termination import ChangeOverGeneration as COG 
    183183    from mystic.termination import CandidateRelativeTolerance as CRT 
    … …  
    209209    npop = 50 
    210210    random_seed(seed) 
    211     from mystic.differential_evolution import DifferentialEvolutionSolver2 
     211    from mystic.solvers import DifferentialEvolutionSolver2 
    212212    from mystic.termination import ChangeOverGeneration as COG 
    213213    from mystic.termination import CandidateRelativeTolerance as CRT 

  • mystic/tests/solver_test_suite.py

    r425 r465  
    2929 
    3030    def _run_solver(self, iter_limit=False, local=False, **kwds): 
    31         from mystic import Sow 
     31        from mystic.tools import Sow 
    3232        import numpy 
    3333        from mystic.tools import random_seed 
    … …  
    7272 
    7373    def test_DifferentialEvolutionSolver_VTR(self): 
    74         from mystic.differential_evolution import DifferentialEvolutionSolver 
     74        from mystic.solvers import DifferentialEvolutionSolver 
    7575        from mystic.termination import VTR 
    7676        tol = 1e-7 
    … …  
    8282 
    8383    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    84         from mystic.differential_evolution import DifferentialEvolutionSolver 
     84        from mystic.solvers import DifferentialEvolutionSolver 
    8585        from mystic.termination import ChangeOverGeneration as COG 
    8686        tol = 1e-7 
    … …  
    9292 
    9393    def test_DifferentialEvolutionSolver_NCOG(self): 
    94         from mystic.differential_evolution import DifferentialEvolutionSolver 
     94        from mystic.solvers import DifferentialEvolutionSolver 
    9595        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    9696        tol = 1e-7 
    … …  
    102102 
    103103    def test_DifferentialEvolutionSolver_CRT(self): 
    104         from mystic.differential_evolution import DifferentialEvolutionSolver 
     104        from mystic.solvers import DifferentialEvolutionSolver 
    105105        from mystic.termination import CandidateRelativeTolerance as CRT 
    106106        tol = 1e-7 
    … …  
    114114 
    115115    def test_DifferentialEvolutionSolver2_VTR(self):  
    116         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     116        from mystic.solvers import DifferentialEvolutionSolver2 
    117117        from mystic.termination import VTR 
    118118        tol = 1e-7 
    … …  
    124124 
    125125    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    126         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     126        from mystic.solvers import DifferentialEvolutionSolver2 
    127127        from mystic.termination import ChangeOverGeneration as COG 
    128128        tol = 1e-7 
    … …  
    134134 
    135135    def test_DifferentialEvolutionSolver2_NCOG(self): 
    136         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     136        from mystic.solvers import DifferentialEvolutionSolver2 
    137137        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    138138        tol = 1e-7 
    … …  
    144144 
    145145    def test_DifferentialEvolutionSolver2_CRT(self): 
    146         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     146        from mystic.solvers import DifferentialEvolutionSolver2 
    147147        from mystic.termination import CandidateRelativeTolerance as CRT 
    148148        tol = 1e-7 
    … …  
    156156 
    157157    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    158         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     158        from mystic.solvers import NelderMeadSimplexSolver 
    159159        from mystic.termination import CandidateRelativeTolerance as CRT 
    160160        tol = 1e-7 
    … …  
    164164 
    165165    def test_NelderMeadSimplexSolver_VTR(self):  
    166         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     166        from mystic.solvers import NelderMeadSimplexSolver 
    167167        from mystic.termination import VTR 
    168168        tol = 1e-7 
    … …  
    172172 
    173173    def test_NelderMeadSimplexSolver_COG(self):  
    174         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     174        from mystic.solvers import NelderMeadSimplexSolver 
    175175        from mystic.termination import ChangeOverGeneration as COG 
    176176        tol = 1e-7 
    … …  
    180180 
    181181    def test_NelderMeadSimplexSolver_NCOG(self):  
    182         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     182        from mystic.solvers import NelderMeadSimplexSolver 
    183183        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    184184        tol = 1e-7 
    … …  
    190190 
    191191    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    192         from mystic.scipy_optimize import PowellDirectionalSolver 
     192        from mystic.solvers import PowellDirectionalSolver 
    193193        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    194194        tol = 1e-7 
    … …  
    198198 
    199199    def test_PowellDirectionalSolver_COG(self):  
    200         from mystic.scipy_optimize import PowellDirectionalSolver 
     200        from mystic.solvers import PowellDirectionalSolver 
    201201        from mystic.termination import ChangeOverGeneration as COG 
    202202        tol = 1e-7 
    … …  
    206206 
    207207    def test_PowellDirectionalSolver_VTR(self):  
    208         from mystic.scipy_optimize import PowellDirectionalSolver 
     208        from mystic.solvers import PowellDirectionalSolver 
    209209        from mystic.termination import VTR 
    210210        tol = 1e-7 
    … …  
    214214 
    215215    def test_PowellDirectionalSolver_CRT(self):  
    216         from mystic.scipy_optimize import PowellDirectionalSolver 
     216        from mystic.solvers import PowellDirectionalSolver 
    217217        from mystic.termination import CandidateRelativeTolerance as CRT 
    218218        tol = 1e-7 
    … …  
    239239 
    240240    def _run_solver(self, iter_limit=False, **kwds): 
    241         from mystic import Sow 
     241        from mystic.tools import Sow 
    242242        import numpy 
    243243        from mystic.tools import random_seed 
    … …  
    272272 
    273273    def test_DifferentialEvolutionSolver_VTR(self): 
    274         from mystic.differential_evolution import DifferentialEvolutionSolver 
     274        from mystic.solvers import DifferentialEvolutionSolver 
    275275        from mystic.termination import VTR 
    276276        tol = 1e-7 
    … …  
    282282 
    283283    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    284         from mystic.differential_evolution import DifferentialEvolutionSolver 
     284        from mystic.solvers import DifferentialEvolutionSolver 
    285285        from mystic.termination import ChangeOverGeneration as COG 
    286286        tol = 1e-7 
    … …  
    292292 
    293293    def test_DifferentialEvolutionSolver_NCOG(self): 
    294         from mystic.differential_evolution import DifferentialEvolutionSolver 
     294        from mystic.solvers import DifferentialEvolutionSolver 
    295295        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    296296        tol = 1e-7 
    … …  
    302302 
    303303    def test_DifferentialEvolutionSolver_CRT(self): 
    304         from mystic.differential_evolution import DifferentialEvolutionSolver 
     304        from mystic.solvers import DifferentialEvolutionSolver 
    305305        from mystic.termination import CandidateRelativeTolerance as CRT 
    306306        tol = 1e-7 
    … …  
    314314 
    315315    def test_DifferentialEvolutionSolver2_VTR(self):  
    316         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     316        from mystic.solvers import DifferentialEvolutionSolver2 
    317317        from mystic.termination import VTR 
    318318        tol = 1e-7 
    … …  
    324324 
    325325    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    326         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     326        from mystic.solvers import DifferentialEvolutionSolver2 
    327327        from mystic.termination import ChangeOverGeneration as COG 
    328328        tol = 1e-7 
    … …  
    334334 
    335335    def test_DifferentialEvolutionSolver2_NCOG(self): 
    336         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     336        from mystic.solvers import DifferentialEvolutionSolver2 
    337337        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    338338        tol = 1e-7 
    … …  
    344344 
    345345    def test_DifferentialEvolutionSolver2_CRT(self): 
    346         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     346        from mystic.solvers import DifferentialEvolutionSolver2 
    347347        from mystic.termination import CandidateRelativeTolerance as CRT 
    348348        tol = 1e-7 
    … …  
    356356 
    357357    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    358         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     358        from mystic.solvers import NelderMeadSimplexSolver 
    359359        from mystic.termination import CandidateRelativeTolerance as CRT 
    360360        tol = 1e-7 
    … …  
    364364 
    365365    def test_NelderMeadSimplexSolver_VTR(self):  
    366         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     366        from mystic.solvers import NelderMeadSimplexSolver 
    367367        from mystic.termination import VTR 
    368368        tol = 1e-7 
    … …  
    372372 
    373373    def test_NelderMeadSimplexSolver_COG(self):  
    374         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     374        from mystic.solvers import NelderMeadSimplexSolver 
    375375        from mystic.termination import ChangeOverGeneration as COG 
    376376        tol = 1e-7 
    … …  
    380380 
    381381    def test_NelderMeadSimplexSolver_NCOG(self):  
    382         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     382        from mystic.solvers import NelderMeadSimplexSolver 
    383383        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    384384        tol = 1e-7 
    … …  
    390390 
    391391    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    392         from mystic.scipy_optimize import PowellDirectionalSolver 
     392        from mystic.solvers import PowellDirectionalSolver 
    393393        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    394394        tol = 1e-7 
    … …  
    398398 
    399399    def test_PowellDirectionalSolver_COG(self):  
    400         from mystic.scipy_optimize import PowellDirectionalSolver 
     400        from mystic.solvers import PowellDirectionalSolver 
    401401        from mystic.termination import ChangeOverGeneration as COG 
    402402        tol = 1e-7 
    … …  
    406406 
    407407    def test_PowellDirectionalSolver_VTR(self):  
    408         from mystic.scipy_optimize import PowellDirectionalSolver 
     408        from mystic.solvers import PowellDirectionalSolver 
    409409        from mystic.termination import VTR 
    410410        tol = 1e-7 
    … …  
    414414 
    415415    def test_PowellDirectionalSolver_CRT(self):  
    416         from mystic.scipy_optimize import PowellDirectionalSolver 
     416        from mystic.solvers import PowellDirectionalSolver 
    417417        from mystic.termination import CandidateRelativeTolerance as CRT 
    418418        tol = 1e-7 
    … …  
    439439 
    440440    def _run_solver(self, iter_limit=False, **kwds): 
    441         from mystic import Sow 
     441        from mystic.tools import Sow 
    442442        import numpy 
    443443        from mystic.tools import random_seed 
    … …  
    473473 
    474474    def test_DifferentialEvolutionSolver_VTR(self):  
    475         from mystic.differential_evolution import DifferentialEvolutionSolver 
     475        from mystic.solvers import DifferentialEvolutionSolver 
    476476        from mystic.termination import VTR 
    477477        tol = 1e-7 
    … …  
    483483 
    484484    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    485         from mystic.differential_evolution import DifferentialEvolutionSolver 
     485        from mystic.solvers import DifferentialEvolutionSolver 
    486486        from mystic.termination import ChangeOverGeneration as COG 
    487487        tol = 1e-7 
    … …  
    493493 
    494494    def test_DifferentialEvolutionSolver_NCOG(self): 
    495         from mystic.differential_evolution import DifferentialEvolutionSolver 
     495        from mystic.solvers import DifferentialEvolutionSolver 
    496496        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    497497        tol = 1e-7 
    … …  
    503503 
    504504    def test_DifferentialEvolutionSolver_CRT(self): 
    505         from mystic.differential_evolution import DifferentialEvolutionSolver 
     505        from mystic.solvers import DifferentialEvolutionSolver 
    506506        from mystic.termination import CandidateRelativeTolerance as CRT 
    507507        tol = 1e-7 
    … …  
    515515 
    516516    def test_DifferentialEvolutionSolver2_VTR(self): 
    517         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     517        from mystic.solvers import DifferentialEvolutionSolver2 
    518518        from mystic.termination import VTR 
    519519        tol = 1e-7 
    … …  
    525525 
    526526    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    527         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     527        from mystic.solvers import DifferentialEvolutionSolver2 
    528528        from mystic.termination import ChangeOverGeneration as COG 
    529529        tol = 1e-7 
    … …  
    535535 
    536536    def test_DifferentialEvolutionSolver2_NCOG(self): 
    537         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     537        from mystic.solvers import DifferentialEvolutionSolver2 
    538538        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    539539        tol = 1e-7 
    … …  
    545545 
    546546    def test_DifferentialEvolutionSolver2_CRT(self): 
    547         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     547        from mystic.solvers import DifferentialEvolutionSolver2 
    548548        from mystic.termination import CandidateRelativeTolerance as CRT 
    549549        tol = 1e-7 
    … …  
    557557 
    558558    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    559         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     559        from mystic.solvers import NelderMeadSimplexSolver 
    560560        from mystic.termination import CandidateRelativeTolerance as CRT 
    561561        tol = 1e-7 
    … …  
    565565 
    566566    def test_NelderMeadSimplexSolver_VTR(self):  
    567         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     567        from mystic.solvers import NelderMeadSimplexSolver 
    568568        from mystic.termination import VTR 
    569569        tol = 1e-7 
    … …  
    573573 
    574574    def test_NelderMeadSimplexSolver_COG(self):  
    575         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     575        from mystic.solvers import NelderMeadSimplexSolver 
    576576        from mystic.termination import ChangeOverGeneration as COG 
    577577        tol = 1e-7 
    … …  
    581581 
    582582    def test_NelderMeadSimplexSolver_NCOG(self):  
    583         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     583        from mystic.solvers import NelderMeadSimplexSolver 
    584584        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    585585        tol = 1e-7 
    … …  
    591591 
    592592    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    593         from mystic.scipy_optimize import PowellDirectionalSolver 
     593        from mystic.solvers import PowellDirectionalSolver 
    594594        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    595595        tol = 1e-7 
    … …  
    599599 
    600600    def test_PowellDirectionalSolver_COG(self):  
    601         from mystic.scipy_optimize import PowellDirectionalSolver 
     601        from mystic.solvers import PowellDirectionalSolver 
    602602        from mystic.termination import ChangeOverGeneration as COG 
    603603        tol = 1e-7 
    … …  
    607607 
    608608    def test_PowellDirectionalSolver_VTR(self):  
    609         from mystic.scipy_optimize import PowellDirectionalSolver 
     609        from mystic.solvers import PowellDirectionalSolver 
    610610        from mystic.termination import VTR 
    611611        tol = 1e-7 
    … …  
    615615 
    616616    def test_PowellDirectionalSolver_CRT(self):  
    617         from mystic.scipy_optimize import PowellDirectionalSolver 
     617        from mystic.solvers import PowellDirectionalSolver 
    618618        from mystic.termination import CandidateRelativeTolerance as CRT 
    619619        tol = 1e-7 
    … …  
    639639 
    640640    def _run_solver(self, iter_limit=False, **kwds): 
    641         from mystic import Sow 
     641        from mystic.tools import Sow 
    642642        import numpy 
    643643        from mystic.tools import random_seed 
    … …  
    671671 
    672672    def test_DifferentialEvolutionSolver_VTR(self):  
    673         from mystic.differential_evolution import DifferentialEvolutionSolver 
     673        from mystic.solvers import DifferentialEvolutionSolver 
    674674        from mystic.termination import VTR 
    675675        tol = 1e-7 
    … …  
    681681 
    682682    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    683         from mystic.differential_evolution import DifferentialEvolutionSolver 
     683        from mystic.solvers import DifferentialEvolutionSolver 
    684684        from mystic.termination import ChangeOverGeneration as COG 
    685685        tol = 1e-7 
    … …  
    691691 
    692692    def test_DifferentialEvolutionSolver_NCOG(self): 
    693         from mystic.differential_evolution import DifferentialEvolutionSolver 
     693        from mystic.solvers import DifferentialEvolutionSolver 
    694694        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    695695        tol = 1e-7 
    … …  
    701701 
    702702    def test_DifferentialEvolutionSolver_CRT(self): 
    703         from mystic.differential_evolution import DifferentialEvolutionSolver 
     703        from mystic.solvers import DifferentialEvolutionSolver 
    704704        from mystic.termination import CandidateRelativeTolerance as CRT 
    705705        tol = 1e-7 
    … …  
    713713 
    714714    def test_DifferentialEvolutionSolver2_VTR(self): 
    715         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     715        from mystic.solvers import DifferentialEvolutionSolver2 
    716716        from mystic.termination import VTR 
    717717        tol = 1e-7 
    … …  
    723723 
    724724    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    725         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     725        from mystic.solvers import DifferentialEvolutionSolver2 
    726726        from mystic.termination import ChangeOverGeneration as COG 
    727727        tol = 1e-7 
    … …  
    733733 
    734734    def test_DifferentialEvolutionSolver2_NCOG(self): 
    735         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     735        from mystic.solvers import DifferentialEvolutionSolver2 
    736736        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    737737        tol = 1e-7 
    … …  
    743743 
    744744    def test_DifferentialEvolutionSolver2_CRT(self): 
    745         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     745        from mystic.solvers import DifferentialEvolutionSolver2 
    746746        from mystic.termination import CandidateRelativeTolerance as CRT 
    747747        tol = 1e-7 
    … …  
    755755 
    756756    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    757         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     757        from mystic.solvers import NelderMeadSimplexSolver 
    758758        from mystic.termination import CandidateRelativeTolerance as CRT 
    759759        tol = 1e-7 
    … …  
    763763 
    764764    def test_NelderMeadSimplexSolver_VTR(self):  
    765         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     765        from mystic.solvers import NelderMeadSimplexSolver 
    766766        from mystic.termination import VTR 
    767767        tol = 1e-7 
    … …  
    771771 
    772772    def test_NelderMeadSimplexSolver_COG(self):  
    773         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     773        from mystic.solvers import NelderMeadSimplexSolver 
    774774        from mystic.termination import ChangeOverGeneration as COG 
    775775        tol = 1e-7 
    … …  
    779779 
    780780    def test_NelderMeadSimplexSolver_NCOG(self):  
    781         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     781        from mystic.solvers import NelderMeadSimplexSolver 
    782782        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    783783        tol = 1e-7 
    … …  
    789789 
    790790    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    791         from mystic.scipy_optimize import PowellDirectionalSolver 
     791        from mystic.solvers import PowellDirectionalSolver 
    792792        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    793793        tol = 1e-7 
    … …  
    797797 
    798798    def test_PowellDirectionalSolver_COG(self):  
    799         from mystic.scipy_optimize import PowellDirectionalSolver 
     799        from mystic.solvers import PowellDirectionalSolver 
    800800        from mystic.termination import ChangeOverGeneration as COG 
    801801        tol = 1e-7 
    … …  
    805805 
    806806    def test_PowellDirectionalSolver_VTR(self):  
    807         from mystic.scipy_optimize import PowellDirectionalSolver 
     807        from mystic.solvers import PowellDirectionalSolver 
    808808        from mystic.termination import VTR 
    809809        tol = 1e-7 
    … …  
    813813 
    814814    def test_PowellDirectionalSolver_CRT(self):  
    815         from mystic.scipy_optimize import PowellDirectionalSolver 
     815        from mystic.solvers import PowellDirectionalSolver 
    816816        from mystic.termination import CandidateRelativeTolerance as CRT 
    817817        tol = 1e-7 
    … …  
    837837 
    838838    def _run_solver(self, iter_limit=False, **kwds): 
    839         from mystic import Sow 
     839        from mystic.tools import Sow 
    840840        import numpy 
    841841        from mystic.tools import random_seed 
    … …  
    869869 
    870870    def test_DifferentialEvolutionSolver_VTR(self):  
    871         from mystic.differential_evolution import DifferentialEvolutionSolver 
     871        from mystic.solvers import DifferentialEvolutionSolver 
    872872        from mystic.termination import VTR 
    873873        tol = 1e-7 
    … …  
    879879 
    880880    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    881         from mystic.differential_evolution import DifferentialEvolutionSolver 
     881        from mystic.solvers import DifferentialEvolutionSolver 
    882882        from mystic.termination import ChangeOverGeneration as COG 
    883883        tol = 1e-7 
    … …  
    889889 
    890890    def test_DifferentialEvolutionSolver_NCOG(self): 
    891         from mystic.differential_evolution import DifferentialEvolutionSolver 
     891        from mystic.solvers import DifferentialEvolutionSolver 
    892892        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    893893        tol = 1e-7 
    … …  
    899899 
    900900    def test_DifferentialEvolutionSolver_CRT(self): 
    901         from mystic.differential_evolution import DifferentialEvolutionSolver 
     901        from mystic.solvers import DifferentialEvolutionSolver 
    902902        from mystic.termination import CandidateRelativeTolerance as CRT 
    903903        tol = 1e-7 
    … …  
    911911 
    912912    def test_DifferentialEvolutionSolver2_VTR(self): 
    913         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     913        from mystic.solvers import DifferentialEvolutionSolver2 
    914914        from mystic.termination import VTR 
    915915        tol = 1e-7 
    … …  
    921921 
    922922    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    923         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     923        from mystic.solvers import DifferentialEvolutionSolver2 
    924924        from mystic.termination import ChangeOverGeneration as COG 
    925925        tol = 1e-7 
    … …  
    931931 
    932932    def test_DifferentialEvolutionSolver2_NCOG(self): 
    933         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     933        from mystic.solvers import DifferentialEvolutionSolver2 
    934934        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    935935        tol = 1e-7 
    … …  
    941941 
    942942    def test_DifferentialEvolutionSolver2_CRT(self): 
    943         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     943        from mystic.solvers import DifferentialEvolutionSolver2 
    944944        from mystic.termination import CandidateRelativeTolerance as CRT 
    945945        tol = 1e-7 
    … …  
    953953 
    954954    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    955         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     955        from mystic.solvers import NelderMeadSimplexSolver 
    956956        from mystic.termination import CandidateRelativeTolerance as CRT 
    957957        tol = 1e-7 
    … …  
    961961 
    962962    def test_NelderMeadSimplexSolver_VTR(self):  
    963         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     963        from mystic.solvers import NelderMeadSimplexSolver 
    964964        from mystic.termination import VTR 
    965965        tol = 1e-7 
    … …  
    969969 
    970970    def test_NelderMeadSimplexSolver_COG(self):  
    971         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     971        from mystic.solvers import NelderMeadSimplexSolver 
    972972        from mystic.termination import ChangeOverGeneration as COG 
    973973        tol = 1e-7 
    … …  
    977977 
    978978    def test_NelderMeadSimplexSolver_NCOG(self):  
    979         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     979        from mystic.solvers import NelderMeadSimplexSolver 
    980980        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    981981        tol = 1e-7 
    … …  
    987987 
    988988    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    989         from mystic.scipy_optimize import PowellDirectionalSolver 
     989        from mystic.solvers import PowellDirectionalSolver 
    990990        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    991991        tol = 1e-7 
    … …  
    995995 
    996996    def test_PowellDirectionalSolver_COG(self):  
    997         from mystic.scipy_optimize import PowellDirectionalSolver 
     997        from mystic.solvers import PowellDirectionalSolver 
    998998        from mystic.termination import ChangeOverGeneration as COG 
    999999        tol = 1e-7 
    … …  
    10031003 
    10041004    def test_PowellDirectionalSolver_VTR(self):  
    1005         from mystic.scipy_optimize import PowellDirectionalSolver 
     1005        from mystic.solvers import PowellDirectionalSolver 
    10061006        from mystic.termination import VTR 
    10071007        tol = 1e-7 
    … …  
    10111011 
    10121012    def test_PowellDirectionalSolver_CRT(self):  
    1013         from mystic.scipy_optimize import PowellDirectionalSolver 
     1013        from mystic.solvers import PowellDirectionalSolver 
    10141014        from mystic.termination import CandidateRelativeTolerance as CRT 
    10151015        tol = 1e-7 
    … …  
    10361036 
    10371037    def _run_solver(self, iter_limit = False, **kwds): 
    1038         from mystic import Sow 
     1038        from mystic.tools import Sow 
    10391039        import numpy 
    10401040        from mystic.tools import random_seed 
    … …  
    10691069 
    10701070    def test_DifferentialEvolutionSolver_VTR(self):  
    1071         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1071        from mystic.solvers import DifferentialEvolutionSolver 
    10721072        from mystic.termination import VTR 
    10731073        tol = 1e-7 
    … …  
    10791079 
    10801080    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    1081         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1081        from mystic.solvers import DifferentialEvolutionSolver 
    10821082        from mystic.termination import ChangeOverGeneration as COG 
    10831083        tol = 1e-7 
    … …  
    10891089 
    10901090    def test_DifferentialEvolutionSolver_NCOG(self): 
    1091         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1091        from mystic.solvers import DifferentialEvolutionSolver 
    10921092        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    10931093        tol = 1e-7 
    … …  
    10991099 
    11001100    def test_DifferentialEvolutionSolver_CRT(self): 
    1101         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1101        from mystic.solvers import DifferentialEvolutionSolver 
    11021102        from mystic.termination import CandidateRelativeTolerance as CRT 
    11031103        tol = 1e-7 
    … …  
    11111111 
    11121112    def test_DifferentialEvolutionSolver2_VTR(self): 
    1113         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1113        from mystic.solvers import DifferentialEvolutionSolver2 
    11141114        from mystic.termination import VTR 
    11151115        tol = 1e-7 
    … …  
    11211121 
    11221122    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    1123         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1123        from mystic.solvers import DifferentialEvolutionSolver2 
    11241124        from mystic.termination import ChangeOverGeneration as COG 
    11251125        tol = 1e-7 
    … …  
    11311131 
    11321132    def test_DifferentialEvolutionSolver2_NCOG(self): 
    1133         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1133        from mystic.solvers import DifferentialEvolutionSolver2 
    11341134        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    11351135        tol = 1e-7 
    … …  
    11411141 
    11421142    def test_DifferentialEvolutionSolver2_CRT(self): 
    1143         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1143        from mystic.solvers import DifferentialEvolutionSolver2 
    11441144        from mystic.termination import CandidateRelativeTolerance as CRT 
    11451145        tol = 1e-7 
    … …  
    11531153 
    11541154    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    1155         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1155        from mystic.solvers import NelderMeadSimplexSolver 
    11561156        from mystic.termination import CandidateRelativeTolerance as CRT 
    11571157        tol = 1e-7 
    … …  
    11611161 
    11621162    def test_NelderMeadSimplexSolver_VTR(self):  
    1163         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1163        from mystic.solvers import NelderMeadSimplexSolver 
    11641164        from mystic.termination import VTR 
    11651165        tol = 1e-7 
    … …  
    11691169 
    11701170    def test_NelderMeadSimplexSolver_COG(self):  
    1171         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1171        from mystic.solvers import NelderMeadSimplexSolver 
    11721172        from mystic.termination import ChangeOverGeneration as COG 
    11731173        tol = 1e-7 
    … …  
    11771177 
    11781178    def test_NelderMeadSimplexSolver_NCOG(self):  
    1179         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1179        from mystic.solvers import NelderMeadSimplexSolver 
    11801180        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    11811181        tol = 1e-7 
    … …  
    11871187 
    11881188    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    1189         from mystic.scipy_optimize import PowellDirectionalSolver 
     1189        from mystic.solvers import PowellDirectionalSolver 
    11901190        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    11911191        tol = 1e-7 
    … …  
    11951195 
    11961196    def test_PowellDirectionalSolver_COG(self):  
    1197         from mystic.scipy_optimize import PowellDirectionalSolver 
     1197        from mystic.solvers import PowellDirectionalSolver 
    11981198        from mystic.termination import ChangeOverGeneration as COG 
    11991199        tol = 1e-7 
    … …  
    12031203 
    12041204    def test_PowellDirectionalSolver_VTR(self):  
    1205         from mystic.scipy_optimize import PowellDirectionalSolver 
     1205        from mystic.solvers import PowellDirectionalSolver 
    12061206        from mystic.termination import VTR 
    12071207        tol = 1e-7 
    … …  
    12111211 
    12121212    def test_PowellDirectionalSolver_CRT(self):  
    1213         from mystic.scipy_optimize import PowellDirectionalSolver 
     1213        from mystic.solvers import PowellDirectionalSolver 
    12141214        from mystic.termination import CandidateRelativeTolerance as CRT 
    12151215        tol = 1e-7 
    … …  
    12361236 
    12371237    def _run_solver(self, iter_limit=False, **kwds): 
    1238         from mystic import Sow 
     1238        from mystic.tools import Sow 
    12391239        import numpy 
    12401240        from mystic.tools import random_seed 
    … …  
    12691269 
    12701270    def test_DifferentialEvolutionSolver_VTR(self):  
    1271         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1271        from mystic.solvers import DifferentialEvolutionSolver 
    12721272        from mystic.termination import VTR 
    12731273        tol = 1e-7 
    … …  
    12791279 
    12801280    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    1281         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1281        from mystic.solvers import DifferentialEvolutionSolver 
    12821282        from mystic.termination import ChangeOverGeneration as COG 
    12831283        tol = 1e-7 
    … …  
    12891289 
    12901290    def test_DifferentialEvolutionSolver_NCOG(self): 
    1291         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1291        from mystic.solvers import DifferentialEvolutionSolver 
    12921292        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    12931293        tol = 1e-7 
    … …  
    12991299 
    13001300    def test_DifferentialEvolutionSolver_CRT(self): 
    1301         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1301        from mystic.solvers import DifferentialEvolutionSolver 
    13021302        from mystic.termination import CandidateRelativeTolerance as CRT 
    13031303        tol = 1e-7 
    … …  
    13111311 
    13121312    def test_DifferentialEvolutionSolver2_VTR(self):  
    1313         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1313        from mystic.solvers import DifferentialEvolutionSolver2 
    13141314        from mystic.termination import VTR 
    13151315        tol = 1e-7 
    … …  
    13211321 
    13221322    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    1323         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1323        from mystic.solvers import DifferentialEvolutionSolver2 
    13241324        from mystic.termination import ChangeOverGeneration as COG 
    13251325        tol = 1e-7 
    … …  
    13311331 
    13321332    def test_DifferentialEvolutionSolver2_NCOG(self): 
    1333         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1333        from mystic.solvers import DifferentialEvolutionSolver2 
    13341334        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    13351335        tol = 1e-7 
    … …  
    13411341 
    13421342    def test_DifferentialEvolutionSolver2_CRT(self): 
    1343         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1343        from mystic.solvers import DifferentialEvolutionSolver2 
    13441344        from mystic.termination import CandidateRelativeTolerance as CRT 
    13451345        tol = 1e-7 
    … …  
    13531353 
    13541354    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    1355         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1355        from mystic.solvers import NelderMeadSimplexSolver 
    13561356        from mystic.termination import CandidateRelativeTolerance as CRT 
    13571357        tol = 1e-7 
    … …  
    13611361 
    13621362    def test_NelderMeadSimplexSolver_VTR(self):  
    1363         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1363        from mystic.solvers import NelderMeadSimplexSolver 
    13641364        from mystic.termination import VTR 
    13651365        tol = 1e-7 
    … …  
    13691369 
    13701370    def test_NelderMeadSimplexSolver_COG(self):  
    1371         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1371        from mystic.solvers import NelderMeadSimplexSolver 
    13721372        from mystic.termination import ChangeOverGeneration as COG 
    13731373        tol = 1e-7 
    … …  
    13771377 
    13781378    def test_NelderMeadSimplexSolver_NCOG(self):  
    1379         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1379        from mystic.solvers import NelderMeadSimplexSolver 
    13801380        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    13811381        tol = 1e-7 
    … …  
    13871387 
    13881388    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    1389         from mystic.scipy_optimize import PowellDirectionalSolver 
     1389        from mystic.solvers import PowellDirectionalSolver 
    13901390        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    13911391        tol = 1e-7 
    … …  
    13951395 
    13961396    def test_PowellDirectionalSolver_COG(self):  
    1397         from mystic.scipy_optimize import PowellDirectionalSolver 
     1397        from mystic.solvers import PowellDirectionalSolver 
    13981398        from mystic.termination import ChangeOverGeneration as COG 
    13991399        tol = 1e-7 
    … …  
    14031403 
    14041404    def test_PowellDirectionalSolver_VTR(self):  
    1405         from mystic.scipy_optimize import PowellDirectionalSolver 
     1405        from mystic.solvers import PowellDirectionalSolver 
    14061406        from mystic.termination import VTR 
    14071407        tol = 1e-7 
    … …  
    14111411 
    14121412    def test_PowellDirectionalSolver_CRT(self):  
    1413         from mystic.scipy_optimize import PowellDirectionalSolver 
     1413        from mystic.solvers import PowellDirectionalSolver 
    14141414        from mystic.termination import CandidateRelativeTolerance as CRT 
    14151415        tol = 1e-7 
    … …  
    14481448 
    14491449    def _run_solver(self, iter_limit=False, **kwds): 
    1450         from mystic import Sow 
     1450        from mystic.tools import Sow 
    14511451        import numpy 
    14521452        from mystic.tools import random_seed 
    … …  
    14801480 
    14811481    def test_DifferentialEvolutionSolver_VTR(self):  
    1482         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1482        from mystic.solvers import DifferentialEvolutionSolver 
    14831483        from mystic.termination import VTR 
    14841484        tol = 1e-7 
    … …  
    14901490 
    14911491    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    1492         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1492        from mystic.solvers import DifferentialEvolutionSolver 
    14931493        from mystic.termination import ChangeOverGeneration as COG 
    14941494        tol = 1e-7 
    … …  
    15001500 
    15011501    def test_DifferentialEvolutionSolver_NCOG(self): 
    1502         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1502        from mystic.solvers import DifferentialEvolutionSolver 
    15031503        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    15041504        tol = 1e-7 
    … …  
    15101510 
    15111511    def test_DifferentialEvolutionSolver_CRT(self): 
    1512         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1512        from mystic.solvers import DifferentialEvolutionSolver 
    15131513        from mystic.termination import CandidateRelativeTolerance as CRT 
    15141514        tol = 1e-7 
    … …  
    15221522 
    15231523    def test_DifferentialEvolutionSolver2_VTR(self):  
    1524         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1524        from mystic.solvers import DifferentialEvolutionSolver2 
    15251525        from mystic.termination import VTR 
    15261526        tol = 1e-7 
    … …  
    15321532 
    15331533    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    1534         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1534        from mystic.solvers import DifferentialEvolutionSolver2 
    15351535        from mystic.termination import ChangeOverGeneration as COG 
    15361536        tol = 1e-7 
    … …  
    15421542 
    15431543    def test_DifferentialEvolutionSolver2_NCOG(self): 
    1544         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1544        from mystic.solvers import DifferentialEvolutionSolver2 
    15451545        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    15461546        tol = 1e-7 
    … …  
    15521552 
    15531553    def test_DifferentialEvolutionSolver2_CRT(self): 
    1554         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1554        from mystic.solvers import DifferentialEvolutionSolver2 
    15551555        from mystic.termination import CandidateRelativeTolerance as CRT 
    15561556        tol = 1e-7 
    … …  
    15641564 
    15651565    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    1566         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1566        from mystic.solvers import NelderMeadSimplexSolver 
    15671567        from mystic.termination import CandidateRelativeTolerance as CRT 
    15681568        tol = 1e-7 
    … …  
    15721572 
    15731573    def test_NelderMeadSimplexSolver_VTR(self):  
    1574         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1574        from mystic.solvers import NelderMeadSimplexSolver 
    15751575        from mystic.termination import VTR 
    15761576        tol = 1e-7 
    … …  
    15801580 
    15811581    def test_NelderMeadSimplexSolver_COG(self):  
    1582         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1582        from mystic.solvers import NelderMeadSimplexSolver 
    15831583        from mystic.termination import ChangeOverGeneration as COG 
    15841584        tol = 1e-7 
    … …  
    15881588 
    15891589    def test_NelderMeadSimplexSolver_NCOG(self):  
    1590         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1590        from mystic.solvers import NelderMeadSimplexSolver 
    15911591        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    15921592        tol = 1e-7 
    … …  
    15981598 
    15991599    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    1600         from mystic.scipy_optimize import PowellDirectionalSolver 
     1600        from mystic.solvers import PowellDirectionalSolver 
    16011601        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    16021602        tol = 1e-7 
    … …  
    16061606 
    16071607    def test_PowellDirectionalSolver_COG(self):  
    1608         from mystic.scipy_optimize import PowellDirectionalSolver 
     1608        from mystic.solvers import PowellDirectionalSolver 
    16091609        from mystic.termination import ChangeOverGeneration as COG 
    16101610        tol = 1e-7 
    … …  
    16141614 
    16151615    def test_PowellDirectionalSolver_VTR(self):  
    1616         from mystic.scipy_optimize import PowellDirectionalSolver 
     1616        from mystic.solvers import PowellDirectionalSolver 
    16171617        from mystic.termination import VTR 
    16181618        tol = 1e-7 
    … …  
    16221622 
    16231623    def test_PowellDirectionalSolver_CRT(self):  
    1624         from mystic.scipy_optimize import PowellDirectionalSolver 
     1624        from mystic.solvers import PowellDirectionalSolver 
    16251625        from mystic.termination import CandidateRelativeTolerance as CRT 
    16261626        tol = 1e-7 
    … …  
    16591659 
    16601660    def _run_solver(self, iter_limit=False, **kwds): 
    1661         from mystic import Sow 
     1661        from mystic.tools import Sow 
    16621662        import numpy 
    16631663        from mystic.tools import random_seed 
    … …  
    16911691 
    16921692    def test_DifferentialEvolutionSolver_VTR(self):  
    1693         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1693        from mystic.solvers import DifferentialEvolutionSolver 
    16941694        from mystic.termination import VTR 
    16951695        tol = 1e-7 
    … …  
    17011701 
    17021702    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    1703         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1703        from mystic.solvers import DifferentialEvolutionSolver 
    17041704        from mystic.termination import ChangeOverGeneration as COG 
    17051705        tol = 1e-7 
    … …  
    17111711 
    17121712    def test_DifferentialEvolutionSolver_NCOG(self): 
    1713         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1713        from mystic.solvers import DifferentialEvolutionSolver 
    17141714        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    17151715        tol = 1e-7 
    … …  
    17211721 
    17221722    def test_DifferentialEvolutionSolver_CRT(self): 
    1723         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1723        from mystic.solvers import DifferentialEvolutionSolver 
    17241724        from mystic.termination import CandidateRelativeTolerance as CRT 
    17251725        tol = 1e-7 
    … …  
    17331733 
    17341734    def test_DifferentialEvolutionSolver2_VTR(self): 
    1735         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1735        from mystic.solvers import DifferentialEvolutionSolver2 
    17361736        from mystic.termination import VTR 
    17371737        tol = 1e-7 
    … …  
    17431743 
    17441744    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    1745         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1745        from mystic.solvers import DifferentialEvolutionSolver2 
    17461746        from mystic.termination import ChangeOverGeneration as COG 
    17471747        tol = 1e-7 
    … …  
    17531753 
    17541754    def test_DifferentialEvolutionSolver2_NCOG(self): 
    1755         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1755        from mystic.solvers import DifferentialEvolutionSolver2 
    17561756        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    17571757        tol = 1e-7 
    … …  
    17631763 
    17641764    def test_DifferentialEvolutionSolver2_CRT(self): 
    1765         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1765        from mystic.solvers import DifferentialEvolutionSolver2 
    17661766        from mystic.termination import CandidateRelativeTolerance as CRT 
    17671767        tol = 1e-7 
    … …  
    17751775 
    17761776    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    1777         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1777        from mystic.solvers import NelderMeadSimplexSolver 
    17781778        from mystic.termination import CandidateRelativeTolerance as CRT 
    17791779        tol = 1e-7 
    … …  
    17831783 
    17841784    def test_NelderMeadSimplexSolver_VTR(self):  
    1785         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1785        from mystic.solvers import NelderMeadSimplexSolver 
    17861786        from mystic.termination import VTR 
    17871787        tol = 1e-7 
    … …  
    17911791 
    17921792    def test_NelderMeadSimplexSolver_COG(self):  
    1793         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1793        from mystic.solvers import NelderMeadSimplexSolver 
    17941794        from mystic.termination import ChangeOverGeneration as COG 
    17951795        tol = 1e-7 
    … …  
    17991799 
    18001800    def test_NelderMeadSimplexSolver_NCOG(self):  
    1801         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1801        from mystic.solvers import NelderMeadSimplexSolver 
    18021802        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    18031803        tol = 1e-7 
    … …  
    18091809 
    18101810    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    1811         from mystic.scipy_optimize import PowellDirectionalSolver 
     1811        from mystic.solvers import PowellDirectionalSolver 
    18121812        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    18131813        tol = 1e-7 
    … …  
    18171817 
    18181818    def test_PowellDirectionalSolver_COG(self):  
    1819         from mystic.scipy_optimize import PowellDirectionalSolver 
     1819        from mystic.solvers import PowellDirectionalSolver 
    18201820        from mystic.termination import ChangeOverGeneration as COG 
    18211821        tol = 1e-7 
    … …  
    18251825 
    18261826    def test_PowellDirectionalSolver_VTR(self):  
    1827         from mystic.scipy_optimize import PowellDirectionalSolver 
     1827        from mystic.solvers import PowellDirectionalSolver 
    18281828        from mystic.termination import VTR 
    18291829        tol = 1e-7 
    … …  
    18331833 
    18341834    def test_PowellDirectionalSolver_CRT(self):  
    1835         from mystic.scipy_optimize import PowellDirectionalSolver 
     1835        from mystic.solvers import PowellDirectionalSolver 
    18361836        from mystic.termination import CandidateRelativeTolerance as CRT 
    18371837        tol = 1e-7 
    … …  
    18671867 
    18681868    def _run_solver(self, iter_limit=False, **kwds): 
    1869         from mystic import Sow 
     1869        from mystic.tools import Sow 
    18701870        import numpy 
    18711871        from mystic.tools import random_seed 
    … …  
    18991899 
    19001900    def test_DifferentialEvolutionSolver_VTR(self):  
    1901         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1901        from mystic.solvers import DifferentialEvolutionSolver 
    19021902        from mystic.termination import VTR 
    19031903        tol = 1e-7 
    … …  
    19091909 
    19101910    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    1911         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1911        from mystic.solvers import DifferentialEvolutionSolver 
    19121912        from mystic.termination import ChangeOverGeneration as COG 
    19131913        tol = 1e-7 
    … …  
    19191919 
    19201920    def test_DifferentialEvolutionSolver_NCOG(self): 
    1921         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1921        from mystic.solvers import DifferentialEvolutionSolver 
    19221922        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    19231923        tol = 1e-7 
    … …  
    19291929 
    19301930    def test_DifferentialEvolutionSolver_CRT(self): 
    1931         from mystic.differential_evolution import DifferentialEvolutionSolver 
     1931        from mystic.solvers import DifferentialEvolutionSolver 
    19321932        from mystic.termination import CandidateRelativeTolerance as CRT 
    19331933        tol = 1e-7 
    … …  
    19411941 
    19421942    def test_DifferentialEvolutionSolver2_VTR(self):  
    1943         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1943        from mystic.solvers import DifferentialEvolutionSolver2 
    19441944        from mystic.termination import VTR 
    19451945        tol = 1e-7 
    … …  
    19511951 
    19521952    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    1953         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1953        from mystic.solvers import DifferentialEvolutionSolver2 
    19541954        from mystic.termination import ChangeOverGeneration as COG 
    19551955        tol = 1e-7 
    … …  
    19611961 
    19621962    def test_DifferentialEvolutionSolver2_NCOG(self): 
    1963         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1963        from mystic.solvers import DifferentialEvolutionSolver2 
    19641964        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    19651965        tol = 1e-7 
    … …  
    19711971 
    19721972    def test_DifferentialEvolutionSolver2_CRT(self): 
    1973         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     1973        from mystic.solvers import DifferentialEvolutionSolver2 
    19741974        from mystic.termination import CandidateRelativeTolerance as CRT 
    19751975        tol = 1e-7 
    … …  
    19831983 
    19841984    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    1985         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1985        from mystic.solvers import NelderMeadSimplexSolver 
    19861986        from mystic.termination import CandidateRelativeTolerance as CRT 
    19871987        tol = 1e-7 
    … …  
    19911991 
    19921992    def test_NelderMeadSimplexSolver_VTR(self):  
    1993         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     1993        from mystic.solvers import NelderMeadSimplexSolver 
    19941994        from mystic.termination import VTR 
    19951995        tol = 1e-7 
    … …  
    19991999 
    20002000    def test_NelderMeadSimplexSolver_COG(self):  
    2001         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2001        from mystic.solvers import NelderMeadSimplexSolver 
    20022002        from mystic.termination import ChangeOverGeneration as COG 
    20032003        tol = 1e-7 
    … …  
    20072007 
    20082008    def test_NelderMeadSimplexSolver_NCOG(self):  
    2009         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2009        from mystic.solvers import NelderMeadSimplexSolver 
    20102010        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    20112011        tol = 1e-7 
    … …  
    20172017 
    20182018    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    2019         from mystic.scipy_optimize import PowellDirectionalSolver 
     2019        from mystic.solvers import PowellDirectionalSolver 
    20202020        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    20212021        tol = 1e-7 
    … …  
    20252025 
    20262026    def test_PowellDirectionalSolver_COG(self):  
    2027         from mystic.scipy_optimize import PowellDirectionalSolver 
     2027        from mystic.solvers import PowellDirectionalSolver 
    20282028        from mystic.termination import ChangeOverGeneration as COG 
    20292029        tol = 1e-7 
    … …  
    20332033 
    20342034    def test_PowellDirectionalSolver_VTR(self):  
    2035         from mystic.scipy_optimize import PowellDirectionalSolver 
     2035        from mystic.solvers import PowellDirectionalSolver 
    20362036        from mystic.termination import VTR 
    20372037        tol = 1e-7 
    … …  
    20412041 
    20422042    def test_PowellDirectionalSolver_CRT(self):  
    2043         from mystic.scipy_optimize import PowellDirectionalSolver 
     2043        from mystic.solvers import PowellDirectionalSolver 
    20442044        from mystic.termination import CandidateRelativeTolerance as CRT 
    20452045        tol = 1e-7 
    … …  
    20732073 
    20742074    def _run_solver(self, iter_limit=False, **kwds): 
    2075         from mystic import Sow 
     2075        from mystic.tools import Sow 
    20762076        import numpy 
    20772077        from mystic.tools import random_seed 
    … …  
    21052105 
    21062106    def test_DifferentialEvolutionSolver_VTR(self):  
    2107         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2107        from mystic.solvers import DifferentialEvolutionSolver 
    21082108        from mystic.termination import VTR 
    21092109        tol = 1e-7 
    … …  
    21152115 
    21162116    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    2117         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2117        from mystic.solvers import DifferentialEvolutionSolver 
    21182118        from mystic.termination import ChangeOverGeneration as COG 
    21192119        tol = 1e-7 
    … …  
    21252125 
    21262126    def test_DifferentialEvolutionSolver_NCOG(self): 
    2127         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2127        from mystic.solvers import DifferentialEvolutionSolver 
    21282128        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    21292129        tol = 1e-7 
    … …  
    21352135 
    21362136    def test_DifferentialEvolutionSolver_CRT(self): 
    2137         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2137        from mystic.solvers import DifferentialEvolutionSolver 
    21382138        from mystic.termination import CandidateRelativeTolerance as CRT 
    21392139        tol = 1e-7 
    … …  
    21472147 
    21482148    def test_DifferentialEvolutionSolver2_VTR(self): 
    2149         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2149        from mystic.solvers import DifferentialEvolutionSolver2 
    21502150        from mystic.termination import VTR 
    21512151        tol = 1e-7 
    … …  
    21572157 
    21582158    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    2159         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2159        from mystic.solvers import DifferentialEvolutionSolver2 
    21602160        from mystic.termination import ChangeOverGeneration as COG 
    21612161        tol = 1e-7 
    … …  
    21672167 
    21682168    def test_DifferentialEvolutionSolver2_NCOG(self): 
    2169         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2169        from mystic.solvers import DifferentialEvolutionSolver2 
    21702170        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    21712171        tol = 1e-7 
    … …  
    21772177 
    21782178    def test_DifferentialEvolutionSolver2_CRT(self): 
    2179         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2179        from mystic.solvers import DifferentialEvolutionSolver2 
    21802180        from mystic.termination import CandidateRelativeTolerance as CRT 
    21812181        tol = 1e-7 
    … …  
    21892189 
    21902190    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    2191         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2191        from mystic.solvers import NelderMeadSimplexSolver 
    21922192        from mystic.termination import CandidateRelativeTolerance as CRT 
    21932193        tol = 1e-7 
    … …  
    21972197 
    21982198    def test_NelderMeadSimplexSolver_VTR(self):  
    2199         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2199        from mystic.solvers import NelderMeadSimplexSolver 
    22002200        from mystic.termination import VTR 
    22012201        tol = 1e-7 
    … …  
    22052205 
    22062206    def test_NelderMeadSimplexSolver_COG(self):  
    2207         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2207        from mystic.solvers import NelderMeadSimplexSolver 
    22082208        from mystic.termination import ChangeOverGeneration as COG 
    22092209        tol = 1e-7 
    … …  
    22132213 
    22142214    def test_NelderMeadSimplexSolver_NCOG(self):  
    2215         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2215        from mystic.solvers import NelderMeadSimplexSolver 
    22162216        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    22172217        tol = 1e-7 
    … …  
    22232223 
    22242224    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    2225         from mystic.scipy_optimize import PowellDirectionalSolver 
     2225        from mystic.solvers import PowellDirectionalSolver 
    22262226        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    22272227        tol = 1e-7 
    … …  
    22312231 
    22322232    def test_PowellDirectionalSolver_COG(self):  
    2233         from mystic.scipy_optimize import PowellDirectionalSolver 
     2233        from mystic.solvers import PowellDirectionalSolver 
    22342234        from mystic.termination import ChangeOverGeneration as COG 
    22352235        tol = 1e-7 
    … …  
    22392239 
    22402240    def test_PowellDirectionalSolver_VTR(self):  
    2241         from mystic.scipy_optimize import PowellDirectionalSolver 
     2241        from mystic.solvers import PowellDirectionalSolver 
    22422242        from mystic.termination import VTR 
    22432243        tol = 1e-7 
    … …  
    22472247 
    22482248    def test_PowellDirectionalSolver_CRT(self):  
    2249         from mystic.scipy_optimize import PowellDirectionalSolver 
     2249        from mystic.solvers import PowellDirectionalSolver 
    22502250        from mystic.termination import CandidateRelativeTolerance as CRT 
    22512251        tol = 1e-7 
    … …  
    22842284 
    22852285    def _run_solver(self, iter_limit=False, **kwds): 
    2286         from mystic import Sow 
     2286        from mystic.tools import Sow 
    22872287        import numpy 
    22882288        from mystic.tools import random_seed 
    … …  
    23162316 
    23172317    def test_DifferentialEvolutionSolver_VTR(self): 
    2318         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2318        from mystic.solvers import DifferentialEvolutionSolver 
    23192319        from mystic.termination import VTR 
    23202320        tol = 1e-7 
    … …  
    23262326 
    23272327    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    2328         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2328        from mystic.solvers import DifferentialEvolutionSolver 
    23292329        from mystic.termination import ChangeOverGeneration as COG 
    23302330        tol = 1e-7 
    … …  
    23362336 
    23372337    def test_DifferentialEvolutionSolver_NCOG(self): 
    2338         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2338        from mystic.solvers import DifferentialEvolutionSolver 
    23392339        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    23402340        tol = 1e-7 
    … …  
    23462346 
    23472347    def test_DifferentialEvolutionSolver_CRT(self): 
    2348         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2348        from mystic.solvers import DifferentialEvolutionSolver 
    23492349        from mystic.termination import CandidateRelativeTolerance as CRT 
    23502350        tol = 1e-7 
    … …  
    23582358 
    23592359    def test_DifferentialEvolutionSolver2_VTR(self): 
    2360         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2360        from mystic.solvers import DifferentialEvolutionSolver2 
    23612361        from mystic.termination import VTR 
    23622362        tol = 1e-7 
    … …  
    23682368 
    23692369    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    2370         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2370        from mystic.solvers import DifferentialEvolutionSolver2 
    23712371        from mystic.termination import ChangeOverGeneration as COG 
    23722372        tol = 1e-7 
    … …  
    23782378 
    23792379    def test_DifferentialEvolutionSolver2_NCOG(self): 
    2380         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2380        from mystic.solvers import DifferentialEvolutionSolver2 
    23812381        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    23822382        tol = 1e-7 
    … …  
    23882388 
    23892389    def test_DifferentialEvolutionSolver2_CRT(self): 
    2390         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2390        from mystic.solvers import DifferentialEvolutionSolver2 
    23912391        from mystic.termination import CandidateRelativeTolerance as CRT 
    23922392        tol = 1e-7 
    … …  
    24002400 
    24012401    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    2402         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2402        from mystic.solvers import NelderMeadSimplexSolver 
    24032403        from mystic.termination import CandidateRelativeTolerance as CRT 
    24042404        tol = 1e-7 
    … …  
    24082408 
    24092409    def test_NelderMeadSimplexSolver_VTR(self):  
    2410         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2410        from mystic.solvers import NelderMeadSimplexSolver 
    24112411        from mystic.termination import VTR 
    24122412        tol = 1e-7 
    … …  
    24162416 
    24172417    def test_NelderMeadSimplexSolver_COG(self):  
    2418         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2418        from mystic.solvers import NelderMeadSimplexSolver 
    24192419        from mystic.termination import ChangeOverGeneration as COG 
    24202420        tol = 1e-7 
    … …  
    24242424 
    24252425    def test_NelderMeadSimplexSolver_NCOG(self):  
    2426         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2426        from mystic.solvers import NelderMeadSimplexSolver 
    24272427        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    24282428        tol = 1e-7 
    … …  
    24342434 
    24352435    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    2436         from mystic.scipy_optimize import PowellDirectionalSolver 
     2436        from mystic.solvers import PowellDirectionalSolver 
    24372437        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    24382438        tol = 1e-7 
    … …  
    24422442 
    24432443    def test_PowellDirectionalSolver_COG(self):  
    2444         from mystic.scipy_optimize import PowellDirectionalSolver 
     2444        from mystic.solvers import PowellDirectionalSolver 
    24452445        from mystic.termination import ChangeOverGeneration as COG 
    24462446        tol = 1e-7 
    … …  
    24502450 
    24512451    def test_PowellDirectionalSolver_VTR(self):  
    2452         from mystic.scipy_optimize import PowellDirectionalSolver 
     2452        from mystic.solvers import PowellDirectionalSolver 
    24532453        from mystic.termination import VTR 
    24542454        tol = 1e-7 
    … …  
    24582458 
    24592459    def test_PowellDirectionalSolver_CRT(self):  
    2460         from mystic.scipy_optimize import PowellDirectionalSolver 
     2460        from mystic.solvers import PowellDirectionalSolver 
    24612461        from mystic.termination import CandidateRelativeTolerance as CRT 
    24622462        tol = 1e-7 
    … …  
    24902490 
    24912491    def _run_solver(self, iter_limit=False, **kwds): 
    2492         from mystic import Sow 
     2492        from mystic.tools import Sow 
    24932493        import numpy 
    24942494        from mystic.tools import random_seed 
    … …  
    25222522 
    25232523    def test_DifferentialEvolutionSolver_VTR(self): 
    2524         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2524        from mystic.solvers import DifferentialEvolutionSolver 
    25252525        from mystic.termination import VTR 
    25262526        tol = 1e-7 
    … …  
    25322532 
    25332533    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    2534         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2534        from mystic.solvers import DifferentialEvolutionSolver 
    25352535        from mystic.termination import ChangeOverGeneration as COG 
    25362536        tol = 1e-7 
    … …  
    25422542 
    25432543    def test_DifferentialEvolutionSolver_NCOG(self): 
    2544         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2544        from mystic.solvers import DifferentialEvolutionSolver 
    25452545        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    25462546        tol = 1e-7 
    … …  
    25522552 
    25532553    def test_DifferentialEvolutionSolver_CRT(self): 
    2554         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2554        from mystic.solvers import DifferentialEvolutionSolver 
    25552555        from mystic.termination import CandidateRelativeTolerance as CRT 
    25562556        tol = 1e-7 
    … …  
    25642564 
    25652565    def test_DifferentialEvolutionSolver2_VTR(self): 
    2566         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2566        from mystic.solvers import DifferentialEvolutionSolver2 
    25672567        from mystic.termination import VTR 
    25682568        tol = 1e-7 
    … …  
    25742574 
    25752575    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    2576         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2576        from mystic.solvers import DifferentialEvolutionSolver2 
    25772577        from mystic.termination import ChangeOverGeneration as COG 
    25782578        tol = 1e-7 
    … …  
    25842584 
    25852585    def test_DifferentialEvolutionSolver2_NCOG(self): 
    2586         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2586        from mystic.solvers import DifferentialEvolutionSolver2 
    25872587        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    25882588        tol = 1e-7 
    … …  
    25942594 
    25952595    def test_DifferentialEvolutionSolver2_CRT(self): 
    2596         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2596        from mystic.solvers import DifferentialEvolutionSolver2 
    25972597        from mystic.termination import CandidateRelativeTolerance as CRT 
    25982598        tol = 1e-7 
    … …  
    26062606 
    26072607    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    2608         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2608        from mystic.solvers import NelderMeadSimplexSolver 
    26092609        from mystic.termination import CandidateRelativeTolerance as CRT 
    26102610        tol = 1e-7 
    … …  
    26142614 
    26152615    def test_NelderMeadSimplexSolver_VTR(self):  
    2616         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2616        from mystic.solvers import NelderMeadSimplexSolver 
    26172617        from mystic.termination import VTR 
    26182618        tol = 1e-7 
    … …  
    26222622 
    26232623    def test_NelderMeadSimplexSolver_COG(self):  
    2624         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2624        from mystic.solvers import NelderMeadSimplexSolver 
    26252625        from mystic.termination import ChangeOverGeneration as COG 
    26262626        tol = 1e-7 
    … …  
    26302630 
    26312631    def test_NelderMeadSimplexSolver_NCOG(self):  
    2632         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2632        from mystic.solvers import NelderMeadSimplexSolver 
    26332633        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    26342634        tol = 1e-7 
    … …  
    26402640 
    26412641    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    2642         from mystic.scipy_optimize import PowellDirectionalSolver 
     2642        from mystic.solvers import PowellDirectionalSolver 
    26432643        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    26442644        tol = 1e-7 
    … …  
    26482648 
    26492649    def test_PowellDirectionalSolver_COG(self):  
    2650         from mystic.scipy_optimize import PowellDirectionalSolver 
     2650        from mystic.solvers import PowellDirectionalSolver 
    26512651        from mystic.termination import ChangeOverGeneration as COG 
    26522652        tol = 1e-7 
    … …  
    26562656 
    26572657    def test_PowellDirectionalSolver_VTR(self):  
    2658         from mystic.scipy_optimize import PowellDirectionalSolver 
     2658        from mystic.solvers import PowellDirectionalSolver 
    26592659        from mystic.termination import VTR 
    26602660        tol = 1e-7 
    … …  
    26642664 
    26652665    def test_PowellDirectionalSolver_CRT(self):  
    2666         from mystic.scipy_optimize import PowellDirectionalSolver 
     2666        from mystic.solvers import PowellDirectionalSolver 
    26672667        from mystic.termination import CandidateRelativeTolerance as CRT 
    26682668        tol = 1e-7 
    … …  
    26952695 
    26962696    def _run_solver(self, iter_limit=False, **kwds): 
    2697         from mystic import Sow 
     2697        from mystic.tools import Sow 
    26982698        import numpy 
    26992699        from mystic.tools import random_seed 
    … …  
    27272727 
    27282728    def test_DifferentialEvolutionSolver_VTR(self): 
    2729         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2729        from mystic.solvers import DifferentialEvolutionSolver 
    27302730        from mystic.termination import VTR 
    27312731        tol = 1e-7 
    … …  
    27372737 
    27382738    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    2739         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2739        from mystic.solvers import DifferentialEvolutionSolver 
    27402740        from mystic.termination import ChangeOverGeneration as COG 
    27412741        tol = 1e-7 
    … …  
    27472747 
    27482748    def test_DifferentialEvolutionSolver_NCOG(self): 
    2749         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2749        from mystic.solvers import DifferentialEvolutionSolver 
    27502750        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    27512751        tol = 1e-7 
    … …  
    27572757 
    27582758    def test_DifferentialEvolutionSolver_CRT(self): 
    2759         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2759        from mystic.solvers import DifferentialEvolutionSolver 
    27602760        from mystic.termination import CandidateRelativeTolerance as CRT 
    27612761        tol = 1e-7 
    … …  
    27692769 
    27702770    def test_DifferentialEvolutionSolver2_VTR(self): 
    2771         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2771        from mystic.solvers import DifferentialEvolutionSolver2 
    27722772        from mystic.termination import VTR 
    27732773        tol = 1e-7 
    … …  
    27792779 
    27802780    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    2781         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2781        from mystic.solvers import DifferentialEvolutionSolver2 
    27822782        from mystic.termination import ChangeOverGeneration as COG 
    27832783        tol = 1e-7 
    … …  
    27892789 
    27902790    def test_DifferentialEvolutionSolver2_NCOG(self): 
    2791         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2791        from mystic.solvers import DifferentialEvolutionSolver2 
    27922792        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    27932793        tol = 1e-7 
    … …  
    27992799 
    28002800    def test_DifferentialEvolutionSolver2_CRT(self): 
    2801         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2801        from mystic.solvers import DifferentialEvolutionSolver2 
    28022802        from mystic.termination import CandidateRelativeTolerance as CRT 
    28032803        tol = 1e-7 
    … …  
    28112811 
    28122812    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    2813         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2813        from mystic.solvers import NelderMeadSimplexSolver 
    28142814        from mystic.termination import CandidateRelativeTolerance as CRT 
    28152815        tol = 1e-7 
    … …  
    28192819 
    28202820    def test_NelderMeadSimplexSolver_VTR(self):  
    2821         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2821        from mystic.solvers import NelderMeadSimplexSolver 
    28222822        from mystic.termination import VTR 
    28232823        tol = 1e-7 
    … …  
    28272827 
    28282828    def test_NelderMeadSimplexSolver_COG(self):  
    2829         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2829        from mystic.solvers import NelderMeadSimplexSolver 
    28302830        from mystic.termination import ChangeOverGeneration as COG 
    28312831        tol = 1e-7 
    … …  
    28352835 
    28362836    def test_NelderMeadSimplexSolver_NCOG(self):  
    2837         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     2837        from mystic.solvers import NelderMeadSimplexSolver 
    28382838        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    28392839        tol = 1e-7 
    … …  
    28452845 
    28462846    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    2847         from mystic.scipy_optimize import PowellDirectionalSolver 
     2847        from mystic.solvers import PowellDirectionalSolver 
    28482848        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    28492849        tol = 1e-7 
    … …  
    28532853 
    28542854    def test_PowellDirectionalSolver_COG(self):  
    2855         from mystic.scipy_optimize import PowellDirectionalSolver 
     2855        from mystic.solvers import PowellDirectionalSolver 
    28562856        from mystic.termination import ChangeOverGeneration as COG 
    28572857        tol = 1e-7 
    … …  
    28612861 
    28622862    def test_PowellDirectionalSolver_VTR(self):  
    2863         from mystic.scipy_optimize import PowellDirectionalSolver 
     2863        from mystic.solvers import PowellDirectionalSolver 
    28642864        from mystic.termination import VTR 
    28652865        tol = 1e-7 
    … …  
    28692869 
    28702870    def test_PowellDirectionalSolver_CRT(self):  
    2871         from mystic.scipy_optimize import PowellDirectionalSolver 
     2871        from mystic.solvers import PowellDirectionalSolver 
    28722872        from mystic.termination import CandidateRelativeTolerance as CRT 
    28732873        tol = 1e-7 
    … …  
    29012901 
    29022902    def _run_solver(self, iter_limit=False, **kwds): 
    2903         from mystic import Sow 
     2903        from mystic.tools import Sow 
    29042904        import numpy 
    29052905        from mystic.tools import random_seed 
    … …  
    29342934 
    29352935    def test_DifferentialEvolutionSolver_VTR(self): 
    2936         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2936        from mystic.solvers import DifferentialEvolutionSolver 
    29372937        from mystic.termination import VTR 
    29382938        tol = 1e-7 
    … …  
    29442944 
    29452945    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    2946         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2946        from mystic.solvers import DifferentialEvolutionSolver 
    29472947        from mystic.termination import ChangeOverGeneration as COG 
    29482948        tol = 1e-7 
    … …  
    29542954 
    29552955    def test_DifferentialEvolutionSolver_NCOG(self): 
    2956         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2956        from mystic.solvers import DifferentialEvolutionSolver 
    29572957        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    29582958        tol = 1e-7 
    … …  
    29642964 
    29652965    def test_DifferentialEvolutionSolver_CRT(self): 
    2966         from mystic.differential_evolution import DifferentialEvolutionSolver 
     2966        from mystic.solvers import DifferentialEvolutionSolver 
    29672967        from mystic.termination import CandidateRelativeTolerance as CRT 
    29682968        tol = 1e-7 
    … …  
    29762976 
    29772977    def test_DifferentialEvolutionSolver2_VTR(self): 
    2978         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2978        from mystic.solvers import DifferentialEvolutionSolver2 
    29792979        from mystic.termination import VTR 
    29802980        tol = 1e-7 
    … …  
    29862986 
    29872987    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    2988         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2988        from mystic.solvers import DifferentialEvolutionSolver2 
    29892989        from mystic.termination import ChangeOverGeneration as COG 
    29902990        tol = 1e-7 
    … …  
    29962996 
    29972997    def test_DifferentialEvolutionSolver2_NCOG(self): 
    2998         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     2998        from mystic.solvers import DifferentialEvolutionSolver2 
    29992999        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    30003000        tol = 1e-7 
    … …  
    30063006 
    30073007    def test_DifferentialEvolutionSolver2_CRT(self): 
    3008         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     3008        from mystic.solvers import DifferentialEvolutionSolver2 
    30093009        from mystic.termination import CandidateRelativeTolerance as CRT 
    30103010        tol = 1e-7 
    … …  
    30183018 
    30193019    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    3020         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3020        from mystic.solvers import NelderMeadSimplexSolver 
    30213021        from mystic.termination import CandidateRelativeTolerance as CRT 
    30223022        tol = 1e-7 
    … …  
    30263026 
    30273027    def test_NelderMeadSimplexSolver_VTR(self):  
    3028         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3028        from mystic.solvers import NelderMeadSimplexSolver 
    30293029        from mystic.termination import VTR 
    30303030        tol = 1e-7 
    … …  
    30343034 
    30353035    def test_NelderMeadSimplexSolver_COG(self):  
    3036         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3036        from mystic.solvers import NelderMeadSimplexSolver 
    30373037        from mystic.termination import ChangeOverGeneration as COG 
    30383038        tol = 1e-7 
    … …  
    30423042 
    30433043    def test_NelderMeadSimplexSolver_NCOG(self):  
    3044         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3044        from mystic.solvers import NelderMeadSimplexSolver 
    30453045        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    30463046        tol = 1e-7 
    … …  
    30523052 
    30533053    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    3054         from mystic.scipy_optimize import PowellDirectionalSolver 
     3054        from mystic.solvers import PowellDirectionalSolver 
    30553055        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    30563056        tol = 1e-7 
    … …  
    30603060 
    30613061    def test_PowellDirectionalSolver_COG(self):  
    3062         from mystic.scipy_optimize import PowellDirectionalSolver 
     3062        from mystic.solvers import PowellDirectionalSolver 
    30633063        from mystic.termination import ChangeOverGeneration as COG 
    30643064        tol = 1e-7 
    … …  
    30683068 
    30693069    def test_PowellDirectionalSolver_VTR(self):  
    3070         from mystic.scipy_optimize import PowellDirectionalSolver 
     3070        from mystic.solvers import PowellDirectionalSolver 
    30713071        from mystic.termination import VTR 
    30723072        tol = 1e-7 
    … …  
    30763076 
    30773077    def test_PowellDirectionalSolver_CRT(self):  
    3078         from mystic.scipy_optimize import PowellDirectionalSolver 
     3078        from mystic.solvers import PowellDirectionalSolver 
    30793079        from mystic.termination import CandidateRelativeTolerance as CRT 
    30803080        tol = 1e-7 
    … …  
    31113111 
    31123112    def _run_solver(self, iter_limit=False, **kwds): 
    3113         from mystic import Sow 
     3113        from mystic.tools import Sow 
    31143114        import numpy 
    31153115        from mystic.tools import random_seed 
    … …  
    31443144 
    31453145    def test_DifferentialEvolutionSolver_VTR(self): 
    3146         from mystic.differential_evolution import DifferentialEvolutionSolver 
     3146        from mystic.solvers import DifferentialEvolutionSolver 
    31473147        from mystic.termination import VTR 
    31483148        tol = 1e-7 
    … …  
    31543154 
    31553155    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    3156         from mystic.differential_evolution import DifferentialEvolutionSolver 
     3156        from mystic.solvers import DifferentialEvolutionSolver 
    31573157        from mystic.termination import ChangeOverGeneration as COG 
    31583158        tol = 1e-7 
    … …  
    31643164 
    31653165    def test_DifferentialEvolutionSolver_NCOG(self): 
    3166         from mystic.differential_evolution import DifferentialEvolutionSolver 
     3166        from mystic.solvers import DifferentialEvolutionSolver 
    31673167        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    31683168        tol = 1e-7 
    … …  
    31743174 
    31753175    def test_DifferentialEvolutionSolver_CRT(self): 
    3176         from mystic.differential_evolution import DifferentialEvolutionSolver 
     3176        from mystic.solvers import DifferentialEvolutionSolver 
    31773177        from mystic.termination import CandidateRelativeTolerance as CRT 
    31783178        tol = 1e-7 
    … …  
    31863186 
    31873187    def test_DifferentialEvolutionSolver2_VTR(self): 
    3188         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     3188        from mystic.solvers import DifferentialEvolutionSolver2 
    31893189        from mystic.termination import VTR 
    31903190        tol = 1e-7 
    … …  
    31963196 
    31973197    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    3198         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     3198        from mystic.solvers import DifferentialEvolutionSolver2 
    31993199        from mystic.termination import ChangeOverGeneration as COG 
    32003200        tol = 1e-7 
    … …  
    32063206 
    32073207    def test_DifferentialEvolutionSolver2_NCOG(self): 
    3208         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     3208        from mystic.solvers import DifferentialEvolutionSolver2 
    32093209        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    32103210        tol = 1e-7 
    … …  
    32163216 
    32173217    def test_DifferentialEvolutionSolver2_CRT(self): 
    3218         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     3218        from mystic.solvers import DifferentialEvolutionSolver2 
    32193219        from mystic.termination import CandidateRelativeTolerance as CRT 
    32203220        tol = 1e-7 
    … …  
    32283228 
    32293229    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    3230         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3230        from mystic.solvers import NelderMeadSimplexSolver 
    32313231        from mystic.termination import CandidateRelativeTolerance as CRT 
    32323232        tol = 1e-7 
    … …  
    32363236 
    32373237    def test_NelderMeadSimplexSolver_VTR(self):  
    3238         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3238        from mystic.solvers import NelderMeadSimplexSolver 
    32393239        from mystic.termination import VTR 
    32403240        tol = 1e-7 
    … …  
    32443244 
    32453245    def test_NelderMeadSimplexSolver_COG(self):  
    3246         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3246        from mystic.solvers import NelderMeadSimplexSolver 
    32473247        from mystic.termination import ChangeOverGeneration as COG 
    32483248        tol = 1e-7 
    … …  
    32523252 
    32533253    def test_NelderMeadSimplexSolver_NCOG(self):  
    3254         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3254        from mystic.solvers import NelderMeadSimplexSolver 
    32553255        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    32563256        tol = 1e-7 
    … …  
    32623262 
    32633263    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    3264         from mystic.scipy_optimize import PowellDirectionalSolver 
     3264        from mystic.solvers import PowellDirectionalSolver 
    32653265        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    32663266        tol = 1e-7 
    … …  
    32703270 
    32713271    def test_PowellDirectionalSolver_COG(self):  
    3272         from mystic.scipy_optimize import PowellDirectionalSolver 
     3272        from mystic.solvers import PowellDirectionalSolver 
    32733273        from mystic.termination import ChangeOverGeneration as COG 
    32743274        tol = 1e-7 
    … …  
    32783278 
    32793279    def test_PowellDirectionalSolver_VTR(self):  
    3280         from mystic.scipy_optimize import PowellDirectionalSolver 
     3280        from mystic.solvers import PowellDirectionalSolver 
    32813281        from mystic.termination import VTR 
    32823282        tol = 1e-7 
    … …  
    32863286 
    32873287    def test_PowellDirectionalSolver_CRT(self):  
    3288         from mystic.scipy_optimize import PowellDirectionalSolver 
     3288        from mystic.solvers import PowellDirectionalSolver 
    32893289        from mystic.termination import CandidateRelativeTolerance as CRT 
    32903290        tol = 1e-7 
    … …  
    33253325 
    33263326    def _run_solver(self, iter_limit=False, **kwds): 
    3327         from mystic import Sow 
     3327        from mystic.tools import Sow 
    33283328        import numpy 
    33293329        from mystic.tools import random_seed 
    … …  
    33593359 
    33603360    def test_DifferentialEvolutionSolver_VTR(self): 
    3361         from mystic.differential_evolution import DifferentialEvolutionSolver 
     3361        from mystic.solvers import DifferentialEvolutionSolver 
    33623362        from mystic.termination import VTR 
    33633363        tol = 1e-7 
    … …  
    33693369 
    33703370    def test_DifferentialEvolutionSolver_COG(self): # Default for this solver 
    3371         from mystic.differential_evolution import DifferentialEvolutionSolver 
     3371        from mystic.solvers import DifferentialEvolutionSolver 
    33723372        from mystic.termination import ChangeOverGeneration as COG 
    33733373        tol = 1e-7 
    … …  
    33793379 
    33803380    def test_DifferentialEvolutionSolver_NCOG(self): 
    3381         from mystic.differential_evolution import DifferentialEvolutionSolver 
     3381        from mystic.solvers import DifferentialEvolutionSolver 
    33823382        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    33833383        tol = 1e-7 
    … …  
    33893389 
    33903390    def test_DifferentialEvolutionSolver_CRT(self): 
    3391         from mystic.differential_evolution import DifferentialEvolutionSolver 
     3391        from mystic.solvers import DifferentialEvolutionSolver 
    33923392        from mystic.termination import CandidateRelativeTolerance as CRT 
    33933393        tol = 1e-7 
    … …  
    34013401 
    34023402    def test_DifferentialEvolutionSolver2_VTR(self): 
    3403         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     3403        from mystic.solvers import DifferentialEvolutionSolver2 
    34043404        from mystic.termination import VTR 
    34053405        tol = 1e-7 
    … …  
    34113411 
    34123412    def test_DifferentialEvolutionSolver2_COG(self): # Default for this solver 
    3413         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     3413        from mystic.solvers import DifferentialEvolutionSolver2 
    34143414        from mystic.termination import ChangeOverGeneration as COG 
    34153415        tol = 1e-7 
    … …  
    34213421 
    34223422    def test_DifferentialEvolutionSolver2_NCOG(self): 
    3423         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     3423        from mystic.solvers import DifferentialEvolutionSolver2 
    34243424        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    34253425        tol = 1e-7 
    … …  
    34313431 
    34323432    def test_DifferentialEvolutionSolver2_CRT(self): 
    3433         from mystic.differential_evolution import DifferentialEvolutionSolver2 
     3433        from mystic.solvers import DifferentialEvolutionSolver2 
    34343434        from mystic.termination import CandidateRelativeTolerance as CRT 
    34353435        tol = 1e-7 
    … …  
    34433443 
    34443444    def test_NelderMeadSimplexSolver_CRT(self): # Default for this solver 
    3445         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3445        from mystic.solvers import NelderMeadSimplexSolver 
    34463446        from mystic.termination import CandidateRelativeTolerance as CRT 
    34473447        tol = 1e-7 
    … …  
    34513451 
    34523452    def test_NelderMeadSimplexSolver_VTR(self):  
    3453         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3453        from mystic.solvers import NelderMeadSimplexSolver 
    34543454        from mystic.termination import VTR 
    34553455        tol = 1e-7 
    … …  
    34593459 
    34603460    def test_NelderMeadSimplexSolver_COG(self):  
    3461         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3461        from mystic.solvers import NelderMeadSimplexSolver 
    34623462        from mystic.termination import ChangeOverGeneration as COG 
    34633463        tol = 1e-7 
    … …  
    34673467 
    34683468    def test_NelderMeadSimplexSolver_NCOG(self):  
    3469         from mystic.scipy_optimize import NelderMeadSimplexSolver 
     3469        from mystic.solvers import NelderMeadSimplexSolver 
    34703470        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    34713471        tol = 1e-7 
    … …  
    34773477 
    34783478    def test_PowellDirectionalSolver_NCOG(self): # Default for this solver 
    3479         from mystic.scipy_optimize import PowellDirectionalSolver 
     3479        from mystic.solvers import PowellDirectionalSolver 
    34803480        from mystic.termination import NormalizedChangeOverGeneration as NCOG 
    34813481        tol = 1e-7 
    … …  
    34853485 
    34863486    def test_PowellDirectionalSolver_COG(self):  
    3487         from mystic.scipy_optimize import PowellDirectionalSolver 
     3487        from mystic.solvers import PowellDirectionalSolver 
    34883488        from mystic.termination import ChangeOverGeneration as COG 
    34893489        tol = 1e-7 
    … …  
    34933493 
    34943494    def test_PowellDirectionalSolver_VTR(self):  
    3495         from mystic.scipy_optimize import PowellDirectionalSolver 
     3495        from mystic.solvers import PowellDirectionalSolver 
    34963496        from mystic.termination import VTR 
    34973497        tol = 1e-7 
    … …  
    35013501 
    35023502    def test_PowellDirectionalSolver_CRT(self):  
    3503         from mystic.scipy_optimize import PowellDirectionalSolver 
     3503        from mystic.solvers import PowellDirectionalSolver 
    35043504        from mystic.termination import CandidateRelativeTolerance as CRT 
    35053505        tol = 1e-7 

  • mystic/tests/test_SOW.py

    r372 r465  
    4747def test2(monitor, diffenv=None): 
    4848  if diffenv == True: 
    49    #from mystic.differential_evolution import DifferentialEvolutionSolver as DE 
    50     from mystic.differential_evolution import DifferentialEvolutionSolver2 as DE 
     49   #from mystic.solvers import DifferentialEvolutionSolver as DE 
     50    from mystic.solvers import DifferentialEvolutionSolver2 as DE 
    5151  elif diffenv == False: 
    52     from mystic.scipy_optimize import NelderMeadSimplexSolver as noDE 
     52    from mystic.solvers import NelderMeadSimplexSolver as noDE 
    5353  else: 
    54     from mystic.scipy_optimize import PowellDirectionalSolver as noDE 
     54    from mystic.solvers import PowellDirectionalSolver as noDE 
    5555  from mystic.termination import ChangeOverGeneration as COG 
    56   from mystic import getch, random_seed 
     56  from mystic.tools import getch, random_seed 
    5757 
    5858  random_seed(123) 
    … …  
    9292if __name__ == '__main__': 
    9393 
    94   from mystic import Sow, VerboseSow, LoggingSow 
     94  from mystic.tools import Sow, VerboseSow, LoggingSow 
    9595 #monitor = Sow() 
    9696 #monitor = Sow(all=True) 

  • mystic/tests/test_constraints_basic.py

    r435 r465  
    2424    npop = 25 
    2525 
    26     from mystic.differential_evolution import DifferentialEvolutionSolver 
    27     from mystic.scipy_optimize import NelderMeadSimplexSolver 
     26    from mystic.solvers import DifferentialEvolutionSolver 
     27    from mystic.solvers import NelderMeadSimplexSolver 
    2828    from mystic.termination import VTR 
    2929    #solver = DifferentialEvolutionSolver(ndim, npop) 
    … …  
    4848    (x1-10.)**2 + (x2+1.)**2 < 50.  
    4949    """ 
    50     from mystic.differential_evolution import DifferentialEvolutionSolver 
    51     from mystic.scipy_optimize import NelderMeadSimplexSolver 
     50    from mystic.solvers import DifferentialEvolutionSolver 
     51    from mystic.solvers import NelderMeadSimplexSolver 
    5252    from mystic.termination import VTR 
    5353    #solver = DifferentialEvolutionSolver(ndim, npop) 

  • mystic/tests/test_termination.py

    r424 r465  
    5050 
    5151def test01(terminate, func=lambda x:x[0], debug=False): 
    52   from mystic.differential_evolution import DifferentialEvolutionSolver2 as DE2 
     52  from mystic.solvers import DifferentialEvolutionSolver2 as DE2 
    5353  solver = DE2(3,5) 
    5454  solver.SetRandomInitialPoints() 
    … …  
    5959 
    6060def test02(terminate, func=lambda x:x[0], debug=False): 
    61   from mystic.differential_evolution import DifferentialEvolutionSolver2 as DE2 
     61  from mystic.solvers import DifferentialEvolutionSolver2 as DE2 
    6262 #solver = DE2(3,1) #Solver throws ValueError "sample larger than population" 
    6363 #solver = DE2(1,1) #Solver throws ValueError "sample larger than population" 
    … …  
    7070 
    7171def test03(terminate, func=lambda x:x[0], debug=False): 
    72   from mystic.differential_evolution import DifferentialEvolutionSolver as DE 
     72  from mystic.solvers import DifferentialEvolutionSolver as DE 
    7373  solver = DE(3,5) 
    7474  solver.SetRandomInitialPoints() 
    … …  
    7979 
    8080def test04(terminate, func=lambda x:x[0], debug=False): 
    81   from mystic.differential_evolution import DifferentialEvolutionSolver as DE 
     81  from mystic.solvers import DifferentialEvolutionSolver as DE 
    8282  solver = DE(1,5) 
    8383  solver.SetRandomInitialPoints() 
    … …  
    8888 
    8989def test05(terminate, func=lambda x:x[0], debug=False): 
    90   from mystic.scipy_optimize import NelderMeadSimplexSolver as NM 
     90  from mystic.solvers import NelderMeadSimplexSolver as NM 
    9191  solver = NM(3) 
    9292  solver.SetRandomInitialPoints() 
    … …  
    9797 
    9898def test06(terminate, func=lambda x:x[0], debug=False): 
    99   from mystic.scipy_optimize import NelderMeadSimplexSolver as NM 
     99  from mystic.solvers import NelderMeadSimplexSolver as NM 
    100100  solver = NM(1) 
    101101  solver.SetRandomInitialPoints() 
    … …  
    106106 
    107107def test07(terminate, func=lambda x:x[0], debug=False): 
    108   from mystic.scipy_optimize import PowellDirectionalSolver as PDS 
     108  from mystic.solvers import PowellDirectionalSolver as PDS 
    109109  solver = PDS(3) 
    110110  solver.SetRandomInitialPoints() 
    … …  
    115115 
    116116def test08(terminate, func=lambda x:x[0], debug=False): 
    117   from mystic.scipy_optimize import PowellDirectionalSolver as PDS 
     117  from mystic.solvers import PowellDirectionalSolver as PDS 
    118118  solver = PDS(1) 
    119119  solver.SetRandomInitialPoints() 

  • mystic/tests/testsolvers_pyre.py

    r335 r465  
    2121from pyre.applications.Script import Script 
    2222from mystic.helputil import paginate 
    23 from mystic.differential_evolution import * 
    24 from mystic.scipy_optimize import * 
     23from mystic.solvers import * 
    2524from mystic.termination import * 
    2625import logging 
Note: See TracChangeset for help on using the changeset viewer.