From 629c2e52c1314cc381233c5ee363fa8b2280ebd4 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Mon, 8 Apr 2019 00:57:54 +0200 Subject: [PATCH] oops, wrong order --- src/methods.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/methods.cc b/src/methods.cc index 57f7c9c..68243db 100644 --- a/src/methods.cc +++ b/src/methods.cc @@ -78,18 +78,16 @@ namespace methods_private { int const t_iter = 0) { auto temp_image = t_base.clone(); - // auto const [rand_x, rand_y, size] - // = methods_private::getSquareValues(temp_image); auto const [rand_x, rand_y, size] - = t_controlled_size ? methods_private::getSquareValues(temp_image) - : methods_private::getControlledSquareValues( - temp_image, t_init_iter, t_iter); + = t_controlled_size ? methods_private::getControlledSquareValues( + temp_image, t_init_iter, t_iter) + : methods_private::getSquareValues(temp_image); methods_private::newSquare2(temp_image, cv::Point{rand_x, rand_y}, size, t_colors[rand() % t_colors.size()]); auto new_diff = euclidian_distance(t_ref, temp_image); return (new_diff < diff) ? std::optional>{std::make_pair( - std::move(temp_image), new_diff)} + std::move(temp_image), new_diff)} : std::nullopt; }