Set tolerance to 5% of brightest

Author: Michael McLeod

cpp/tests/algo_factory.cc

@@ -125,13 +125,13 @@ TEST_CASE("primal_dual_factory") {
  const Image<t_complex> image = Image<t_complex>::Map(diagnostic.x.data(), imsizey, imsizex);
  // pfitsio::write2d(image.real(), result_path);
 
- double average_solution = solution.real().cwiseAbs().sum() / solution.size();
+ double brightness = solution.real().cwiseAbs().maxCoeff();
  double mse = (Vector<t_complex>::Map(solution.data(), solution.size()) - diagnostic.x)
  .real()
  .squaredNorm() /
  solution.size();
  double rms = sqrt(mse);
- CHECK(rms <= average_solution * 1e-3);
+ CHECK(rms <= brightness * 5e-2);
 }
 
 TEST_CASE("fb_factory") {
@@ -167,9 +167,11 @@ TEST_CASE("fb_factory") {
  std::make_tuple("DB6", 3u), std::make_tuple("DB7", 3u), std::make_tuple("DB8", 3u)};
  auto const wavelets = factory::wavelet_operator_factory<Vector<t_complex>>(
  factory::distributed_wavelet_operator::serial, sara, imsizey, imsizex);
+
  t_real const sigma = 0.016820222945913496 * std::sqrt(2); // see test_parameters file
  t_real const beta = sigma * sigma;
  t_real const gamma = 0.0001;
+
  auto const fb = factory::fb_factory<sopt::algorithm::ImagingForwardBackward<t_complex>>(
  factory::algo_distribution::serial, measurements_transform, wavelets, uv_data, sigma, beta,
  gamma, imsizey, imsizex, sara.size(), 1000, true, true, false, 1e-2, 1e-3, 50);
@@ -179,13 +181,13 @@ TEST_CASE("fb_factory") {
  pfitsio::write2d(image.real(), result_path);
  // pfitsio::write2d(residual_image.real(), expected_residual_path);
 
- double average_solution = solution.real().cwiseAbs().sum() / solution.size();
+ double brightness = solution.real().cwiseAbs().maxCoeff();
  double mse = (Vector<t_complex>::Map(solution.data(), solution.size()) - diagnostic.x)
  .real()
  .squaredNorm() /
  solution.size();
  double rms = sqrt(mse);
- CHECK(rms <= average_solution * 1e-3);
+ CHECK(rms <= brightness * 5e-2);
 }
 
 #ifdef PURIFY_H5
@@ -289,11 +291,11 @@ TEST_CASE("fb_factory_stochastic") {
  // pfitsio::write2d(residual_image.real(), expected_residual_path);
 
  auto soln_flat = Vector<t_complex>::Map(solution.data(), solution.size());
- double average_intensity = soln_flat.real().sum() / soln_flat.size();
+ double brightness = soln_flat.real().cwiseAbs().maxCoeff();
  SOPT_HIGH_LOG("Average intensity = {}", average_intensity);
  double mse = (soln_flat - diagnostic.x).real().squaredNorm() / solution.size();
  SOPT_HIGH_LOG("MSE = {}", mse);
- CHECK(mse <= average_intensity * 1e-3);
+ CHECK(mse <= average_intensity * 5e-2);
 }
 #endif
 
@@ -347,13 +349,13 @@ TEST_CASE("tf_fb_factory") {
  // pfitsio::write2d(image.real(), result_path);
  // pfitsio::write2d(residual_image.real(), expected_residual_path);
 
- double average_solution = solution.real().cwiseAbs().sum() / solution.size();
+ double brightness = solution.real().cwiseAbs().maxCoeff();
  double mse = (Vector<t_complex>::Map(solution.data(), solution.size()) - diagnostic.x)
  .real()
  .squaredNorm() /
  solution.size();
  double rms = sqrt(mse);
- CHECK(rms <= average_solution * 1e-3);
+ CHECK(rms <= brightness * 5e-2);
 }
 
 TEST_CASE("onnx_fb_factory") {
@@ -410,13 +412,13 @@ TEST_CASE("onnx_fb_factory") {
  // pfitsio::write2d(image.real(), result_path);
  // pfitsio::write2d(residual_image.real(), expected_residual_path);
 
- double average_solution = solution.real().cwiseAbs().sum() / solution.size();
+ double brightness = solution.real().cwiseAbs().maxCoeff();
  double mse = (Vector<t_complex>::Map(solution.data(), solution.size()) - diagnostic.x)
  .real()
  .squaredNorm() /
  solution.size();
  double rms = sqrt(mse);
- CHECK(rms <= average_solution * 1e-3);
+ CHECK(rms <= brightness * 5e-2);
 }
 #endif