From f8d747661445203eec963b79ba7aa5bf182f037a Mon Sep 17 00:00:00 2001 From: Gilles Sadowski Date: Tue, 24 Aug 2021 01:28:43 +0200 Subject: [PATCH] Input files for "SimplexOptimizerTest" (unit tests). --- .../noderiv/std_test_func.simplex.hedar_fukushima.csv | 2 +- .../noderiv/std_test_func.simplex.multidirectional.csv | 6 +++--- .../scalar/noderiv/std_test_func.simplex.nelder_mead.csv | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.hedar_fukushima.csv b/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.hedar_fukushima.csv index 3e6fa4c51..f63414c13 100644 --- a/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.hedar_fukushima.csv +++ b/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.hedar_fukushima.csv @@ -40,7 +40,7 @@ CIG_TAB, 2, 0 0, 3, 4, 1e-3, 280, true TABLET, 2, 0 0, 3, 4, 2e-4, 340, true SUM_POW, 2, 0 0, 3, 4, 1e-2, 190, true ACKLEY, 2, 0 0, 2, 4, 1e-6, 310, true -#RASTRIGIN, 2, 0 0, 0.9, 1.1, 5e-5, 1000, true +RASTRIGIN, 2, 0 0, 6, 10, 5e-5, 600, true GRIEWANK, 2, 0 0, 2, 3, 1e-1, 500, true LEVY, 2, 1 1, 0.9, 1.1, 1e-3, 200, true SCHWEFEL, 2, 420.9687 420.9687, 9, 11, 1, 200, true diff --git a/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.multidirectional.csv b/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.multidirectional.csv index f13c7eb11..01b127f61 100644 --- a/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.multidirectional.csv +++ b/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.multidirectional.csv @@ -31,7 +31,7 @@ # Caveat: Some tests are commented out (cf. JIRA: MATH-1552). # PARABOLA, 8, 0 0 0 0 0 0 0 0, 20, 40, 1e-4, 7200, false -ROSENBROCK, 2, 1 1, 0.9, 1.1, 2e-3, 600, true +ROSENBROCK, 2, 1 1, 0.9, 1.1, 3e-3, 650, true CIGAR, 2, 0 0, 2, 3, 5e-5, 240, false SPHERE, 2, 0 0, 2, 3, 5e-4, 200, false ELLI, 2, 0 0, 3, 4, 1e-4, 350, false @@ -40,12 +40,12 @@ CIG_TAB, 2, 0 0, 3, 4, 1e-3, 280, false TABLET, 2, 0 0, 3, 4, 2e-4, 340, false SUM_POW, 2, 0 0, 3, 4, 1e-2, 190, false ACKLEY, 2, 0 0, 2, 4, 1e-6, 310, false -#RASTRIGIN, 2, 0 0, 0.9, 1.1, 5e-5, 1000, false +RASTRIGIN, 2, 0 0, 6, 10, 1e-3, 650, true GRIEWANK, 2, 0 0, 2, 3, 1e-1, 500, false LEVY, 2, 1 1, 0.9, 1.1, 1e-3, 200, false SCHWEFEL, 2, 420.9687 420.9687, 9, 11, 1, 200, false ZAKHAROV, 2, 0 0, 3, 4, 1e-4, 1000, false -PERM, 2, 1 2, 0.9, 1.1, 2e-3, 540, true +PERM, 2, 1 2, 0.9, 1.1, 2e-3, 640, true STYBLINSKI_TANG, 2, -2.903534 -2.903534, 1, 2, 1e-4, 210, false #HAPPY_CAT, 2, -1 -1, 2, 3, 1e-4, 500, false #SALOMON, 2, 0 0, 2, 3, 1e-4, 500, false diff --git a/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.nelder_mead.csv b/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.nelder_mead.csv index 457ae74f8..0c376cbd4 100644 --- a/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.nelder_mead.csv +++ b/commons-math-legacy/src/test/resources/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/std_test_func.simplex.nelder_mead.csv @@ -38,9 +38,9 @@ ELLI, 2, 0 0, 3, 4, 1e-4, 350, false TWO_AXES, 2, 0 0, 3, 4, 1e-4, 400, false CIG_TAB, 2, 0 0, 3, 4, 1e-3, 280, false TABLET, 2, 0 0, 3, 4, 2e-4, 340, false -SUM_POW, 2, 0 0, 3, 4, 1e-2, 190, true +SUM_POW, 2, 0 0, 3, 4, 1e-2, 190, false ACKLEY, 2, 0 0, 2, 4, 1e-6, 310, false -#RASTRIGIN, 2, 0 0, 0.9, 1.1, 5e-5, 1000, false +RASTRIGIN, 2, 0 0, 6, 10, 5e-5, 105, false GRIEWANK, 2, 0 0, 2, 3, 1e-1, 500, false LEVY, 2, 1 1, 0.9, 1.1, 1e-3, 200, false SCHWEFEL, 2, 420.9687 420.9687, 9, 11, 1, 200, false