From e2938f5d21d930eb0319fe83369c5936c41f97d6 Mon Sep 17 00:00:00 2001 From: T Ehrhardt Date: Thu, 29 Aug 2024 12:08:09 +0200 Subject: [PATCH] remove fit and minimiser settings in unused and unparsable .cfg format --- .../fit/example_basinhopping_lbfgsb.cfg | 39 ------------------- ..._niter100_T1e0_stepsize5e-1_interval50.cfg | 9 ----- ..._ftol2e-11_gtol1e-5_eps1e-8_maxiter200.cfg | 13 ------- ..._ftol2e-11_gtol1e-5_eps1e-8_maxiter500.cfg | 13 ------- ...b_ftol2e-5_gtol1e-5_eps1e-4_maxiter200.cfg | 13 ------- ...b_ftol2e-7_gtol1e-5_eps1e-4_maxiter200.cfg | 13 ------- ...b_ftol2e-9_gtol1e-5_eps1e-7_maxiter200.cfg | 13 ------- .../slsqp_ftol1e-6_eps1e-4_maxiter1000.cfg | 11 ------ .../slsqp_ftol2e-11_eps1e-8_maxiter1000.cfg | 11 ------ 9 files changed, 135 deletions(-) delete mode 100644 pisa_examples/resources/settings/fit/example_basinhopping_lbfgsb.cfg delete mode 100644 pisa_examples/resources/settings/minimizer/basinhopping_niter100_T1e0_stepsize5e-1_interval50.cfg delete mode 100644 pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-11_gtol1e-5_eps1e-8_maxiter200.cfg delete mode 100644 pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-11_gtol1e-5_eps1e-8_maxiter500.cfg delete mode 100644 pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-5_gtol1e-5_eps1e-4_maxiter200.cfg delete mode 100644 pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-7_gtol1e-5_eps1e-4_maxiter200.cfg delete mode 100644 pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-9_gtol1e-5_eps1e-7_maxiter200.cfg delete mode 100644 pisa_examples/resources/settings/minimizer/slsqp_ftol1e-6_eps1e-4_maxiter1000.cfg delete mode 100644 pisa_examples/resources/settings/minimizer/slsqp_ftol2e-11_eps1e-8_maxiter1000.cfg diff --git a/pisa_examples/resources/settings/fit/example_basinhopping_lbfgsb.cfg b/pisa_examples/resources/settings/fit/example_basinhopping_lbfgsb.cfg deleted file mode 100644 index e56d342f2..000000000 --- a/pisa_examples/resources/settings/fit/example_basinhopping_lbfgsb.cfg +++ /dev/null @@ -1,39 +0,0 @@ -#------------------------------------------------------------------------------ -# Fit method: scan/minimize/pull or any combination ('+') thereof -#------------------------------------------------------------------------------ - -[fit] -method = minimize - -[fit.params] -# can put comma-separated list of parameter names, or '*' which will serve -# as wildcard for all unspecified parameters -minimize = * - -# should be possible to specify fit settings independent of any -# hypothesis parameter selections -#------------------------------------------------------------------------------ -# Scan: supply specifications for values to probe for each param to scan -# (either range + nvalues (int) or just values) -#------------------------------------------------------------------------------ - -[scan] - -#------------------------------------------------------------------------------ -# Minimization: supply path to cfg for local and/or global minimizer -#------------------------------------------------------------------------------ - -[minimize] -global = settings/minimizer/basinhopping_niter100_T1e0_stepsize5e-1_interval50.cfg -local = settings/minimizer/l-bfgs-b_ftol2e-9_gtol1e-5_eps1e-7_maxiter200.cfg - -#------------------------------------------------------------------------------ -# Pull method: supply specifications for values to probe for each param -# (either range + nvalues (int) or just values) -#------------------------------------------------------------------------------ - -[pull] - - - - diff --git a/pisa_examples/resources/settings/minimizer/basinhopping_niter100_T1e0_stepsize5e-1_interval50.cfg b/pisa_examples/resources/settings/minimizer/basinhopping_niter100_T1e0_stepsize5e-1_interval50.cfg deleted file mode 100644 index 9930f62f2..000000000 --- a/pisa_examples/resources/settings/minimizer/basinhopping_niter100_T1e0_stepsize5e-1_interval50.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[method] -name = basinhopping - -[options] -niter = 100 -T = 1.0 -stepsize = 0.5 -interval = 50 -disp = False diff --git a/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-11_gtol1e-5_eps1e-8_maxiter200.cfg b/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-11_gtol1e-5_eps1e-8_maxiter200.cfg deleted file mode 100644 index 5eeaa3b0c..000000000 --- a/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-11_gtol1e-5_eps1e-8_maxiter200.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[method] -name = L-BFGS-B - -[options] -maxiter = 200 -# print convergence messages -disp = 0 -# iteration stops when (f^k - f^{k+1}) / max{|f^k|, |f^{k+1}|, 1} <= ftol -ftol = 2e-11 -# gradient tolerance: if gradient_i > gtol for all i, exit -gtol = 1e-5 -# step size to use in numerically evaluating gradient -eps = 1e-8 diff --git a/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-11_gtol1e-5_eps1e-8_maxiter500.cfg b/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-11_gtol1e-5_eps1e-8_maxiter500.cfg deleted file mode 100644 index 232850fe4..000000000 --- a/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-11_gtol1e-5_eps1e-8_maxiter500.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[method] -name = L-BFGS-B - -[options] -maxiter = 500 -# print convergence messages -disp = 0 -# iteration stops when (f^k - f^{k+1}) / max{|f^k|, |f^{k+1}|, 1} <= ftol -ftol = 2e-11 -# gradient tolerance: if gradient_i > gtol for all i, exit -gtol = 1e-5 -# step size to use in numerically evaluating gradient -eps = 1e-8 diff --git a/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-5_gtol1e-5_eps1e-4_maxiter200.cfg b/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-5_gtol1e-5_eps1e-4_maxiter200.cfg deleted file mode 100644 index 1b8c1c56b..000000000 --- a/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-5_gtol1e-5_eps1e-4_maxiter200.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[method] -name = L-BFGS-B - -[options] -maxiter = 200 -# print convergence messages -disp = 0 -# iteration stops when (f^k - f^{k+1}) / max{|f^k|, |f^{k+1}|, 1} <= ftol -ftol = 2e-5 -# gradient tolerance: if gradient_i > gtol for all i, exit -gtol = 1e-5 -# step size to use in numerically evaluating gradient -eps = 1e-4 diff --git a/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-7_gtol1e-5_eps1e-4_maxiter200.cfg b/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-7_gtol1e-5_eps1e-4_maxiter200.cfg deleted file mode 100644 index 5f720cdf9..000000000 --- a/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-7_gtol1e-5_eps1e-4_maxiter200.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[method] -name = L-BFGS-B - -[options] -maxiter = 200 -# print convergence messages -disp = 0 -# iteration stops when (f^k - f^{k+1}) / max{|f^k|, |f^{k+1}|, 1} <= ftol -ftol = 2e-7 -# gradient tolerance: if gradient_i > gtol for all i, exit -gtol = 1e-5 -# step size to use in numerically evaluating gradient -eps = 1e-4 diff --git a/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-9_gtol1e-5_eps1e-7_maxiter200.cfg b/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-9_gtol1e-5_eps1e-7_maxiter200.cfg deleted file mode 100644 index 4c6e231ef..000000000 --- a/pisa_examples/resources/settings/minimizer/l-bfgs-b_ftol2e-9_gtol1e-5_eps1e-7_maxiter200.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[method] -name = L-BFGS-B - -[options] -maxiter = 200 -# print convergence messages -disp = 0 -# iteration stops when (f^k - f^{k+1}) / max{|f^k|, |f^{k+1}|, 1} <= ftol -ftol = 2e-9 -# gradient tolerance: if gradient_i > gtol for all i, exit -gtol = 1e-5 -# step size to use in numerically evaluating gradient -eps = 1e-7 diff --git a/pisa_examples/resources/settings/minimizer/slsqp_ftol1e-6_eps1e-4_maxiter1000.cfg b/pisa_examples/resources/settings/minimizer/slsqp_ftol1e-6_eps1e-4_maxiter1000.cfg deleted file mode 100644 index 58ed3f3fe..000000000 --- a/pisa_examples/resources/settings/minimizer/slsqp_ftol1e-6_eps1e-4_maxiter1000.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[method] -name = SLSQP - -[options] -maxiter = 1000 -# print convergence messages -disp = False -# iteration stops when (f^k - f^{k+1}) / max{|f^k|, |f^{k+1}|, 1} <= ftol -ftol = 1e-6 -# step size to use in numerically evaluating gradient -eps = 1e-4 diff --git a/pisa_examples/resources/settings/minimizer/slsqp_ftol2e-11_eps1e-8_maxiter1000.cfg b/pisa_examples/resources/settings/minimizer/slsqp_ftol2e-11_eps1e-8_maxiter1000.cfg deleted file mode 100644 index 54b80fe89..000000000 --- a/pisa_examples/resources/settings/minimizer/slsqp_ftol2e-11_eps1e-8_maxiter1000.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[method] -name = SLSQP - -[options] -maxiter = 1000 -# print convergence messages -disp = False -# iteration stops when (f^k - f^{k+1}) / max{|f^k|, |f^{k+1}|, 1} <= ftol -ftol = 2e-11 -# step size to use in numerically evaluating gradient -eps = 1e-8