Merge pull request #1304 from boostorg/failing_jso_test

Try repair or remove two JSO tests

Author: ckormanyos

include/boost/math/optimization/jso.hpp

@@ -389,7 +389,7 @@ jso(const Func cost_function, jso_parameters<ArgumentContainer> &jso_params,
         throw std::logic_error(oss.str());
       }
       for (size_t i = 0; i < weights.size(); ++i) {
-        weights[i] = delta_f[i] / delta_sum;
+        weights[i] = static_cast<DimensionlessReal>(delta_f[i] / delta_sum);
       }
 
       M_CR[k] = detail::weighted_lehmer_mean(S_CR, weights);

test/Jamfile.v2

@@ -1112,7 +1112,7 @@ test-suite interpolators :
    [ run compile_test/interpolators_catmull_rom_concept_test.cpp compile_test_main   : : : [ requires cxx11_hdr_array cxx11_hdr_initializer_list ] ]
    [ run test_standalone_asserts.cpp ]
    [ run differential_evolution_test.cpp : : : [ requires cxx17_if_constexpr cxx17_std_apply ] ]
-   [ run jso_test.cpp : : : [ requires cxx17_if_constexpr cxx17_std_apply ] ]
+   [ run jso_test.cpp : : : <toolset>clang:<cxxflags>-fno-fast-math <toolset>gcc:<cxxflags>-fno-fast-math <toolset>msvc:<cxxflags>/fp:precise [ requires cxx17_if_constexpr cxx17_std_apply ] ]
    [ run random_search_test.cpp : : : [ requires cxx17_if_constexpr cxx17_std_apply ] ]
    [ run cma_es_test.cpp : : : [ requires cxx17_if_constexpr cxx17_std_apply ] [ check-target-builds ../../multiprecision/config//has_eigen : : <build>no ] ]
    [ compile compile_test/random_search_incl_test.cpp : [ requires cxx17_if_constexpr cxx17_std_apply ] ]

test/jso_test.cpp

@@ -56,14 +56,21 @@ template <class Real> void test_ackley() {
   std::array<Real, 2> initial_guess{0, 0};
   jso_params.initial_guess = &initial_guess;
   local_minima = jso(ack, jso_params, gen);
+
+  #if (defined(BOOST_GCC) && ((BOOST_GCC >= 80000) && (BOOST_GCC < 90000)))
+  using std::fabs;
+  CHECK_LE(fabs(local_minima[0]), 128 * boost::math::tools::epsilon<Real>());
+  CHECK_LE(fabs(local_minima[1]), 128 * boost::math::tools::epsilon<Real>());
+  #else
   CHECK_EQUAL(local_minima[0], Real(0));
   CHECK_EQUAL(local_minima[1], Real(0));
+  #endif
 }
 
 template <class Real> void test_rosenbrock_saddle() {
   std::cout << "Testing jSO on Rosenbrock saddle . . .\n";
   using ArgType = std::array<Real, 2>;
-  auto jso_params = jso_parameters<ArgType>();
+  jso_parameters<ArgType> jso_params { };
   jso_params.lower_bounds = {0.5, 0.5};
   jso_params.upper_bounds = {2.048, 2.048};
   std::mt19937_64 gen(234568);
@@ -157,14 +164,12 @@ void test_dimensioned_sphere() {
 #endif
 
 int main() {
-#if defined(__clang__) || defined(_MSC_VER)
   test_ackley<float>();
   test_ackley<double>();
   test_rosenbrock_saddle<double>();
   test_rastrigin<double>();
   test_three_hump_camel<float>();
   test_beale<double>();
-#endif
 #if BOOST_MATH_TEST_UNITS_COMPATIBILITY
   test_dimensioned_sphere();
 #endif

test/test_functions_for_optimization.hpp

@@ -52,10 +52,10 @@ template <typename Real> Real ackley(std::array<Real, 2> const &v) {
   return -20 * exp(arg1) - exp(arg2 / 2) + 20 + e<Real>();
 }
 
-template <typename Real> auto rosenbrock_saddle(std::array<Real, 2> const &v) {
-  auto x = v[0];
-  auto y = v[1];
-  return 100 * (x * x - y) * (x * x - y) + (1 - x) * (1 - x);
+template <typename Real> auto rosenbrock_saddle(std::array<Real, 2> const &v) -> Real {
+  Real x { v[0] };
+  Real y { v[1] };
+  return static_cast<Real>(100 * (x * x - y) * (x * x - y) + (1 - x) * (1 - x));
 }